Return-Path: 
 <commits-return-4448-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: (qmail 3380 invoked from network); 24 Oct 2008 22:44:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 24 Oct 2008 22:44:03 -0000
Received: (qmail 88277 invoked by uid 500); 24 Oct 2008 22:44:06 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 88255 invoked by uid 500); 24 Oct 2008 22:44:06 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 88246 invoked by uid 99); 24 Oct 2008 22:44:06 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Oct 2008 15:44:06 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Oct 2008 22:42:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CCD2D23888EB; Fri, 24 Oct 2008 15:43:33 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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
Date: Fri, 24 Oct 2008 22:43:33 -0000
To: commits@continuum.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081024224333.CCD2D23888EB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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 -->