dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01134
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 331: Small rearrangement of xwork config files
------------------------------------------------------------
revno: 331
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-05-26 13:01:15 +0200
message:
Small rearrangement of xwork config files
renamed:
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
modified:
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/dhis-web-commons.xml
=== 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-05-25 10:27:57 +0000
+++ dhis-2/dhis-support/dhis-support-webwork/src/main/resources/dhis-support-webwork.xml 2009-05-26 11:01:15 +0000
@@ -36,79 +36,4 @@
</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/xwork.xml' => '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 2009-05-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2009-05-26 11:01:15 +0000
@@ -3,6 +3,81 @@
<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-05-20 08:50:26 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.xml"/>
<package name="dhis-web-dashboard-integration" extends="dhis-web-commons" namespace="/dhis-web-dashboard-integration">
=== 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-05-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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-05-11 13:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/xwork.xml 2009-05-26 11:01:15 +0000
@@ -1,7 +1,7 @@
<?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-support-webwork.xml"/>
+ <include file="dhis-web-commons.xml"/>
<package name="dhis-web-datamart" extends="dhis-web-commons" namespace="/dhis-web-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-05-11 13:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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-05-11 13:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.xml"/>
<package name="dhis-web-importexport" extends="dhis-web-commons" namespace="/dhis-web-importexport">
=== 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-05-11 13:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-jforum-integration/src/main/resources/xwork.xml 2009-05-26 11:01:15 +0000
@@ -1,7 +1,7 @@
<?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-support-webwork.xml"/>
+ <include file="dhis-web-commons.xml"/>
<package name="dhis-web-jforum-integration" extends="dhis-web-commons" namespace="/dhis-web-jforum-integration">
=== 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-05-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/xwork.xml 2009-05-26 11:01:15 +0000
@@ -1,7 +1,7 @@
<?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-support-webwork.xml"/>
+ <include file="dhis-web-commons.xml"/>
<package name="dhis-web-maintenance-dataadmin" extends="dhis-web-commons" namespace="/dhis-web-maintenance-dataadmin">
=== 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-05-25 09:18:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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-05-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.xml"/>
<package name="dhis-web-maintenance-organisationunit" extends="dhis-web-commons" namespace="/dhis-web-maintenance-organisationunit">
=== 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-05-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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-05-11 13:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/xwork.xml 2009-05-26 11:01:15 +0000
@@ -1,7 +1,7 @@
<?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-support-webwork.xml"/>
+ <include file="dhis-web-commons.xml"/>
<package name="dhis-web-openhealth-integration" extends="dhis-web-commons" namespace="/dhis-web-openhealth-integration">
=== 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-05-11 13:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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-05-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml 2009-05-26 11:01:15 +0000
@@ -1,7 +1,7 @@
<?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-support-webwork.xml"/>
+ <include file="dhis-web-commons.xml"/>
<package name="dhis-web-reporting" extends="dhis-web-commons" namespace="/dhis-web-reporting">
=== 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-05-25 10:27:57 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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-25 17:49:30 +0000
+++ gis/dhis-web-mapping/src/main/resources/xwork.xml 2009-05-26 11:01:15 +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-support-webwork.xml"/>
+ <include file="dhis-web-commons.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.
