dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4671
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-09-24 12:19:34 +0200
message:
  Upgraded to Struts 2.2.3.1. Removed chaining interceptor. NOTE this means that the action chain type will no longer work.
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
  dhis-2/pom.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-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2011-09-22 07:18:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2011-09-24 10:19:34 +0000
@@ -9,7 +9,6 @@
   <!-- Properties -->
 
   <constant name="struts.velocity.contexts" value="org.hisp.dhis.encoding.velocity.EncoderVelocityContext" />
-  <constant name="struts.velocity.toolboxlocation" value="toolbox.xml" /> <!-- Work-around -->
   <constant name="struts.i18n.encoding" value="UTF-8" />
   <constant name="struts.multipart.parser" value="jakarta" />
   <constant name="struts.multipart.maxSize" value="1073741824" />
@@ -56,7 +55,6 @@
       <interceptor-stack name="commonInterceptors">
         <interceptor-ref name="staticParams" />
         <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" />

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2011-09-21 18:20:11 +0000
+++ dhis-2/pom.xml	2011-09-24 10:19:34 +0000
@@ -249,6 +249,7 @@
       </dependency>
       <dependency>
         <groupId>org.hisp.dhis</groupId>
+
         <artifactId>dhis-support-hibernate</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -383,12 +384,12 @@
       <dependency>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-core</artifactId>
-        <version>2.1.8.1</version>
+        <version>2.2.3.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-spring-plugin</artifactId>
-        <version>2.1.8.1</version>
+        <version>2.2.3.1</version>
       </dependency>
       <dependency>
         <groupId>velocity</groupId>