You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/08/07 11:46:27 UTC
svn commit: r429285 - in
/maven/continuum/branches/continuum-acegi/continuum-webapp: pom.xml
src/main/plexus/ src/main/plexus/plexus.xml
src/main/resources/plexus-application.xml
src/main/resources/plexus-session.xml src/main/webapp/WEB-INF/web.xml
Author: carlos
Date: Mon Aug 7 02:46:22 2006
New Revision: 429285
URL: http://svn.apache.org/viewvc?rev=429285&view=rev
Log:
Merged rev# 429214-429219 from trunk
Added:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/plexus/
- copied from r429219, maven/continuum/trunk/continuum-webapp/src/main/plexus/
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/plexus/plexus.xml
- copied unchanged from r429139, maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml
Removed:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-session.xml
Modified:
maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml?rev=429285&r1=429284&r2=429285&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml Mon Aug 7 02:46:22 2006
@@ -44,13 +44,33 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<configuration>
- <fileName>plexus-request.xml</fileName>
+ <fileName>plexus.xml</fileName>
<containerDescriptor>true</containerDescriptor>
+ <roleDefaults>
+ <roleDefault>
+ <role>com.opensymphony.xwork.Action</role>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ </roleDefault>
+ </roleDefaults>
</configuration>
<executions>
<execution>
+ <id>generate</id>
<goals>
<goal>descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>merge</id>
+ <configuration>
+ <output>${project.build.outputDirectory}/META-INF/plexus/plexus.xml</output>
+ <descriptors>
+ <descriptor>${project.build.directory}/generated-resources/plexus/plexus.xml</descriptor>
+ <descriptor>src/main/plexus/plexus.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>merge-descriptors</goal>
</goals>
</execution>
</executions>
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=429285&r1=429284&r2=429285&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml Mon Aug 7 02:46:22 2006
@@ -18,12 +18,6 @@
<param-value>localization/Continuum</param-value>
</context-param>
- <!-- this should be before the webwork filter -->
- <filter>
- <filter-name>plexus</filter-name>
- <filter-class>org.codehaus.plexus.xwork.PlexusFilter</filter-class>
- </filter>
-
<!--
Not integrated with plexus
<filter>
@@ -86,12 +80,6 @@
<filter-name>webwork</filter-name>
<filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
</filter>
-
- <!-- this should be before the webwork filter -->
- <filter-mapping>
- <filter-name>plexus</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
<!--
<filter-mapping>