You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2008/05/28 09:51:28 UTC
svn commit: r660847 - in
/archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav:
./ src/test/java/org/apache/maven/archiva/webdav/ src/test/resources/
src/test/resources/META-INF/ src/test/resources/WEB-INF/
src/test/resources/...
Author: jdumay
Date: Wed May 28 00:51:28 2008
New Revision: 660847
URL: http://svn.apache.org/viewvc?rev=660847&view=rev
Log:
Tests now pass. Ill checkover everything then merge it back into head...
Added:
archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/META-INF/
- copied from r660783, archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/resources/META-INF/
archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/
archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
- copied, changed from r660783, archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/artifact.jar
archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml
Modified:
archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml
archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java
archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
Modified: archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=660847&r1=660846&r2=660847&view=diff
==============================================================================
--- archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml Wed May 28 00:51:28 2008
@@ -112,6 +112,22 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-slf4j-logging</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
</dependency>
Modified: archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java
URL: http://svn.apache.org/viewvc/archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java?rev=660847&r1=660846&r2=660847&view=diff
==============================================================================
--- archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java (original)
+++ archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java Wed May 28 00:51:28 2008
@@ -168,7 +168,7 @@
HttpUnitOptions.setExceptionsThrownOnErrorStatus( false );
- sr = new ServletRunner( getTestFile( "src/test/webapp/WEB-INF/web.xml" ) );
+ sr = new ServletRunner( getTestFile( "src/test/resources/WEB-INF/web.xml" ) );
sr.registerServlet( "/repository/*", UnauthenticatedRepositoryServlet.class.getName() );
sc = sr.newClient();
}
Copied: archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml (from r660783, archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml?p2=archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml&p1=archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml&r1=660783&r2=660847&rev=660847&view=diff
==============================================================================
--- archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml (original)
+++ archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml Wed May 28 00:51:28 2008
@@ -38,7 +38,7 @@
<param-value>
classpath*:/META-INF/plexus/components.xml
classpath*:/META-INF/spring-context.xml
- target/test-classes/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
+ target/test-classes/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
</param-value>
</context-param>
Added: archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/artifact.jar
URL: http://svn.apache.org/viewvc/archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/artifact.jar?rev=660847&view=auto
==============================================================================
--- archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/artifact.jar (added)
+++ archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/artifact.jar Wed May 28 00:51:28 2008
@@ -0,0 +1 @@
+artifact.jar
Modified: archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml?rev=660847&r1=660846&r2=660847&view=diff
==============================================================================
--- archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml (original)
+++ archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml Wed May 28 00:51:28 2008
@@ -102,18 +102,18 @@
<component>
<role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
<role-hint>default</role-hint>
- <implementation>org.apache.maven.archiva.web.repository.StubRepositoryContentConsumers</implementation>
+ <implementation>org.apache.maven.archiva.webdav.StubRepositoryContentConsumers</implementation>
</component>
<component>
<role>org.codehaus.plexus.redback.system.SecuritySystem</role>
<role-hint>default</role-hint>
- <implementation>org.apache.maven.archiva.web.repository.BypassSecuritySystem</implementation>
+ <implementation>org.apache.maven.archiva.webdav.BypassSecuritySystem</implementation>
</component>
<component>
<role>org.apache.maven.archiva.webdav.ArchivaDavResourceFactory</role>
- <implementation>org.apache.maven.archiva.web.repository.UnauthenticatedDavResourceFactory</implementation>
+ <implementation>org.apache.maven.archiva.webdav.UnauthenticatedDavResourceFactory</implementation>
<requirements>
<requirement>
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
Added: archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml
URL: http://svn.apache.org/viewvc/archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml?rev=660847&view=auto
==============================================================================
--- archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml (added)
+++ archiva/branches/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-archiva.xml Wed May 28 00:51:28 2008
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<configuration>
+
+ <version>2</version>
+
+ <repositoryScanning>
+ <fileTypes>
+ <fileType>
+ <id>artifacts</id>
+ <patterns>
+ <pattern>**/*.pom</pattern>
+ <pattern>**/*.jar</pattern>
+ <pattern>**/*.ear</pattern>
+ <pattern>**/*.war</pattern>
+ <pattern>**/*.car</pattern>
+ <pattern>**/*.sar</pattern>
+ <pattern>**/*.mar</pattern>
+ <pattern>**/*.rar</pattern>
+ <pattern>**/*.dtd</pattern>
+ <pattern>**/*.tld</pattern>
+ <pattern>**/*.tar.gz</pattern>
+ <pattern>**/*.tar.bz2</pattern>
+ <pattern>**/*.zip</pattern>
+ </patterns>
+ </fileType>
+ <fileType>
+ <id>indexable-content</id>
+ <patterns>
+ <pattern>**/*.txt</pattern>
+ <pattern>**/*.TXT</pattern>
+ <pattern>**/*.block</pattern>
+ <pattern>**/*.config</pattern>
+ <pattern>**/*.pom</pattern>
+ <pattern>**/*.xml</pattern>
+ <pattern>**/*.xsd</pattern>
+ <pattern>**/*.dtd</pattern>
+ <pattern>**/*.tld</pattern>
+ </patterns>
+ </fileType>
+ <fileType>
+ <id>auto-remove</id>
+ <patterns>
+ <pattern>**/*.bak</pattern>
+ <pattern>**/*~</pattern>
+ <pattern>**/*-</pattern>
+ </patterns>
+ </fileType>
+ <fileType>
+ <id>ignored</id>
+ <patterns>
+ <pattern>**/.htaccess</pattern>
+ <pattern>**/KEYS</pattern>
+ <pattern>**/*.rb</pattern>
+ <pattern>**/*.sh</pattern>
+ <pattern>**/.svn/**</pattern>
+ <pattern>**/.DAV/**</pattern>
+ </patterns>
+ </fileType>
+ </fileTypes>
+ <knownContentConsumers>
+ <knownContentConsumer>update-db-artifact</knownContentConsumer>
+ <knownContentConsumer>create-missing-checksums</knownContentConsumer>
+ <knownContentConsumer>update-db-repository-metadata</knownContentConsumer>
+ <knownContentConsumer>validate-checksum</knownContentConsumer>
+ <knownContentConsumer>validate-signature</knownContentConsumer>
+ <knownContentConsumer>index-content</knownContentConsumer>
+ <knownContentConsumer>auto-remove</knownContentConsumer>
+ <knownContentConsumer>auto-rename</knownContentConsumer>
+ </knownContentConsumers>
+ <invalidContentConsumers>
+ <invalidContentConsumer>update-db-bad-content</invalidContentConsumer>
+ </invalidContentConsumers>
+ </repositoryScanning>
+
+ <databaseScanning>
+ <cronExpression>0 0 * * * ?</cronExpression>
+ <unprocessedConsumers>
+ <unprocessedConsumer>index-artifact</unprocessedConsumer>
+ <unprocessedConsumer>update-db-project</unprocessedConsumer>
+ <unprocessedConsumer>validate-repository-metadata</unprocessedConsumer>
+ <unprocessedConsumer>index-archive-toc</unprocessedConsumer>
+ <unprocessedConsumer>update-db-bytecode-stats</unprocessedConsumer>
+ <unprocessedConsumer>index-public-methods</unprocessedConsumer>
+ </unprocessedConsumers>
+ <cleanupConsumers>
+ <cleanupConsumer>not-present-remove-db-artifact</cleanupConsumer>
+ <cleanupConsumer>not-present-remove-db-project</cleanupConsumer>
+ <cleanupConsumer>not-present-remove-indexed</cleanupConsumer>
+ </cleanupConsumers>
+ </databaseScanning>
+
+</configuration>