fix jetty:run

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755459 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index ccdbe71307da53e863c32152a57c7f21d5830bd5..ffb4a58188016ccb9a1dca9877dd70cd91f8dfc8 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -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>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index a8c61356e0d4154263d34196e1db950002e51b34..11364cb48c06d6593a484f0878c10979efee0861 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -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>