upgrade sitemesh struts plugin now tomcat:run works

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

diff --git a/.gitignore b/.gitignore
index 47ff902a33b35955592997b1479019d9b626ca86..929120e5a7201a0360daa06ccdeb3ace145bb451 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,7 @@ ${plexus.home}
 archiva-modules/archiva-web/archiva-webapp/appserver-base/
 archiva-modules/archiva-web/archiva-webapp/overlays/
 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/archiva-applet.jar
+archiva-modules/archiva-web/archiva-webapp/src/main/webapp/META-INF/
+archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/redback/
+archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/redback/
+archiva-modules/archiva-web/archiva-webapp/src/main/webapp/template/redback/

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index a98f18d0203618f2c637517e2171638eee1e0e62..65920b9d19a9fe91d11c9b079339d1f2de1eb555 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -165,6 +165,11 @@
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.struts</groupId>
+      <artifactId>struts2-sitemesh-plugin</artifactId>
+      <version>${struts.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.redback.components.registry</groupId>
       <artifactId>spring-registry-api</artifactId>
@@ -669,6 +674,7 @@
                 <configuration>
                   <tasks>
                                                  <copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml" todir="${project.build.directory}/classes" />
+                    <delete dir="${basedir}/src/main/webapp/WEB-INF/lib" />
                   </tasks>
                 </configuration>
               </execution>
@@ -715,7 +721,7 @@
                       <type>war</type>
                       <overWrite>false</overWrite>
                       <outputDirectory>${basedir}/src/main/webapp</outputDirectory>
-                      <excludes>**/web.xml,lib</excludes>
+                      <excludes>**/web.xml,**/struts*.jar,**/sitemesh*.jar</excludes>
                     </artifactItem>
                   </artifactItems>
                 </configuration>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
index 961839766b126188853e6b1ebadc0de61ae5fd9f..9073be9b8e1c49e7dabcc457410fec7603bc22c2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
@@ -19,6 +19,8 @@ package org.apache.maven.archiva.web.action;
  * under the License.
  */
 
+import com.opensymphony.module.sitemesh.Factory;
+import com.opensymphony.sitemesh.webapp.SiteMeshFilter;
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.repository.MetadataResolutionException;
 import org.apache.archiva.metadata.repository.MetadataResolver;

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 fad3f335377312367371ce49867c633bfb419931..10ed5aaaf0399b8bbd6355dbc6b2dc4f59b65734 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
@@ -31,9 +31,7 @@
 
        <filter>
                <filter-name>sitemesh</filter-name>
-               <filter-class>
-                       com.opensymphony.sitemesh.webapp.SiteMeshFilter
-               </filter-class>
+               <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
        </filter>
 
   <filter>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
index 7780ac88060932b228f8e41a17929853e8b4cd5c..2df973ac86fd1b2d66823d79122f7677ad68835e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
@@ -27,6 +27,9 @@
       <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
     </layout>
   </appender>
+  <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder">
+    <level value="error"/>
+  </logger>
 
   <root>
     <priority value ="info" />