← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #01592

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 480: Updated DTDs in struts.xml

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 480
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-08-20 10:30:11 +0200
message:
  Updated DTDs in struts.xml
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-validationrule/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-web/dhis-web-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
-<xwork>
+<?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";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-dashboard-integration" extends="dhis-web-commons" namespace="/dhis-web-dashboard-integration">
@@ -51,4 +54,4 @@
     </action>
     
   </package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,7 +1,9 @@
 <?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>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-dataentry" extends="dhis-web-commons"
@@ -204,4 +206,4 @@
 	</action>
 		  
   </package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
 <?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>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+
     <include file="dhis-web-commons.xml"/>
   
 	<package name="dhis-web-datamart" extends="dhis-web-commons" namespace="/dhis-web-datamart">
@@ -75,4 +78,4 @@
     </action>
     
 	</package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
-<xwork>
+<?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";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-importexport" extends="dhis-web-commons" namespace="/dhis-web-importexport">
@@ -213,4 +216,4 @@
     </action>
     
   </package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
 <?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>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   	
   <package name="dhis-web-maintenance-dataadmin" extends="dhis-web-commons" namespace="/dhis-web-maintenance-dataadmin">
@@ -153,4 +156,4 @@
     </action>
     
   </package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-  "http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
-<xwork>
+<?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";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-maintenance-datadictionary" extends="dhis-web-commons"
@@ -826,4 +829,4 @@
     
   </package>
   
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-  "http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
-<xwork>
+<?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";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-maintenance-dataset" extends="dhis-web-commons" namespace="/dhis-web-maintenance-dataset">
@@ -286,4 +289,4 @@
     </action>
         
   </package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
- "http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
-<xwork>
+<?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";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-maintenance-organisationunit" extends="dhis-web-commons" namespace="/dhis-web-maintenance-organisationunit">
@@ -212,4 +215,4 @@
       
   </package>
 
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -3,6 +3,7 @@
 "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
 "http://struts.apache.org/dtds/struts-2.0.dtd";>
 <struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-maintenance-settings" extends="dhis-web-commons"

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,7 +1,9 @@
 <?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>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-maintenance-user" extends="dhis-web-commons"
@@ -146,4 +148,4 @@
     </action>
     
   </package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-openhealth-integration/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
 <?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>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   	
   <package name="dhis-web-openhealth-integration" extends="dhis-web-commons" namespace="/dhis-web-openhealth-integration">
@@ -59,4 +62,4 @@
     </action>
     
   </package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-  "http://www.opensymphony.com/xwork/xwork-1.0.dtd";>
-<xwork>
+<?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";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-portal" extends="dhis-web-commons" namespace="/dhis-web-portal">
@@ -19,4 +22,4 @@
     </action>    
     
   </package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,6 +1,9 @@
 <?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>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   	
   <package name="dhis-web-reporting" extends="dhis-web-commons" namespace="/dhis-web-reporting">
@@ -432,4 +435,4 @@
     </action>
     
 	</package>
-</xwork>
+</struts>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2009-08-20 08:30:11 +0000
@@ -1,7 +1,9 @@
 <?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>
+<!DOCTYPE struts PUBLIC
+"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+"http://struts.apache.org/dtds/struts-2.0.dtd";>
+<struts>
+
   <include file="dhis-web-commons.xml"/>
   
   <package name="dhis-web-validationrule" extends="dhis-web-commons"
@@ -188,4 +190,4 @@
     </action>
     
   </package>
-</xwork>
+</struts>
  Thread Previous • Date Previous • • Thread Next