git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134679 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M1
@@ -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/ |
@@ -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> |
@@ -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; |
@@ -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> |
@@ -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" /> |