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

12 files changed, 16 insertions, 30 deletions

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
index 2968237ba..fe0be3d31 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
@@ -50,7 +50,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-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java
index e6ed541d1..5adfbbc77 100644
--- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java
+++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java
@@ -60,11 +60,6 @@ public class ArchivaServletAuthenticatorTest
         setupRepository( "corporate" );
     }
 
-    protected String getPlexusConfigLocation()
-    {
-        return "org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml";
-    }
-
     protected void assignRepositoryManagerRole( String principal, String repoId )
         throws Exception
     {
diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
index 39cc30558..2fc01c431 100644
--- a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
@@ -91,7 +91,7 @@
           <system/>
           <xml fileName="${basedir}/target/test-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-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
index ef3452f1d..7fa34f350 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
@@ -44,9 +44,9 @@ import javax.servlet.jsp.tagext.TryCatchFinally;
  * It was easier to do it this way, vs accessing the dependency graph via a JSP.
  * 
  * <pre>
- *   <archiva:dependency-tree groupId="org.apache.maven.archiva" 
+ *   <archiva:dependency-tree groupId="org.apache.archiva"
  *                            artifactId="archiva-common" 
- *                            version="1.0"
+ *                            version="1.3.5"
  *                            nodevar="node">
  *     <b>${node.groupId}</b>:<b>${node.artifactId}</b>:<b>${node.version}</b> (${node.scope})
  *   </archiva:dependency-tree>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
index 53929ea58..09f80bb75 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
@@ -67,10 +67,6 @@
     <level value="info"/>
   </logger>
   
-  <logger name="org.apache.maven.archiva">
-    <level value="info"/>
-  </logger>
-  
   <logger name="org.codehaus.redback">
     <level value="info"/>
   </logger>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
index 19a6ad501..ef7d0c9a0 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
@@ -42,4 +42,4 @@ struts.multipart.maxSize=10485760
 # TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes
 
 # Localization
-struts.custom.i18n.resources=org.codehaus.plexus.redback.struts2.default,org.apache.maven.archiva.redback.custom
+struts.custom.i18n.resources=org.codehaus.plexus.redback.struts2.default,org.apache.archiva.redback.custom
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 8900c7ec6..9308655b0 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -170,8 +170,8 @@
           <system/>
           <jndi prefix="java:comp/env" config-optional="true"/>
           <xml fileName="${user.home}/.m2/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"/>
           <xml fileName="${user.home}/.m2/shared.xml" config-optional="true"
                config-name="org.apache.maven.shared.app.user" config-at="org.apache.maven.shared.app"
                config-forceCreate="true"/>
@@ -180,15 +180,15 @@
           <properties fileName="${user.home}/.m2/archiva.properties" config-optional="true"
                       config-at="org.codehaus.plexus.redback"/>
           <xml fileName="${appserver.base}/conf/archiva.xml" 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"/>
           <xml fileName="${appserver.base}/conf/shared.xml" config-optional="true"
                config-name="org.apache.maven.shared.app.base" config-at="org.apache.maven.shared.app"/>
           <xml fileName="${appserver.base}/conf/common.xml" config-optional="true"/>
           <properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.redback"/>
           <xml fileName="${appserver.home}/conf/archiva.xml" config-optional="true"
-               config-at="org.apache.maven.archiva"/>
+               config-at="org.apache.archiva"/>
           <xml fileName="${appserver.home}/conf/shared.xml" config-optional="true"
                config-at="org.apache.maven.shared.app"/>
           <xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
index 03ea7e7c8..2f4c5d5cc 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.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"
@@ -38,8 +39,8 @@
           <system/>
 
           <xml fileName="${appserver.base}/conf/archiva-test-download-artifacts.xml" 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"/>
 
           <properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.redback"/>
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
index ad0d1d1a0..3a737a0f4 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
@@ -38,10 +38,4 @@
         classpath*:spring-context.xml
     </param-value>
   </context-param>
-
-  <!--
-  classpath*:/META-INF/plexus/components.xml
-  target/test-classes/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
-  -->
-
 </web-app>
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
index f35d7593b..36fe55e73 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
@@ -41,7 +41,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-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
index cd9e3e95e..b4c7d1d41 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
@@ -60,7 +60,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-web/archiva-webdav/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
index a73b19042..caa12b018 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
@@ -60,7 +60,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>