------------------------------------------------------------
revno: 284
committer: Lars Helge Oeverland [email protected]
branch nick: trunk
timestamp: Mon 2009-05-11 15:32:24 +0200
message:
Reduced the number of webwork actions defined in the config files which are
inherited, to avoid repetion when running as portal. Unluckily this didn't help
much on startup time, but committing now and will investigate further
renamed:
dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml =>
dhis-2/dhis-web/dhis-web-commons/src/main/resources/xwork.xml
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/DefaultCustomValueService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/HibernateCustomValueStore.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml
dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-datamart/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-gis/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-jforum-integration/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-portal/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/xwork.xml
gis/dhis-web-mapping/src/main/resources/xwork.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/xwork.xml
=== modified file
'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/DefaultCustomValueService.java'
---
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/DefaultCustomValueService.java
2009-05-04 12:51:33 +0000
+++
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/DefaultCustomValueService.java
2009-05-11 13:32:24 +0000
@@ -48,15 +48,14 @@
private CustomValueStore customValueStore;
- public CustomValueStore getCustomValueStore()
- {
- return customValueStore;
- }
-
public void setCustomValueStore( CustomValueStore customValueStore )
{
this.customValueStore = customValueStore;
}
+
+ //
-------------------------------------------------------------------------
+ // CustomValueService implementation
+ //
-------------------------------------------------------------------------
public int addCustomValue( CustomValue customValue )
{
=== modified file
'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/HibernateCustomValueStore.java'
---
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/HibernateCustomValueStore.java
2009-05-04 12:51:33 +0000
+++
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/customvalue/hibernate/HibernateCustomValueStore.java
2009-05-11 13:32:24 +0000
@@ -58,6 +58,10 @@
{
this.sessionManager = sessionManager;
}
+
+ //
-------------------------------------------------------------------------
+ // CustomValueStore implementation
+ //
-------------------------------------------------------------------------
public int addCustomValue( CustomValue customValue )
{
=== modified file
'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml'
---
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml
2009-05-03 23:04:13 +0000
+++
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/customvalue/hibernate/CustomValue.hbm.xml
2009-05-11 13:32:24 +0000
@@ -6,8 +6,6 @@
<hibernate-mapping>
<class name="org.hisp.dhis.customvalue.CustomValue" table="customvalue">
- <cache usage="read-write"/>
-
<id name="id" column="customvalueid">
<generator class="native"/>
</id>
=== modified file
'dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml'
---
dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml
2009-03-03 16:46:36 +0000
+++
dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml
2009-05-11 13:32:24 +0000
@@ -2,7 +2,82 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="webwork-default.xml"/>
+ <package name="webwork-default">
+ <result-types>
+ <result-type name="chain"
class="com.opensymphony.xwork.ActionChainResult"/>
+ <result-type name="dispatcher"
class="com.opensymphony.webwork.dispatcher.ServletDispatcherResult"
default="true"/>
+ <result-type name="freemarker"
class="com.opensymphony.webwork.views.freemarker.FreemarkerResult"/>
+ <result-type name="httpheader"
class="com.opensymphony.webwork.dispatcher.HttpHeaderResult"/>
+ <result-type name="jasper"
class="com.opensymphony.webwork.views.jasperreports.JasperReportsResult"/>
+ <result-type name="redirect"
class="com.opensymphony.webwork.dispatcher.ServletRedirectResult"/>
+ <result-type name="redirect-action"
class="com.opensymphony.webwork.dispatcher.ServletActionRedirectResult"/>
+ <result-type name="stream"
class="com.opensymphony.webwork.dispatcher.StreamResult"/>
+ <result-type name="tiles"
class="com.opensymphony.webwork.views.tiles.TilesResult"/>
+ <result-type name="velocity"
class="com.opensymphony.webwork.dispatcher.VelocityResult"/>
+ <result-type name="xslt"
class="com.opensymphony.webwork.views.xslt.XSLTResult"/>
+ <result-type name="plaintext"
class="com.opensymphony.webwork.dispatcher.PlainTextResult" />
+ <result-type name="flash"
class="com.opensymphony.webwork.dispatcher.FlashResult" />
+ </result-types>
+
+ <interceptors>
+ <interceptor name="alias"
class="com.opensymphony.xwork.interceptor.AliasInterceptor"/>
+ <interceptor name="autowiring"
class="com.opensymphony.xwork.spring.interceptor.ActionAutowiringInterceptor"/>
+ <interceptor name="chain"
class="com.opensymphony.xwork.interceptor.ChainingInterceptor"/>
+ <interceptor name="component"
class="com.opensymphony.xwork.interceptor.component.ComponentInterceptor"/>
+ <interceptor name="conversionError"
class="com.opensymphony.webwork.interceptor.WebWorkConversionErrorInterceptor"/>
+ <interceptor name="createSession"
class="com.opensymphony.webwork.interceptor.CreateSessionInterceptor" />
+ <interceptor name="debugging"
class="com.opensymphony.webwork.interceptor.debugging.DebuggingInterceptor" />
+ <interceptor name="external-ref"
class="com.opensymphony.xwork.interceptor.ExternalReferencesInterceptor"/>
+ <interceptor name="execAndWait"
class="com.opensymphony.webwork.interceptor.ExecuteAndWaitInterceptor"/>
+ <interceptor name="exception"
class="com.opensymphony.xwork.interceptor.ExceptionMappingInterceptor"/>
+ <interceptor name="fileUpload"
class="com.opensymphony.webwork.interceptor.FileUploadInterceptor"/>
+ <interceptor name="i18n"
class="com.opensymphony.xwork.interceptor.I18nInterceptor"/>
+ <interceptor name="logger"
class="com.opensymphony.xwork.interceptor.LoggingInterceptor"/>
+ <interceptor name="model-driven"
class="com.opensymphony.xwork.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="params"
class="com.opensymphony.xwork.interceptor.ParametersInterceptor"/>
+ <interceptor name="prepare"
class="com.opensymphony.xwork.interceptor.PrepareInterceptor"/>
+ <interceptor name="static-params"
class="com.opensymphony.xwork.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="scope"
class="com.opensymphony.webwork.interceptor.ScopeInterceptor"/>
+ <interceptor name="servlet-config"
class="com.opensymphony.webwork.interceptor.ServletConfigInterceptor"/>
+ <interceptor name="sessionAutowiring"
class="com.opensymphony.webwork.spring.interceptor.SessionContextAutowiringInterceptor"/>
+ <interceptor name="timer"
class="com.opensymphony.xwork.interceptor.TimerInterceptor"/>
+ <interceptor name="token"
class="com.opensymphony.webwork.interceptor.TokenInterceptor"/>
+ <interceptor name="token-session"
class="com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor"/>
+ <interceptor name="validation"
class="com.opensymphony.xwork.validator.ValidationInterceptor"/>
+ <interceptor name="workflow"
class="com.opensymphony.xwork.interceptor.DefaultWorkflowInterceptor"/>
+ <interceptor name="paramFilter"
class="com.opensymphony.xwork.interceptor.ParameterFilterInterceptor" />
+ <interceptor name="paramRemover"
class="com.opensymphony.xwork.interceptor.ParameterRemoverInterceptor" />
+ <interceptor name="sessionInvalidation"
class="com.opensymphony.webwork.interceptor.SessionInvalidationInterceptor" />
+ <interceptor name="flash"
class="com.opensymphony.webwork.interceptor.FlashInterceptor" />
+ <interceptor name="cookie"
class="com.opensymphony.webwork.interceptor.CookieInterceptor" />
+ <interceptor name="store"
class="com.opensymphony.webwork.interceptor.MessageStoreInterceptor" />
+ <interceptor name="booleanTweaker"
class="com.opensymphony.webwork.interceptor.BooleanTweaker" />
+
+ <interceptor-stack name="defaultStack">
+ <interceptor-ref name="exception"/>
+ <interceptor-ref name="alias"/>
+ <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="prepare"/>
+ <interceptor-ref name="i18n"/>
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="debugging"/>
+ <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="static-params"/>
+ <interceptor-ref name="params"/>
+ <interceptor-ref name="conversionError"/>
+ <interceptor-ref name="validation">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ <interceptor-ref name="workflow">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ </interceptor-stack>
+
+ </interceptors>
+
+ <default-interceptor-ref name="defaultStack"/>
+ </package>
<package name="dhis-support-webwork" extends="webwork-default">
<result-types>
@@ -36,4 +111,79 @@
</interceptors>
</package>
+ <!-- DHIS Web Commons -->
+
+ <package name="dhis-web-commons" extends="dhis-support-webwork"
namespace="/dhis-web-commons">
+
+ <interceptors>
+ <interceptor name="portalParamsInterceptor"
+
class="org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor"/>
+ <interceptor name="portalModuleInterceptor"
+
class="org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor"/>
+ <interceptor name="portalMenuInterceptor"
+
class="org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor"/>
+ <interceptor name="organisationUnitTreeInterceptor"
+
class="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor"/>
+ <interceptor name="portalUserInterceptor"
+
class="org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor"/>
+ <interceptor name="securityInterceptor"
+ class="org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor"/>
+ <interceptor name="execAndWait"
+
class="org.hisp.dhis.hibernate.interceptor.OpenSessionExecuteAndWaitInterceptor"/>
+
+ <interceptor-stack name="commonInterceptors">
+ <interceptor-ref name="static-params"/>
+ <interceptor-ref name="params"/>
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="i18nInterceptor"/>
+ <!--
+ The securityInterceptor is put after the i18nInterceptor so that the
+ access denied error pages can use internationalisation.
+ -->
+ <interceptor-ref name="securityInterceptor"/>
+ <interceptor-ref name="sortOrderInterceptor"/>
+ <interceptor-ref name="displayPropertyInterceptor"/>
+ <interceptor-ref name="dataDictionaryModeInterceptor"/>
+ <interceptor-ref name="systemSettingInterceptor"/>
+ <interceptor-ref name="styleInterceptor"/>
+ <interceptor-ref name="portalParamsInterceptor"/>
+ <interceptor-ref name="portalMenuInterceptor"/>
+ <interceptor-ref name="portalModuleInterceptor"/>
+ <interceptor-ref name="portalUserInterceptor"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="exceptionStack">
+ <interceptor-ref name="exceptionInterceptor"/>
+ <interceptor-ref name="commonInterceptors"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="transactionStack">
+ <interceptor-ref name="exceptionStack"/>
+ <interceptor-ref name="transactionInterceptor"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="fileUploadStack">
+ <interceptor-ref name="exceptionInterceptor"/>
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="commonInterceptors"/>
+ </interceptor-stack>
+
+ <interceptor-stack name="organisationUnitTreeStack">
+ <interceptor-ref name="transactionStack"/>
+ <interceptor-ref name="organisationUnitTreeInterceptor"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <default-interceptor-ref name="exceptionStack"/>
+
+ <global-results>
+ <result name="exceptionDefault" type="velocity">/exception.vm</result>
+ <result name="accessDenied" type="velocity">/accessDenied.vm</result>
+ <result name="plainTextError" type="plainTextErrorResult">
+ <param name="parse">true</param>
+ <param name="message">${exception.class.name}:
${exception.message}</param>
+ </result>
+ </global-results>
+ </package>
+
</xwork>
=== renamed 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/xwork.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
2009-04-20 14:54:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -3,82 +3,6 @@
<xwork>
<include file="dhis-support-webwork.xml"/>
- <!-- DHIS Web Commons -->
-
- <package name="dhis-web-commons" extends="dhis-support-webwork"
namespace="/dhis-web-commons">
-
- <interceptors>
- <interceptor name="portalParamsInterceptor"
-
class="org.hisp.dhis.webportal.interceptor.WebWorkPortalParamsInterceptor"/>
- <interceptor name="portalModuleInterceptor"
-
class="org.hisp.dhis.webportal.interceptor.WebWorkPortalModuleInterceptor"/>
- <interceptor name="portalMenuInterceptor"
-
class="org.hisp.dhis.webportal.interceptor.WebWorkPortalMenuInterceptor"/>
- <interceptor name="organisationUnitTreeInterceptor"
-
class="org.hisp.dhis.ouwt.interceptor.OrganisationUnitTreeInterceptor"/>
- <interceptor name="portalUserInterceptor"
-
class="org.hisp.dhis.webportal.interceptor.WebWorkPortalUserInterceptor"/>
- <interceptor name="securityInterceptor"
- class="org.hisp.dhis.security.intercept.WebWorkSecurityInterceptor"/>
- <interceptor name="execAndWait"
-
class="org.hisp.dhis.hibernate.interceptor.OpenSessionExecuteAndWaitInterceptor"/>
-
- <interceptor-stack name="commonInterceptors">
- <interceptor-ref name="static-params"/>
- <interceptor-ref name="params"/>
- <interceptor-ref name="chain"/>
- <interceptor-ref name="i18nInterceptor"/>
- <!--
- The securityInterceptor is put after the i18nInterceptor so that the
- access denied error pages can use internationalisation.
- -->
- <interceptor-ref name="securityInterceptor"/>
- <interceptor-ref name="sortOrderInterceptor"/>
- <interceptor-ref name="displayPropertyInterceptor"/>
- <interceptor-ref name="dataDictionaryModeInterceptor"/>
- <interceptor-ref name="systemSettingInterceptor"/>
- <interceptor-ref name="styleInterceptor"/>
- <interceptor-ref name="portalParamsInterceptor"/>
- <interceptor-ref name="portalMenuInterceptor"/>
- <interceptor-ref name="portalModuleInterceptor"/>
- <interceptor-ref name="portalUserInterceptor"/>
- </interceptor-stack>
-
- <interceptor-stack name="exceptionStack">
- <interceptor-ref name="exceptionInterceptor"/>
- <interceptor-ref name="commonInterceptors"/>
- </interceptor-stack>
-
- <interceptor-stack name="transactionStack">
- <interceptor-ref name="exceptionStack"/>
- <interceptor-ref name="transactionInterceptor"/>
- </interceptor-stack>
-
- <interceptor-stack name="fileUploadStack">
- <interceptor-ref name="exceptionInterceptor"/>
- <interceptor-ref name="fileUpload"/>
- <interceptor-ref name="commonInterceptors"/>
- </interceptor-stack>
-
- <interceptor-stack name="organisationUnitTreeStack">
- <interceptor-ref name="transactionStack"/>
- <interceptor-ref name="organisationUnitTreeInterceptor"/>
- </interceptor-stack>
- </interceptors>
-
- <default-interceptor-ref name="exceptionStack"/>
-
- <global-results>
- <result name="exceptionDefault" type="velocity">/exception.vm</result>
- <result name="accessDenied" type="velocity">/accessDenied.vm</result>
- <result name="plainTextError" type="plainTextErrorResult">
- <param name="parse">true</param>
- <param name="message">${exception.class.name}:
${exception.message}</param>
- </result>
- </global-results>
-
- </package>
-
<!-- Organisation Unit Selection Tree -->
<package name="dhis-web-commons-oust" extends="dhis-web-commons"
namespace="/dhis-web-commons/oust">
=== modified file
'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/xwork.xml
2009-03-07 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,8 +1,8 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-dashboard-integration" extends="dhis-web-commons"
namespace="/dhis-web-dashboard-integration">
<action name="index"
class="org.hisp.dhis.dashboard.action.ProvideContentAction">
=== modified file
'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml
2009-04-22 15:28:47 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -2,7 +2,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
+ <include file="dhis-support-webwork.xml"/>
<package name="dhis-web-dataentry" extends="dhis-web-commons"
namespace="/dhis-web-dataentry">
=== modified file
'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/xwork.xml
2009-03-07 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-datamart" extends="dhis-web-commons"
namespace="/dhis-web-datamart">
<!-- DataMart -->
=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-gis/src/main/resources/xwork.xml 2009-03-13
11:44:39 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/resources/xwork.xml 2009-05-11
13:32:24 +0000
@@ -2,8 +2,8 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml" />
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-gis" extends="dhis-web-commons"
namespace="/dhis-web-gis">
=== modified file
'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/xwork.xml
2009-03-11 15:16:35 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,8 +1,8 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-importexport" extends="dhis-web-commons"
namespace="/dhis-web-importexport">
<action name="index" class="org.hisp.dhis.importexport.action.NoAction">
=== modified file
'dhis-2/dhis-web/dhis-web-jforum-integration/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-jforum-integration/src/main/resources/xwork.xml
2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-jforum-integration/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-jforum-integration" extends="dhis-web-commons"
namespace="/dhis-web-jforum-integration">
<action name="index" class="org.hisp.dhis.jforum.action.NoAction">
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/xwork.xml'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/xwork.xml
2009-03-07 13:10:38 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-maintenance-dataadmin" extends="dhis-web-commons"
namespace="/dhis-web-maintenance-dataadmin">
<action name="index" class="org.hisp.dhis.commons.action.NoAction">
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/xwork.xml'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/xwork.xml
2009-03-13 14:32:21 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,7 +1,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
+ <include file="dhis-support-webwork.xml"/>
<package name="dhis-web-maintenance-datadictionary"
extends="dhis-web-commons"
namespace="/dhis-web-maintenance-datadictionary">
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/xwork.xml'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/xwork.xml
2009-05-05 15:38:29 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,7 +1,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
+ <include file="dhis-support-webwork.xml"/>
<package name="dhis-web-maintenance-dataset" extends="dhis-web-commons"
namespace="/dhis-web-maintenance-dataset">
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/xwork.xml'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/xwork.xml
2009-03-07 13:10:38 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,8 +1,8 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-maintenance-organisationunit"
extends="dhis-web-commons" namespace="/dhis-web-maintenance-organisationunit">
<action name="index" class="org.hisp.dhis.oum.action.NoAction">
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/xwork.xml'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/xwork.xml
2009-03-03 16:46:36 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -2,7 +2,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
+ <include file="dhis-support-webwork.xml"/>
<package name="dhis-web-maintenance-settings" extends="dhis-web-commons"
namespace="/dhis-web-maintenance-settings">
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/xwork.xml'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/xwork.xml
2009-05-05 15:24:25 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -2,7 +2,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
+ <include file="dhis-support-webwork.xml"/>
<package name="dhis-web-maintenance-user" extends="dhis-web-commons"
namespace="/dhis-web-maintenance-user">
=== modified file
'dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/xwork.xml'
---
dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/xwork.xml
2009-03-03 16:46:36 +0000
+++
dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-openhealth-integration" extends="dhis-web-commons"
namespace="/dhis-web-openhealth-integration">
<action name="index"
class="org.hisp.dhis.openhealth.action.DisplayAction">
=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/resources/xwork.xml
2009-03-14 09:02:39 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,7 +1,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
+ <include file="dhis-support-webwork.xml"/>
<package name="dhis-web-portal" extends="dhis-web-commons"
namespace="/dhis-web-portal">
=== modified file
'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml
2009-04-30 11:38:35 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
-
+ <include file="dhis-support-webwork.xml"/>
+
<package name="dhis-web-reporting" extends="dhis-web-commons"
namespace="/dhis-web-reporting">
<action name="index" class="org.hisp.dhis.reporting.action.NoAction">
=== modified file
'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/xwork.xml
2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/xwork.xml
2009-05-11 13:32:24 +0000
@@ -2,7 +2,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
+ <include file="dhis-support-webwork.xml"/>
<package name="dhis-web-validationrule" extends="dhis-web-commons"
namespace="/dhis-web-validationrule">
=== modified file 'gis/dhis-web-mapping/src/main/resources/xwork.xml'
--- gis/dhis-web-mapping/src/main/resources/xwork.xml 2009-05-11 12:56:56
+0000
+++ gis/dhis-web-mapping/src/main/resources/xwork.xml 2009-05-11 13:32:24
+0000
@@ -2,7 +2,7 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
<xwork>
- <include file="dhis-web-commons.xml"/>
+ <include file="dhis-support-webwork.xml"/>
<package name="dhis-web-mapping" extends="dhis-web-commons"
namespace="/dhis-web-mapping">
--
Trunk
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
