[MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva.. : archiva-webdav module

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

archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml

@@ -105,11 +105,11 @@
 -->
 
   <!-- WebDav objects -->
-  <logger name="org.apache.maven.archiva.webdav.ArchivaDavResource">
+  <logger name="org.apache.archiva.webdav.ArchivaDavResource">
     <level value="info"/>
   </logger>
   
-  <logger name="org.apache.maven.archiva.webdav.ArchivaDavResourceFactory">
+  <logger name="org.apache.archiva.webdav.ArchivaDavResourceFactory">
     <level value="info"/>
   </logger>
 

archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml

@@ -248,8 +248,8 @@
 
     
     <!-- <component>
-      <role>org.apache.maven.archiva.webdav.util.MimeTypes</role>
-      <implementation>org.apache.maven.archiva.webdav.util.MimeTypes</implementation>
+      <role>org.apache.archiva.webdav.util.MimeTypes</role>
+      <implementation>org.apache.archiva.webdav.util.MimeTypes</implementation>
       <description>MimeTypes</description>
       <configuration>
         <resource>archiva-mime-types.txt</resource>

archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml

@@ -96,8 +96,8 @@
 	<servlet>
 		<servlet-name>RepositoryServlet</servlet-name>
 		<servlet-class>
-			org.apache.maven.archiva.webdav.RepositoryServlet
-		</servlet-class>
+      org.apache.archiva.webdav.RepositoryServlet
+    </servlet-class>
 		<!-- Loading this on startup so as to take advantage of configuration listeners -->
 		<load-on-startup>1</load-on-startup>
 	</servlet>

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavLocatorFactory.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.webdav;
 import org.apache.jackrabbit.util.Text;
 import org.apache.jackrabbit.webdav.DavLocatorFactory;
 import org.apache.jackrabbit.webdav.DavResourceLocator;
-import org.apache.maven.archiva.webdav.util.RepositoryPathUtil;
+import org.apache.archiva.webdav.util.RepositoryPathUtil;
 
 /**
  */

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -50,8 +50,8 @@ import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.property.DavPropertySet;
 import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
 import org.apache.jackrabbit.webdav.property.ResourceType;
-import org.apache.maven.archiva.webdav.util.IndexWriter;
-import org.apache.maven.archiva.webdav.util.MimeTypes;
+import org.apache.archiva.webdav.util.IndexWriter;
+import org.apache.archiva.webdav.util.MimeTypes;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -57,9 +57,9 @@ import org.apache.archiva.repository.metadata.RepositoryMetadataException;
 import org.apache.archiva.repository.metadata.RepositoryMetadataMerge;
 import org.apache.archiva.repository.metadata.RepositoryMetadataReader;
 import org.apache.archiva.repository.metadata.RepositoryMetadataWriter;
-import org.apache.maven.archiva.webdav.util.MimeTypes;
-import org.apache.maven.archiva.webdav.util.RepositoryPathUtil;
-import org.apache.maven.archiva.webdav.util.WebdavMethodUtil;
+import org.apache.archiva.webdav.util.MimeTypes;
+import org.apache.archiva.webdav.util.RepositoryPathUtil;
+import org.apache.archiva.webdav.util.WebdavMethodUtil;
 import org.apache.maven.model.DistributionManagement;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Relocation;

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceLocator.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSession.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.DavServletRequest;
 import org.apache.jackrabbit.webdav.DavSessionProvider;
 import org.apache.jackrabbit.webdav.WebdavRequest;
-import org.apache.maven.archiva.webdav.util.RepositoryPathUtil;
-import org.apache.maven.archiva.webdav.util.WebdavMethodUtil;
+import org.apache.archiva.webdav.util.RepositoryPathUtil;
+import org.apache.archiva.webdav.util.WebdavMethodUtil;
 import org.codehaus.plexus.redback.authentication.AuthenticationException;
 import org.codehaus.plexus.redback.authentication.AuthenticationResult;
 import org.codehaus.plexus.redback.authorization.UnauthorizedException;

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaVirtualDavResource.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -40,8 +40,8 @@ import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.property.DavPropertySet;
 import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
 import org.apache.jackrabbit.webdav.property.ResourceType;
-import org.apache.maven.archiva.webdav.util.IndexWriter;
-import org.apache.maven.archiva.webdav.util.MimeTypes;
+import org.apache.archiva.webdav.util.IndexWriter;
+import org.apache.archiva.webdav.util.MimeTypes;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/BrowserRedirectException.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/LogicalResource.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryLocator.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/UnauthorizedDavException.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/IndexWriter.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav.util;
+package org.apache.archiva.webdav.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav.util;
+package org.apache.archiva.webdav.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -48,7 +48,7 @@ public class MimeTypes
 {
     private static final String DEFAULT_MIME_TYPE = "application/octet-stream";
 
-    private String resource = "org/apache/maven/archiva/webdav/util/mime.types";
+    private String resource = "org/apache/archiva/webdav/util/mime.types";
 
     private Map<String, String> mimeMap = new HashMap<String, String>();
 

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/RepositoryPathUtil.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav.util;
+package org.apache.archiva.webdav.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/WebdavMethodUtil.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav.util;
+package org.apache.archiva.webdav.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/main/resources/META-INF/spring-context.xml

@@ -28,6 +28,6 @@
        default-lazy-init="true">
 
   <context:annotation-config/>
-  <context:component-scan base-package="org.apache.maven.archiva.webdav"/>
+  <context:component-scan base-package="org.apache.archiva.webdav"/>
 
 </beans>

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedMetadataTestCase.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceLocatorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.webdav.lock.LockManager;
 import org.apache.jackrabbit.webdav.lock.Scope;
 import org.apache.jackrabbit.webdav.lock.SimpleLockManager;
 import org.apache.jackrabbit.webdav.lock.Type;
-import org.apache.maven.archiva.webdav.util.MimeTypes;
+import org.apache.archiva.webdav.util.MimeTypes;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MimeTypesLoaderTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.webdav;
  */
 
 import junit.framework.TestCase;
-import org.apache.maven.archiva.webdav.util.MimeTypes;
+import org.apache.archiva.webdav.util.MimeTypes;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/MockServletAuthenticator.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletDeployTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@ import java.io.InputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.webdav.httpunit.MkColMethodWebRequest;
+import org.apache.archiva.webdav.httpunit.MkColMethodWebRequest;
 import org.junit.Test;
 
 

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyMetadataTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataLocalOnlyTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedMetadataRemoteOnlyTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPassthroughTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedRelocatedTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedSnapshotPolicyTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletProxiedTimestampedSnapshotPolicyTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/StubRepositoryContentConsumers.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavResourceFactory.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedDavSessionProvider.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/UnauthenticatedRepositoryServlet.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav;
+package org.apache.archiva.webdav;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/httpunit/MkColMethodWebRequest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav.httpunit;
+package org.apache.archiva.webdav.httpunit;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MimeTypesTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav.util;
+package org.apache.archiva.webdav.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.webdav.util;
+package org.apache.archiva.webdav.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml

@@ -30,7 +30,7 @@
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
   <context:annotation-config/>
-  <context:component-scan base-package="org.apache.maven.archiva.webdav,org.apache.archiva.metadata.repository"/>
+  <context:component-scan base-package="org.apache.archiva.webdav,org.apache.archiva.metadata.repository"/>
 
   <bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
     <property name="properties">
@@ -44,7 +44,7 @@
     </property>
   </bean>
 
-  <bean name="servletAuthenticator" class="org.apache.maven.archiva.webdav.MockServletAuthenticator"/>
+  <bean name="servletAuthenticator" class="org.apache.archiva.webdav.MockServletAuthenticator"/>
 
   <bean name="archivaConfiguration#default"  class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#default"/>
@@ -67,7 +67,7 @@
     </property>
   </bean>
   <!--
-  <bean name="davResourceFactory#archiva" class="org.apache.maven.archiva.webdav.UnauthenticatedDavResourceFactory">
+  <bean name="davResourceFactory#archiva" class="org.apache.archiva.webdav.UnauthenticatedDavResourceFactory">
     <property name="servletAuth" ref="servletAuthenticator"/>
   </bean>
   -->

archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml

@@ -30,7 +30,7 @@
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
   <context:annotation-config/>
-  <context:component-scan base-package="org.apache.maven.archiva.webdav,org.apache.archiva.metadata.repository"/>
+  <context:component-scan base-package="org.apache.archiva.webdav,org.apache.archiva.metadata.repository"/>
 
   <bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
     <property name="properties">
@@ -44,7 +44,7 @@
     </property>
   </bean>
 
-  <bean name="servletAuthenticator" class="org.apache.maven.archiva.webdav.MockServletAuthenticator"/>
+  <bean name="servletAuthenticator" class="org.apache.archiva.webdav.MockServletAuthenticator"/>
 
   <bean name="archivaConfiguration#default"  class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#default"/>
@@ -69,7 +69,7 @@
 
   <alias name="archivaDavResourceFactory#unauthenticated" alias="davResourceFactory#archiva"/>
   <!--
-  <bean name="davResourceFactory#archiva" class="org.apache.maven.archiva.webdav.UnauthenticatedDavResourceFactory">
+  <bean name="davResourceFactory#archiva" class="org.apache.archiva.webdav.UnauthenticatedDavResourceFactory">
     <property name="servletAuth" ref="servletAuthenticator"/>
   </bean>
   -->