Author: brett
Date: Wed Mar 18 02:33:47 2009
New Revision: 755459
URL: http://svn.apache.org/viewvc?rev=755459&view=rev
Log:
fix jetty:run
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=755459&r1=755458&r2=755459&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Mar 18
02:33:47 2009
@@ -354,10 +354,10 @@
<configuration>
<tasks>
<delete includeemptydirs="true">
- <fileset dir="${basedir}/src/main/webapp/WEB-INF/lib"
includes="**/struts2*.jar" />
+ <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.*" />
+ <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes"
includes="struts.xml,struts-security.xml" />
</delete>
</tasks>
</configuration>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=755459&r1=755458&r2=755459&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
Wed Mar 18 02:33:47 2009
@@ -82,7 +82,6 @@
classpath*:META-INF/plexus/components.xml
classpath*:META-INF/spring-context.xml
/WEB-INF/classes/META-INF/plexus/application.xml
- /WEB-INF/classes/META-INF/plexus/components.xml
/WEB-INF/applicationContext.xml
</param-value>
</context-param>
