diff options
| author | Brett Porter <brett@apache.org> | 2009-03-18 02:33:47 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2009-03-18 02:33:47 +0000 |
| commit | fc374c71b838ecb731469cad39005805b0922635 (patch) | |
| tree | b00a6553a4007f35337c7109731d522362d640d2 /archiva-modules | |
| parent | 776361e6638cecc4e84169a23f010452d26a9be7 (diff) | |
| download | archiva-fc374c71b838ecb731469cad39005805b0922635.tar.gz archiva-fc374c71b838ecb731469cad39005805b0922635.zip | |
fix jetty:run
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755459 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 4 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index ccdbe7130..ffb4a5818 100644 --- 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 a8c61356e..11364cb48 100644 --- 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> |