diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/pom.xml b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/pom.xml index 7680279c0..773b669bb 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -233,23 +233,6 @@ activation provided - - - org.mortbay.jetty - jetty - 6.1.5 - test - - - httpunit - httpunit - 1.6.2 - test - - - xmlunit - xmlunit - org.codehaus.plexus plexus-quartz @@ -264,42 +247,6 @@ org.codehaus.plexus plexus-taskqueue - - org.codehaus.plexus.redback - redback-keys-memory - ${redback.version} - test - - - org.codehaus.plexus - plexus-container-default - - - - - org.codehaus.plexus.redback - redback-rbac-memory - ${redback.version} - test - - - org.codehaus.plexus - plexus-container-default - - - - - org.codehaus.plexus.redback - redback-users-memory - ${redback.version} - test - - - org.codehaus.plexus - plexus-container-default - - - commons-fileupload commons-fileupload diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java deleted file mode 100644 index b289188ed..000000000 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ArchivaMimeTypeLoader.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.apache.maven.archiva.web.repository; - -/* - * 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. - */ - -import org.apache.maven.archiva.webdav.util.MimeTypes; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; - -import java.io.IOException; -import java.net.URL; - -/** - * Custom Archiva MimeTypes loader for plexus-webdav's {@link MimeTypes} - * - * @author Joakim Erdfelt - * @version $Id$ - * @todo Support custom mime types from archiva-configuration. - * - * @plexus.component role="org.apache.maven.archiva.web.repository.ArchivaMimeTypeLoader" - */ -public class ArchivaMimeTypeLoader - implements Initializable -{ - /** - * @plexus.requirement - */ - private MimeTypes mimeTypes; - - public void initialize() - throws InitializationException - { - // TODO: Make mime types loading configurable. - // Load the mime types from archiva location. - if ( mimeTypes.getMimeType( "sha1" ) == null ) - { - URL url = this.getClass().getClassLoader().getResource( "/archiva-mime-types.txt" ); - if ( url == null ) - { - url = this.getClass().getClassLoader().getResource( "archiva-mime-types.txt" ); - } - - if ( url != null ) - { - try - { - mimeTypes.load( url.openStream() ); - } - catch ( IOException e ) - { - throw new InitializationException( "Unable to load archiva-mime-types.txt : " + e.getMessage(), e ); - } - } - } - } -} diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java deleted file mode 100644 index 085b3dcdd..000000000 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.apache.maven.archiva.web.repository; - -/* - * 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. - */ - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.SystemUtils; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - -/** - * PolicingServletRequest is for policing the incoming request for naughty bits, such as a double slashes, - * or paths that include "/../" type syntax, or query string. Stripping out all things that are - * not appropriate. - * - * @author Joakim Erdfelt - * @version $Id$ - */ -public class PolicingServletRequest - extends HttpServletRequestWrapper - implements HttpServletRequest -{ - private String fixedPathInfo; - - public PolicingServletRequest( HttpServletRequest originalRequest ) - { - super( originalRequest ); - - fixedPathInfo = originalRequest.getPathInfo(); - - if ( StringUtils.isNotBlank( fixedPathInfo ) ) - { - /* Perform a simple security normalization of the requested pathinfo. - * This is to cleanup requests that use "/../" or "///" type hacks. - */ - fixedPathInfo = FilenameUtils.normalize( fixedPathInfo ); - if ( SystemUtils.IS_OS_WINDOWS ) - { - // Adjust paths back to unix & url format expectations (when on windows) - fixedPathInfo = FilenameUtils.separatorsToUnix( fixedPathInfo ); - } - } - } - - @Override - public String getPathInfo() - { - return fixedPathInfo; - } - - @Override - public String getQueryString() - { - // No query string allowed. - return null; - } -} diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml index ab9ae2f45..b732fe8b5 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml @@ -81,7 +81,7 @@ RepositoryServlet - org.apache.maven.archiva.web.repository.RepositoryServlet + org.apache.maven.archiva.webdav.RepositoryServlet 1 diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml index ed8b416fe..6763a8867 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -111,6 +111,52 @@ + + xmlunit + xmlunit + + + org.mortbay.jetty + jetty + 6.1.5 + test + + + org.codehaus.plexus.redback + redback-keys-memory + ${redback.version} + test + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus.redback + redback-rbac-memory + ${redback.version} + test + + + org.codehaus.plexus + plexus-container-default + + + + + org.codehaus.plexus.redback + redback-users-memory + ${redback.version} + test + + + org.codehaus.plexus + plexus-container-default + + + diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java similarity index 98% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java index 7ced43901..ca6cc9bc7 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/RepositoryServlet.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,6 @@ import org.apache.maven.archiva.configuration.ConfigurationEvent; import org.apache.maven.archiva.configuration.ConfigurationListener; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.maven.archiva.webdav.*; import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet; import org.apache.jackrabbit.webdav.*; import org.codehaus.plexus.spring.PlexusToSpringUtils; diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletProxiedMetadataTestCase.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletProxiedMetadataTestCase.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java index b35de9fdc..c11da99c1 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletProxiedMetadataTestCase.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletProxiedTestCase.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletProxiedTestCase.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java index 28a68977d..1c1233748 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletProxiedTestCase.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java similarity index 94% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java index 6f2df4c32..6900bc13d 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/AbstractRepositoryServletTestCase.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,12 +29,15 @@ import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.maven.archiva.webdav.RepositoryServlet; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; +import junit.framework.Assert; + /** * AbstractRepositoryServletTestCase * @@ -85,13 +88,13 @@ protected void assertRepositoryValid( RepositoryServlet servlet, String repoId ) protected void assertResponseOK( WebResponse response ) { assertNotNull( "Should have recieved a response", response ); - assertEquals( "Should have been an OK response code.", HttpServletResponse.SC_OK, response.getResponseCode() ); + Assert.assertEquals( "Should have been an OK response code.", HttpServletResponse.SC_OK, response.getResponseCode() ); } protected void assertResponseNotFound( WebResponse response ) { assertNotNull( "Should have recieved a response", response ); - assertEquals( "Should have been an 404/Not Found response code.", HttpServletResponse.SC_NOT_FOUND, response + Assert.assertEquals( "Should have been an 404/Not Found response code.", HttpServletResponse.SC_NOT_FOUND, response .getResponseCode() ); } @@ -173,7 +176,7 @@ protected void setUp() @Override protected String getPlexusConfigLocation() { - return "org/apache/maven/archiva/web/repository/RepositoryServletTest.xml"; + return "org/apache/maven/archiva/webdav/RepositoryServletTest.xml"; } @Override diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/BypassSecuritySystem.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/BypassSecuritySystem.java similarity index 98% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/BypassSecuritySystem.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/BypassSecuritySystem.java index e99d7b42d..9ad1ae6f9 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/BypassSecuritySystem.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/BypassSecuritySystem.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/MimeTypesLoaderTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/MimeTypesLoaderTest.java similarity index 97% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/MimeTypesLoaderTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/MimeTypesLoaderTest.java index e58c1dba2..49c10b9c3 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/MimeTypesLoaderTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/MimeTypesLoaderTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletBrowseTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java similarity index 97% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletBrowseTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java index 63e123470..885b8c1e6 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletBrowseTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletDeployTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletDeployTest.java similarity index 97% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletDeployTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletDeployTest.java index ec53e804d..32ef17d20 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletDeployTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletDeployTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletNoProxyMetadataTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletNoProxyMetadataTest.java similarity index 98% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletNoProxyMetadataTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletNoProxyMetadataTest.java index 15df75479..5efdb52eb 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletNoProxyMetadataTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletNoProxyMetadataTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletNoProxyTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletNoProxyTest.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletNoProxyTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletNoProxyTest.java index 3222c01b3..2a6d2e40f 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletNoProxyTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletNoProxyTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataLocalOnlyTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java similarity index 98% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataLocalOnlyTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java index 883f38252..6c9d7dac8 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataLocalOnlyTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java index 2f4272922..9a2af21c8 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedMetadataRemoteOnlyTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedPluginSnapshotPolicyTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedPluginSnapshotPolicyTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java index 7d252bb1d..a776b5dce 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedPluginSnapshotPolicyTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedReleasePolicyTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedReleasePolicyTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java index ebf944e1a..144d49bb9 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedReleasePolicyTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedRelocatedTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedRelocatedTest.java similarity index 98% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedRelocatedTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedRelocatedTest.java index b0ca79344..2303836b6 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedRelocatedTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedRelocatedTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedSnapshotPolicyTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedSnapshotPolicyTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java index 7db24e4f9..da944d9f2 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedSnapshotPolicyTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java index dbff0a725..2a34b9ab0 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletRepositoryGroupTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java similarity index 99% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletRepositoryGroupTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java index 72684fd01..57453ea81 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletRepositoryGroupTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java similarity index 87% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java index f87cdb26b..badd20cb6 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /** * RepositoryServletSecurityTest diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletTest.java similarity index 96% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletTest.java index 201d1db99..41b0b09fc 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,10 +22,9 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.maven.archiva.webdav.RepositoryServlet; import com.meterware.httpunit.GetMethodWebRequest; -import com.meterware.httpunit.HttpNotFoundException; -import com.meterware.httpunit.HttpUnitOptions; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/StubRepositoryContentConsumers.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/StubRepositoryContentConsumers.java similarity index 92% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/StubRepositoryContentConsumers.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/StubRepositoryContentConsumers.java index 13324f1d3..ff9dbd237 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/StubRepositoryContentConsumers.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/StubRepositoryContentConsumers.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedDavResourceFactory.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavResourceFactory.java similarity index 96% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedDavResourceFactory.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavResourceFactory.java index 548211bf7..81d739d3a 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedDavResourceFactory.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavResourceFactory.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedDavSessionProvider.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavSessionProvider.java similarity index 96% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedDavSessionProvider.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavSessionProvider.java index 47423f465..567f348f0 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedDavSessionProvider.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedDavSessionProvider.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedRepositoryServlet.java similarity index 94% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedRepositoryServlet.java index 492ec2f56..57f37931c 100644 --- a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/UnauthenticatedRepositoryServlet.java +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/UnauthenticatedRepositoryServlet.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.web.repository; +package org.apache.maven.archiva.webdav; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,6 +21,7 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; +import org.apache.maven.archiva.webdav.RepositoryServlet; import javax.servlet.ServletConfig; diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j.xml b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j.xml new file mode 100644 index 000000000..a2e7ea23d --- /dev/null +++ b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml similarity index 100% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletSecurityTest.xml rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml similarity index 100% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml diff --git a/moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/resources/repository-archiva.xml b/moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/repository-archiva.xml similarity index 100% rename from moved-repo-servlet/archiva-modules/archiva-web/archiva-webapp/src/test/resources/repository-archiva.xml rename to moved-repo-servlet/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/repository-archiva.xml diff --git a/moved-repo-servlet/pom.xml b/moved-repo-servlet/pom.xml index e0811fec0..47a20ba21 100644 --- a/moved-repo-servlet/pom.xml +++ b/moved-repo-servlet/pom.xml @@ -28,7 +28,7 @@ org.apache.archiva archiva-parent - 3-SNAPSHOT + 4-SNAPSHOT ../parent/pom.xml Archiva @@ -184,6 +184,12 @@ 3.8.1 test + + httpunit + httpunit + 1.6.2 + test + easymock easymock