dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21687
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10336: minor indent fixes
------------------------------------------------------------
revno: 10336
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-03-20 11:29:27 +0700
message:
minor indent fixes
modified:
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2013-03-19 14:50:43 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2013-03-20 04:29:27 +0000
@@ -275,7 +275,7 @@
return object;
}
-
+
@Override
@SuppressWarnings("unchecked")
public final T load( int id )
@@ -310,7 +310,7 @@
{
return getObject( Restrictions.eq( "uid", uid ) );
}
-
+
@Override
@Deprecated
public final T getByName( String name )
@@ -904,8 +904,8 @@
protected boolean sharingEnabled()
{
- return SharingUtils.isSupported( clazz ) && !( currentUserService.getCurrentUser() == null ||
- currentUserService.getCurrentUser().getUserCredentials().getAllAuthorities().contains( SharingUtils.SHARING_OVERRIDE_AUTHORITY ) );
+ return SharingUtils.isSupported( clazz ) && !(currentUserService.getCurrentUser() == null ||
+ currentUserService.getCurrentUser().getUserCredentials().getAllAuthorities().contains( SharingUtils.SHARING_OVERRIDE_AUTHORITY ));
}
protected boolean isReadAllowed( T object )
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java 2012-02-28 18:56:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java 2013-03-20 04:29:27 +0000
@@ -27,26 +27,25 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.apache.commons.lang.StringUtils.defaultIfEmpty;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.authentication.InsufficientAuthenticationException;
-
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import static org.apache.commons.lang.StringUtils.defaultIfEmpty;
/**
* This interceptor will intercept exceptions and redirect to appropriate
- * exception results / pages defined in the global-results section in the XWork
+ * exception results / pages defined in the global-results section in the XWork
* configuration.
- *
+ *
* @author Torgeir Lorange Ostby
* @version $Id: WebWorkExceptionInterceptor.java 6335 2008-11-20 11:11:26Z larshelg $
*/
@@ -58,7 +57,7 @@
public static final String EXCEPTION_RESULT_KEY = "onExceptionReturn";
public static final String EXCEPTION_RESULT_DEFAULT = "exceptionDefault";
public static final String EXCEPTION_RESULT_PLAIN_TEXT = "plainTextError";
- public static final String EXCEPTION_RESULT_ACCESS_DENIED = "accessDenied";
+ public static final String EXCEPTION_RESULT_ACCESS_DENIED = "accessDenied";
public static final String EXCEPTION_RESULT_JSON_ACCESS_DENIED = "jsonAccessDenied";
public static final String TEMPLATE_KEY_EXCEPTION = "exception";
public static final String TEMPLATE_KEY_SHOW_STACK_TRACE = "showStackTrace";
@@ -73,7 +72,7 @@
{
this.showStackTrace = showStackTrace;
}
-
+
private List<String> ignoredExceptions = new ArrayList<String>();
public void setIgnoredExceptions( List<String> ignoredExceptions )
@@ -116,14 +115,14 @@
Map<?, ?> params = actionInvocation.getProxy().getConfig().getParams();
String exceptionResultName = (String) params.get( EXCEPTION_RESULT_KEY );
-
+
if ( e instanceof AccessDeniedException || e instanceof InsufficientAuthenticationException )
{
if ( EXCEPTION_RESULT_PLAIN_TEXT.equals( exceptionResultName ) )
- {
+ {
return EXCEPTION_RESULT_JSON_ACCESS_DENIED; // Access denied as JSON
}
-
+
return EXCEPTION_RESULT_ACCESS_DENIED; // Access denied as nice page
}
@@ -132,18 +131,19 @@
// -----------------------------------------------------------------
Throwable t = e;
-
+
boolean ignore = false;
-
- checkIgnore : do
+
+ checkIgnore:
+ do
{
if ( ignoredExceptions.contains( t.getClass().getName() ) )
{
ignore = true;
break checkIgnore;
}
- }
- while ( ( t = t.getCause() ) != null );
+ }
+ while ( (t = t.getCause()) != null );
// -----------------------------------------------------------------
// Log exception
@@ -159,7 +159,7 @@
}
exceptionResultName = defaultIfEmpty( exceptionResultName, EXCEPTION_RESULT_DEFAULT );
-
+
return ignore ? EXCEPTION_RESULT_PLAIN_TEXT : exceptionResultName;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2013-02-22 11:39:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2013-03-20 04:29:27 +0000
@@ -12,7 +12,8 @@
<property name="maintenanceModuleIdentifier" value="maintenance" />
</bean>
- <bean id="org.hisp.dhis.webportal.module.ConfigurableModuleComparator" class="org.hisp.dhis.webportal.module.ConfigurableModuleComparator">
+ <bean id="org.hisp.dhis.webportal.module.ConfigurableModuleComparator"
+ class="org.hisp.dhis.webportal.module.ConfigurableModuleComparator">
<property name="order">
<list>
<value>dhis-web-maintenance-dataadmin</value>
@@ -43,7 +44,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor" class="org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor">
+ <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor"
+ class="org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor">
<property name="standardParams">
<set>
<value>page</value>
@@ -60,7 +62,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor" class="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor">
+ <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor"
+ class="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor">
<property name="moduleManager">
<ref local="org.hisp.dhis.webportal.module.ModuleManager" />
</property>
@@ -80,13 +83,15 @@
</property>
</bean>
- <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor" class="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor">
+ <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor"
+ class="org.hisp.dhis.webportal.interceptor.XWorkPortalMenuInterceptor">
<property name="menuStateManager">
<ref local="org.hisp.dhis.webportal.menu.MenuStateManager" />
</property>
</bean>
- <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalUserInterceptor" class="org.hisp.dhis.webportal.interceptor.XWorkPortalUserInterceptor">
+ <bean id="org.hisp.dhis.webportal.interceptor.XWorkPortalUserInterceptor"
+ class="org.hisp.dhis.webportal.interceptor.XWorkPortalUserInterceptor">
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
</bean>
@@ -98,7 +103,8 @@
<!-- Organisation Unit Web Tree -->
- <bean id="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" class="org.hisp.dhis.ouwt.manager.DefaultOrganisationUnitSelectionManager">
+ <bean id="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager"
+ class="org.hisp.dhis.ouwt.manager.DefaultOrganisationUnitSelectionManager">
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
</bean>
@@ -107,7 +113,8 @@
<property name="collapseClosesAllSubtrees" value="false" />
</bean>
- <bean id="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor" class="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor">
+ <bean id="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor"
+ class="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor">
<property name="selectionManager">
<ref local="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
</property>
@@ -142,7 +149,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.ouwt.action.ClearSelectedOrganisationUnitsAction" class="org.hisp.dhis.ouwt.action.ClearSelectedOrganisationUnitsAction"
+ <bean id="org.hisp.dhis.ouwt.action.ClearSelectedOrganisationUnitsAction"
+ class="org.hisp.dhis.ouwt.action.ClearSelectedOrganisationUnitsAction"
scope="prototype">
<property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
</bean>
@@ -155,7 +163,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.ouwt.action.GetSelectedOrganisationUnitsAction" class="org.hisp.dhis.ouwt.action.GetSelectedOrganisationUnitsAction"
+ <bean id="org.hisp.dhis.ouwt.action.GetSelectedOrganisationUnitsAction"
+ class="org.hisp.dhis.ouwt.action.GetSelectedOrganisationUnitsAction"
scope="prototype">
<property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
</bean>
@@ -168,7 +177,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.ouwt.action.RemoveSelectedOrganisationUnitAction" class="org.hisp.dhis.ouwt.action.RemoveSelectedOrganisationUnitAction"
+ <bean id="org.hisp.dhis.ouwt.action.RemoveSelectedOrganisationUnitAction"
+ class="org.hisp.dhis.ouwt.action.RemoveSelectedOrganisationUnitAction"
scope="prototype">
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="selectionManager">
@@ -217,7 +227,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.oust.action.RemoveSelectedOrganisationUnitAction" class="org.hisp.dhis.oust.action.RemoveSelectedOrganisationUnitAction"
+ <bean id="org.hisp.dhis.oust.action.RemoveSelectedOrganisationUnitAction"
+ class="org.hisp.dhis.oust.action.RemoveSelectedOrganisationUnitAction"
scope="prototype">
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
@@ -234,7 +245,8 @@
</property>
</bean>
- <bean id="org.hisp.dhis.oust.action.ClearSelectedOrganisationUnitsAction" class="org.hisp.dhis.oust.action.ClearSelectedOrganisationUnitsAction"
+ <bean id="org.hisp.dhis.oust.action.ClearSelectedOrganisationUnitsAction"
+ class="org.hisp.dhis.oust.action.ClearSelectedOrganisationUnitsAction"
scope="prototype">
<property name="selectionTreeManager">
<ref local="org.hisp.dhis.oust.manager.SelectionTreeManager" />
@@ -248,7 +260,7 @@
<bean id="org.hisp.dhis.i18n.action.I18nAction" class="org.hisp.dhis.i18n.action.I18nAction" scope="prototype">
<property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
- <property name="identifiableObjectManager" ref="org.hisp.dhis.common.IdentifiableObjectManager" />
+ <property name="identifiableObjectManager" ref="org.hisp.dhis.common.IdentifiableObjectManager" />
</bean>
<bean id="org.hisp.dhis.i18n.action.GetTranslationsAction" class="org.hisp.dhis.i18n.action.GetTranslationsAction">
@@ -257,7 +269,7 @@
<bean id="org.hisp.dhis.i18n.action.TranslateAction" class="org.hisp.dhis.i18n.action.TranslateAction">
<property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
- <property name="identifiableObjectManager" ref="org.hisp.dhis.common.IdentifiableObjectManager" />
+ <property name="identifiableObjectManager" ref="org.hisp.dhis.common.IdentifiableObjectManager" />
</bean>
<!-- About -->
@@ -278,16 +290,17 @@
</bean>
<bean id="org.hisp.dhis.about.action.RedirectAction" class="org.hisp.dhis.about.action.RedirectAction"
- scope="prototype"/>
+ scope="prototype" />
<bean id="org.hisp.dhis.help.action.GetHelpItemsAction" class="org.hisp.dhis.help.action.GetHelpItemsAction"
scope="prototype">
<property name="helpManager" ref="org.hisp.dhis.help.HelpManager" />
</bean>
-
+
<!-- Common actions -->
- <bean id="org.hisp.dhis.commons.action.GetNotificationsAction" class="org.hisp.dhis.commons.action.GetNotificationsAction" scope="prototype"/>
+ <bean id="org.hisp.dhis.commons.action.GetNotificationsAction" class="org.hisp.dhis.commons.action.GetNotificationsAction"
+ scope="prototype" />
<bean id="org.hisp.dhis.commons.action.GetUserAction" class="org.hisp.dhis.commons.action.GetUserAction" scope="prototype">
<property name="userService" ref="org.hisp.dhis.user.UserService" />
@@ -317,7 +330,8 @@
scope="prototype">
</bean>
- <bean id="org.hisp.dhis.commons.action.GetCategoryOptionsAction" class="org.hisp.dhis.commons.action.GetCategoryOptionsAction" scope="prototype"/>
+ <bean id="org.hisp.dhis.commons.action.GetCategoryOptionsAction" class="org.hisp.dhis.commons.action.GetCategoryOptionsAction"
+ scope="prototype" />
<bean id="org.hisp.dhis.commons.action.GetCategoryOptionCombosAction" class="org.hisp.dhis.commons.action.GetCategoryOptionCombosAction"
scope="prototype">
@@ -340,7 +354,8 @@
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
</bean>
- <bean id="org.hisp.dhis.commons.action.GetDataElementsNotInGroupAction" class="org.hisp.dhis.commons.action.GetDataElementsNotInGroupAction"
+ <bean id="org.hisp.dhis.commons.action.GetDataElementsNotInGroupAction"
+ class="org.hisp.dhis.commons.action.GetDataElementsNotInGroupAction"
scope="prototype">
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
</bean>
@@ -447,27 +462,32 @@
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
</bean>
- <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitChildrenAction" class="org.hisp.dhis.commons.action.GetOrganisationUnitChildrenAction"
+ <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitChildrenAction"
+ class="org.hisp.dhis.commons.action.GetOrganisationUnitChildrenAction"
scope="prototype">
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
</bean>
- <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitGroupsAction" class="org.hisp.dhis.commons.action.GetOrganisationUnitGroupsAction"
- scope="prototype">
- <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
- </bean>
-
- <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitGroupsByGroupSetAction" class="org.hisp.dhis.commons.action.GetOrganisationUnitGroupsByGroupSetAction"
- scope="prototype">
- <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
- </bean>
-
- <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitGroupSetsAction" class="org.hisp.dhis.commons.action.GetOrganisationUnitGroupSetsAction"
- scope="prototype">
- <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
- </bean>
-
- <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitLevelsAction" class="org.hisp.dhis.commons.action.GetOrganisationUnitLevelsAction"
+ <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitGroupsAction"
+ class="org.hisp.dhis.commons.action.GetOrganisationUnitGroupsAction"
+ scope="prototype">
+ <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitGroupsByGroupSetAction"
+ class="org.hisp.dhis.commons.action.GetOrganisationUnitGroupsByGroupSetAction"
+ scope="prototype">
+ <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitGroupSetsAction"
+ class="org.hisp.dhis.commons.action.GetOrganisationUnitGroupSetsAction"
+ scope="prototype">
+ <property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.commons.action.GetOrganisationUnitLevelsAction"
+ class="org.hisp.dhis.commons.action.GetOrganisationUnitLevelsAction"
scope="prototype">
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
</bean>
@@ -524,7 +544,7 @@
</bean>
<bean id="org.hisp.dhis.interceptor.SystemSettingInterceptor" class="org.hisp.dhis.interceptor.SystemSettingInterceptor">
- <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
+ <property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
<property name="configurationService" ref="org.hisp.dhis.configuration.ConfigurationService" />
</bean>
@@ -532,14 +552,14 @@
<property name="databaseInfoProvider" ref="databaseInfoProvider" />
</bean>
- <bean id="org.hisp.dhis.interceptor.CacheInterceptor" class="org.hisp.dhis.interceptor.CacheInterceptor"/>
-
+ <bean id="org.hisp.dhis.interceptor.CacheInterceptor" class="org.hisp.dhis.interceptor.CacheInterceptor" />
+
<bean id="org.hisp.dhis.interceptor.UserSettingInterceptor" class="org.hisp.dhis.interceptor.UserSettingInterceptor">
<property name="styleManager" ref="org.hisp.dhis.setting.StyleManager" />
</bean>
<!-- User Account -->
-
+
<bean id="org.hisp.dhis.useraccount.action.GetCurrentUserAction" class="org.hisp.dhis.useraccount.action.GetCurrentUserAction"
scope="prototype">
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
@@ -552,22 +572,24 @@
</bean>
<bean id="org.hisp.dhis.useraccount.action.UpdateUserProfileAction" class="org.hisp.dhis.useraccount.action.UpdateUserProfileAction"
- scope="prototype"/>
-
- <bean id="org.hisp.dhis.useraccount.action.IsSelfRegistrationAllowedAction" class="org.hisp.dhis.useraccount.action.IsSelfRegistrationAllowedAction"
- scope="prototype"/>
-
+ scope="prototype" />
+
+ <bean id="org.hisp.dhis.useraccount.action.IsSelfRegistrationAllowedAction"
+ class="org.hisp.dhis.useraccount.action.IsSelfRegistrationAllowedAction"
+ scope="prototype" />
+
<bean id="org.hisp.dhis.useraccount.action.IsRestoreTokenValidAction" class="org.hisp.dhis.useraccount.action.IsRestoreTokenValidAction"
- scope="prototype"/>
+ scope="prototype" />
- <bean id="org.hisp.dhis.useraccount.action.IsAccountRecoveryAllowedAction" class="org.hisp.dhis.useraccount.action.IsAccountRecoveryAllowedAction"
- scope="prototype"/>
+ <bean id="org.hisp.dhis.useraccount.action.IsAccountRecoveryAllowedAction"
+ class="org.hisp.dhis.useraccount.action.IsAccountRecoveryAllowedAction"
+ scope="prototype" />
<!-- User settings -->
<bean id="org.hisp.dhis.settings.user.action.GetGeneralSettingsAction"
- class="org.hisp.dhis.settings.user.action.GetGeneralSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.user.action.GetGeneralSettingsAction"
+ scope="prototype">
<property name="resourceBundleManager" ref="org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager" />
<property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
<property name="localeManager" ref="org.hisp.dhis.i18n.locale.LocaleManager" />
@@ -576,8 +598,8 @@
</bean>
<bean id="org.hisp.dhis.settings.user.action.SetGeneralSettingsAction"
- class="org.hisp.dhis.settings.user.action.SetGeneralSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.user.action.SetGeneralSettingsAction"
+ scope="prototype">
<property name="localeManager" ref="org.hisp.dhis.i18n.locale.LocaleManager" />
<property name="userSettingService" ref="org.hisp.dhis.user.UserSettingService" />
<property name="styleManager" ref="org.hisp.dhis.setting.StyleManager" />
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2013-03-14 19:05:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2013-03-20 04:29:27 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
<include file="struts-default.xml" />
@@ -39,7 +39,7 @@
<interceptor name="systemSettingInterceptor" class="org.hisp.dhis.interceptor.SystemSettingInterceptor" />
<interceptor name="userSettingInterceptor" class="org.hisp.dhis.interceptor.UserSettingInterceptor" />
<interceptor name="contextInterceptor" class="org.hisp.dhis.interceptor.ContextInterceptor" />
- <interceptor name="cacheInterceptor" class="org.hisp.dhis.interceptor.CacheInterceptor" />
+ <interceptor name="cacheInterceptor" class="org.hisp.dhis.interceptor.CacheInterceptor" />
<interceptor name="portalParamsInterceptor" class="org.hisp.dhis.webportal.interceptor.XWorkPortalParamsInterceptor" />
<interceptor name="portalModuleInterceptor" class="org.hisp.dhis.webportal.interceptor.XWorkPortalModuleInterceptor" />
@@ -82,12 +82,12 @@
<interceptor-ref name="organisationUnitTreeInterceptor" />
<interceptor-ref name="commonInterceptors" />
</interceptor-stack>
-
+
<interceptor-stack name="cacheStack">
<interceptor-ref name="cacheInterceptor" />
<interceptor-ref name="commonInterceptors" />
</interceptor-stack>
-
+
</interceptors>
<default-interceptor-ref name="exceptionStack" />
@@ -105,7 +105,7 @@
</package>
<!-- Security -->
-
+
<package name="dhis-web-commons-security" extends="dhis-web-commons" namespace="/dhis-web-commons/security">
<action name="login" class="org.hisp.dhis.security.action.LoginAction">
@@ -118,21 +118,21 @@
<result name="success" type="velocity">/dhis-web-commons/useraccount/account.vm</result>
<result name="error" type="redirect">login.action</result>
</action>
-
+
<action name="recovery" class="org.hisp.dhis.useraccount.action.IsAccountRecoveryAllowedAction">
<result name="success" type="velocity">/dhis-web-commons/useraccount/recovery.vm</result>
<result name="error" type="redirect">login.action</result>
</action>
-
+
<action name="restore" class="org.hisp.dhis.useraccount.action.IsRestoreTokenValidAction">
<result name="success" type="velocity">/dhis-web-commons/useraccount/restore.vm</result>
<result name="error" type="redirect">login.action</result>
</action>
-
+
</package>
-
+
<!-- Organisation Unit Selection Tree -->
-
+
<package name="dhis-web-commons-oust" extends="dhis-web-commons" namespace="/dhis-web-commons/oust">
<action name="expandSubtree" class="org.hisp.dhis.oust.action.ExpandSubtreeAction">
@@ -311,13 +311,14 @@
<action name="getTranslations" class="org.hisp.dhis.i18n.action.GetTranslationsAction">
<result name="success" type="velocity-json">
- /dhis-web-commons/i18n/jsonTranslations.vm</result>
+ /dhis-web-commons/i18n/jsonTranslations.vm
+ </result>
<param name="onExceptionReturn">plainTextError</param>
</action>
<action name="i18nJavaScript" class="org.hisp.dhis.commons.action.NoAction">
<result name="success" type="velocity-javascript">/dhis-web-commons/i18n/i18n.vm</result>
- <interceptor-ref name="cacheStack"/>
+ <interceptor-ref name="cacheStack" />
</action>
</package>
@@ -462,20 +463,20 @@
</package>
<!-- Common actions HTML -->
-
+
<package name="dhis-web-commons-ajax-html" extends="dhis-web-commons" namespace="/dhis-web-commons-ajax-html">
<action name="getNotifications" class="org.hisp.dhis.commons.action.GetNotificationsAction">
- <result name="success" type="velocity">/dhis-web-commons/ajax/htmlNotifications.vm</result>
+ <result name="success" type="velocity">/dhis-web-commons/ajax/htmlNotifications.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
<action name="getUser" class="org.hisp.dhis.commons.action.GetUserAction">
- <result name="success" type="velocity">
+ <result name="success" type="velocity">
/dhis-web-commons/ajax/htmlUser.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
- </action>
+ </action>
</package>
@@ -484,7 +485,7 @@
<package name="dhis-web-commons-ajax-json" extends="dhis-web-commons" namespace="/dhis-web-commons-ajax-json">
<action name="getNotifications" class="org.hisp.dhis.commons.action.GetNotificationsAction">
- <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonNotifications.vm</result>
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonNotifications.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
@@ -914,13 +915,14 @@
<action name="setUserSettings" class="org.hisp.dhis.settings.user.action.SetGeneralSettingsAction">
<result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="redirect" class="org.hisp.dhis.about.action.RedirectAction">
- <result name="success" type="redirect">${redirectUrl}</result>
- </action>
-
+ /dhis-web-commons/ajax/jsonResponseSuccess.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <action name="redirect" class="org.hisp.dhis.about.action.RedirectAction">
+ <result name="success" type="redirect">${redirectUrl}</result>
+ </action>
+
</package>
</struts>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2013-03-19 15:44:35 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2013-03-20 04:29:27 +0000
@@ -24,6 +24,8 @@
<!-- data entry -->
+ <action name="hello" class="morten.HelloAction" />
+
<action name="selectOrganisationUnit"
class="org.hisp.dhis.light.dataentry.action.GetOrganisationUnitsAction">
<result name="success" type="velocity">/dhis-web-light/main.vm</result>
