dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 493
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-08-21 12:41:53 +0200
message:
  Upgraded ZA module to Struts2.
renamed:
  local/za/dhis-web-jforum-integration/src/main/resources/xwork.xml => local/za/dhis-web-jforum-integration/src/main/resources/struts.xml
modified:
  local/za/dhis-web-jforum-integration/src/main/java/org/hisp/dhis/jforum/action/NoAction.java
  local/za/dhis-web-jforum-integration/src/main/java/org/hisp/dhis/jforum/action/PopulateJForumAction.java
  local/za/dhis-web-jforum-integration/src/main/webapp/WEB-INF/web.xml
  local/za/dhis-web-jforum-integration/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 'local/za/dhis-web-jforum-integration/src/main/java/org/hisp/dhis/jforum/action/NoAction.java'
--- local/za/dhis-web-jforum-integration/src/main/java/org/hisp/dhis/jforum/action/NoAction.java	2009-03-03 16:46:36 +0000
+++ local/za/dhis-web-jforum-integration/src/main/java/org/hisp/dhis/jforum/action/NoAction.java	2009-08-21 10:41:53 +0000
@@ -27,7 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 /**
  * @author Lars Helge Overland

=== modified file 'local/za/dhis-web-jforum-integration/src/main/java/org/hisp/dhis/jforum/action/PopulateJForumAction.java'
--- local/za/dhis-web-jforum-integration/src/main/java/org/hisp/dhis/jforum/action/PopulateJForumAction.java	2009-03-03 16:46:36 +0000
+++ local/za/dhis-web-jforum-integration/src/main/java/org/hisp/dhis/jforum/action/PopulateJForumAction.java	2009-08-21 10:41:53 +0000
@@ -30,7 +30,7 @@
 import org.hisp.dhis.jforum.manager.JForumManager;
 import org.hisp.dhis.system.util.TimeUtils;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 /**
  * @author Lars Helge Overland

=== renamed file 'local/za/dhis-web-jforum-integration/src/main/resources/xwork.xml' => 'local/za/dhis-web-jforum-integration/src/main/resources/struts.xml'
--- local/za/dhis-web-jforum-integration/src/main/resources/xwork.xml	2009-05-26 11:01:15 +0000
+++ local/za/dhis-web-jforum-integration/src/main/resources/struts.xml	2009-08-21 10:41:53 +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-jforum-integration" extends="dhis-web-commons" namespace="/dhis-web-jforum-integration">
@@ -15,4 +18,4 @@
 	</action>
     
   </package>
-</xwork>
+</struts>

=== modified file 'local/za/dhis-web-jforum-integration/src/main/webapp/WEB-INF/web.xml'
--- local/za/dhis-web-jforum-integration/src/main/webapp/WEB-INF/web.xml	2009-06-10 22:25:07 +0000
+++ local/za/dhis-web-jforum-integration/src/main/webapp/WEB-INF/web.xml	2009-08-21 10:41:53 +0000
@@ -34,8 +34,8 @@
     </init-param>
   </filter>
   <filter>
-    <filter-name>WebWork</filter-name>
-    <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+    <filter-name>Struts</filter-name>
+    <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
   </filter>
   
   <filter-mapping>
@@ -51,7 +51,7 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
   <filter-mapping>
-    <filter-name>WebWork</filter-name>
+    <filter-name>Struts</filter-name>
     <url-pattern>*.action</url-pattern>
   </filter-mapping>