You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/10/25 00:43:33 UTC
svn commit: r707771 - in /continuum/branches/continuum-struts2:
continuum-webapp/pom.xml continuum-webapp/src/main/resources/struts.xml
continuum-webapp/src/main/webapp/WEB-INF/web.xml pom.xml
Author: olamy
Date: Fri Oct 24 15:43:33 2008
New Revision: 707771
URL: http://svn.apache.org/viewvc?rev=707771&view=rev
Log:
use last 2.0.x struts2 release
add a hack to start jetty:run
Modified:
continuum/branches/continuum-struts2/continuum-webapp/pom.xml
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml
continuum/branches/continuum-struts2/pom.xml
Modified: continuum/branches/continuum-struts2/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/pom.xml?rev=707771&r1=707770&r2=707771&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/pom.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/pom.xml Fri Oct 24 15:43:33 2008
@@ -128,6 +128,35 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ here an hack to prevent multiple struts core in classpath
+ which prevent struts start
+ and same struts.xml in the classpath too
+ -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cleanup-struts-jar-in-webapp</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete includeemptydirs="true">
+ <fileset dir="${basedir}/src/main/webapp/WEB-INF/lib" includes="**/struts2*.jar"/>
+ </delete>
+ <delete includeemptydirs="true">
+ <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes" includes="**/struts.*"/>
+ </delete>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
@@ -458,9 +487,12 @@
<artifactId>struts2-core</artifactId>
</dependency>
<dependency>
+ <groupId>com.opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <scope>runtime</scope>
</dependency>
<!--
Redback Dependencies
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml?rev=707771&r1=707770&r2=707771&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml Fri Oct 24 15:43:33 2008
@@ -30,7 +30,6 @@
<package name="default" extends="struts-default">
<interceptors>
- <interceptor name="exception-logging" class="exceptionLogging"/>
<interceptor name="continuumConfigurationCheck" class="forceContinuumConfigurationInterceptor"/>
<interceptor name="redbackForceAdminUser" class="redbackForceAdminUserInterceptor"/>
<interceptor name="redbackSecureActions" class="redbackSecureActionInterceptor"/>
@@ -43,7 +42,6 @@
<interceptor-ref name="redbackForceAdminUser"/>
<interceptor-ref name="redbackAutoLogin"/>
<interceptor-ref name="defaultStack"/>
- <interceptor-ref name="exception-logging"/>
<interceptor-ref name="redbackSecureActions"/>
<interceptor-ref name="redbackPolicyEnforcement"/>
<interceptor-ref name="continuumConfigurationCheck"/>
@@ -60,7 +58,6 @@
<interceptor-ref name="redbackForceAdminUser"/>
<interceptor-ref name="redbackAutoLogin"/>
<interceptor-ref name="defaultStack"/>
- <interceptor-ref name="exception-logging"/>
<interceptor-ref name="redbackPolicyEnforcement"/>
<interceptor-ref name="redbackSecureActions"/>
<interceptor-ref name="validation">
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=707771&r1=707770&r2=707771&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/web.xml Fri Oct 24 15:43:33 2008
@@ -35,9 +35,10 @@
<param-value>localization/Continuum</param-value>
</context-param>
+
<filter>
- <filter-name>webwork-cleanup</filter-name>
- <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
+ <filter-name>struts2-cleanup</filter-name>
+ <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
</filter>
<filter>
@@ -46,12 +47,12 @@
</filter>
<filter>
- <filter-name>webwork</filter-name>
- <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+ <filter-name>struts2</filter-name>
+ <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
</filter>
<filter-mapping>
- <filter-name>webwork-cleanup</filter-name>
+ <filter-name>struts2-cleanup</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
@@ -61,7 +62,7 @@
</filter-mapping>
<filter-mapping>
- <filter-name>webwork</filter-name>
+ <filter-name>struts2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
Modified: continuum/branches/continuum-struts2/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/pom.xml?rev=707771&r1=707770&r2=707771&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/pom.xml (original)
+++ continuum/branches/continuum-struts2/pom.xml Fri Oct 24 15:43:33 2008
@@ -804,7 +804,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
- <version>2.0.11.2</version>
+ <version>2.0.12</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -815,7 +815,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>2.0.11.2</version>
+ <version>2.0.12</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -823,6 +823,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ <version>2.0.6</version>
+ </dependency>
<!--
Plexus Redback Dependencies
-->
@@ -946,7 +951,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId>
- <version>1.0.1</version>
+ <version>1.2</version>
</dependency>
<!-- due to http://jira.codehaus.org/browse/MECLIPSE-472 -->