summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/pom.xml8
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java2
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml4
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml3
5 files changed, 17 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 47ff902a3..929120e5a 100644
--- 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 a98f18d02..65920b9d1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -166,6 +166,11 @@
<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>
</dependency>
@@ -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 961839766..9073be9b8 100644
--- 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 fad3f3353..10ed5aaaf 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
@@ -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 7780ac880..2df973ac8 100644
--- 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" />