change configuration base to org.apache.archiva instead of org.apache.maven.archiva, update "upgrading" document accordingly

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

14 files changed, 44 insertions, 59 deletions

diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 97ac42da9..647ad06ca 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -151,10 +151,10 @@
           <instrumentation>
             <!-- exclude generated -->
             <excludes>
-              <exclude>org/apache/maven/archiva/configuration/io/**</exclude>
-              <exclude>org/apache/maven/archiva/configuration/*RepositoryConfiguration.*</exclude>
-              <exclude>org/apache/maven/archiva/configuration/Configuration.*</exclude>
-              <exclude>org/apache/maven/archiva/configuration/Proxy.*</exclude>
+              <exclude>org/apache/archiva/configuration/io/**</exclude>
+              <exclude>org/apache/archiva/configuration/*RepositoryConfiguration.*</exclude>
+              <exclude>org/apache/archiva/configuration/Configuration.*</exclude>
+              <exclude>org/apache/archiva/configuration/Proxy.*</exclude>
             </excludes>
           </instrumentation>
         </configuration>
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index a639782ee..f5ae29540 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -149,7 +149,7 @@ public class DefaultArchivaConfiguration
      */
     private boolean isConfigurationDefaulted = false;
 
-    private static final String KEY = "org.apache.maven.archiva";
+    private static final String KEY = "org.apache.archiva";
 
     public Configuration getConfiguration()
     {
@@ -547,11 +547,11 @@ public class DefaultArchivaConfiguration
 
         // olamy hackish I know :-)
         contents = "<configuration><xml fileName=\"" + fileLocation
-            + "\" config-forceCreate=\"true\" config-name=\"org.apache.maven.archiva.user\"/>" + "</configuration>";
+            + "\" config-forceCreate=\"true\" config-name=\"org.apache.archiva.user\"/>" + "</configuration>";
 
         ( (CommonsConfigurationRegistry) registry ).setProperties( contents );
 
-        ( (CommonsConfigurationRegistry) registry ).initialize();
+        registry.initialize();
 
         for ( RegistryListener regListener : registryListeners )
         {
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
index 28bc6fcfb..52d0d252e 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
@@ -54,14 +54,6 @@ public class ArchivaConfigurationTest
         return new File( FileUtil.getBasedir(), path );
     }
 
-    /**
-     * @TODO to remove
-     */
-    protected String getSpringConfigLocation()
-    {
-        return "org/apache/maven/archiva/configuration/spring-context.xml";
-    }
-
     protected <T> T lookup( Class<T> clazz, String hint )
     {
         return componentContainer.getComponent( clazz, hint );
@@ -221,10 +213,9 @@ public class ArchivaConfigurationTest
         throws Exception
     {
 
-        System.setProperty( "org.apache.maven.archiva.webapp.ui.appletFindEnabled", "false" );
+        System.setProperty( "org.apache.archiva.webapp.ui.appletFindEnabled", "false" );
 
-        ArchivaConfiguration archivaConfiguration =
-            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-configuration" );
+        ArchivaConfiguration archivaConfiguration = lookup( ArchivaConfiguration.class, "test-configuration" );
 
         archivaConfiguration.reload();
 
@@ -236,7 +227,7 @@ public class ArchivaConfigurationTest
         }
         finally
         {
-            System.getProperties().remove( "org.apache.maven.archiva.webapp.ui.appletFindEnabled" );
+            System.getProperties().remove( "org.apache.archiva.webapp.ui.appletFindEnabled" );
         }
     }
 
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java
index 097604be9..08a4b22df 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java
@@ -39,13 +39,6 @@ public class MavenProxyPropertyLoaderTest
 {
     private MavenProxyPropertyLoader loader;
 
-
-    // TODO to remove
-    protected String getSpringConfigLocation()
-    {
-        return "org/apache/maven/archiva/configuration/spring-context.xml";
-    }
-
     @Test
     public void testLoadValidMavenProxyConfiguration()
         throws IOException, InvalidConfigurationException
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
index b002d3421..fdf125589 100755
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
@@ -48,7 +48,7 @@
         <![CDATA[
         <configuration>
             <xml fileName="${basedir}/src/test/conf/archiva-0.9.xml"
-                 config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+                 config-name="org.apache.archiva" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -66,7 +66,7 @@
         <configuration>
             <system/>
             <xml fileName="${basedir}/src/test/conf/repository-manager.xml"
-                 config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+                 config-name="org.apache.archiva" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -85,8 +85,8 @@
         <configuration>
             <system/>
             <xml fileName="${basedir}/target/test-autodetect-v1/archiva-user.xml" config-optional="true"
-                 config-name="org.apache.maven.archiva.user"
-                 config-at="org.apache.maven.archiva"/>
+                 config-name="org.apache.archiva.user"
+                 config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -104,7 +104,7 @@
         <configuration>
             <system/>
             <xml fileName="${basedir}/src/test/conf/archiva-v1.xml"
-                 config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+                 config-name="org.apache.archiva" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -121,7 +121,7 @@
         <![CDATA[
         <configuration>
             <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
-                 config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+                 config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -138,9 +138,9 @@
         <![CDATA[
       <configuration>
           <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="true"
-               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
           <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="false"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
       </configuration>
         ]]>
       </value>
@@ -157,9 +157,9 @@
         <![CDATA[
       <configuration>
           <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="false"
-               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
           <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
       </configuration>
         ]]>
       </value>
@@ -176,9 +176,9 @@
         <![CDATA[
       <configuration>
           <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="true"
-               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
           <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="false"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
       </configuration>
         ]]>
       </value>
@@ -196,9 +196,9 @@
         <![CDATA[
       <configuration>
           <xml fileName="${basedir}/src/test/conf/conf-user.xml" config-optional="true" config-forceCreate="true"
-               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
           <xml fileName="${basedir}/src/test/conf/conf-base.xml" config-optional="true" config-forceCreate="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
       </configuration>
         ]]>
       </value>
@@ -216,7 +216,7 @@
         <![CDATA[
         <configuration>
             <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
-                 config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+                 config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -235,7 +235,7 @@
         <![CDATA[
         <configuration>
             <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
-                 config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+                 config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -253,7 +253,7 @@
         <![CDATA[
       <configuration>
           <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
       </configuration>
         ]]>
       </value>
@@ -273,9 +273,9 @@
         <![CDATA[
       <configuration>
           <xml fileName="${basedir}/target/*intentionally:invalid*/.m2/archiva-user.xml" config-optional="true"
-               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
           <xml fileName="${basedir}/target/*intentionally:invalid*/conf/archiva.xml" config-optional="true"
-               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
       </configuration>
         ]]>
       </value>
@@ -294,9 +294,9 @@
         <![CDATA[
       <configuration>
           <xml fileName="${basedir}/target/*intentionally:invalid*/.m2/archiva-user.xml" config-optional="true"
-               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
           <xml fileName="${basedir}/target/test-appserver-base/conf/archiva.xml" config-optional="true"
-               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
       </configuration>
         ]]>
       </value>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
index 97517e92b..5c8a72210 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
@@ -46,7 +46,7 @@
           <system/>
           <xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
                config-optional="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
index d2b14a93d..2ee0d09ce 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
@@ -39,7 +39,7 @@
         <![CDATA[
         <configuration>
           <xml fileName="${basedir}/src/test/conf/repository-manager.xml"
-               config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -58,7 +58,7 @@
           <system/>
           <xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
                config-optional="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
index 94eea9566..16b159cc4 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
@@ -55,7 +55,7 @@
         <![CDATA[
         <configuration>
           <xml fileName="${basedir}/src/test/conf/repository-manager.xml"
-               config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -89,7 +89,7 @@
         <![CDATA[
         <configuration>
           <xml fileName="${basedir}/src/test/conf/repository-manager-daysOld.xml"
-               config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
@@ -108,7 +108,7 @@
           <system/>
           <xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
                config-optional="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
index 438ff5574..2dc68f49b 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
@@ -37,7 +37,7 @@
           <system/>
           <xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
                config-optional="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
index 837d1e27a..5a1ef90a2 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
@@ -18,6 +18,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
@@ -37,7 +38,7 @@
           <system/>
           <xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
                config-optional="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index 87aae18cd..57d34b948 100755
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -80,7 +80,7 @@
           <instrumentation>
             <!-- exclude generated -->
             <excludes>
-              <exclude>org/apache/maven/archiva/reporting/model/**</exclude>
+              <exclude>org/apache/archiva/reporting/model/**</exclude>
             </excludes>
           </instrumentation>
         </configuration>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
index a18703d6d..6eebfe03f 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
@@ -49,7 +49,7 @@
           <system/>
           <xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
                config-optional="true"
-               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
         </configuration>
         ]]>
       </value>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml
index eeaaf2986..db60abe31 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml
@@ -41,7 +41,7 @@
           <configuration>
             <system/>
             <xml fileName="${basedir}/src/test/resources/scanner-archiva.xml"
-                 config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+                 config-name="org.apache.archiva" config-at="org.apache.archiva"/>
           </configuration>
       ]]>
       </value>
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
index 093614788..b2a61d08c 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
@@ -42,7 +42,7 @@
       <configuration>
           <system/>
           <xml fileName="${basedir}/src/test/resources/scanner-archiva.xml"
-               config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+               config-name="org.apache.archiva" config-at="org.apache.archiva"/>
       </configuration>
         ]]>
       </value>