rename java packages to archiva

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

12 files changed, 21 insertions, 21 deletions

diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeException.java
index 547bff7a4..a4e90a88a 100644
--- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeListener.java
index ca01a493f..f5fce0192 100644
--- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationChangeListener.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStore.java
index 968ce25d6..3b5dc477a 100644
--- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStore.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStoreException.java
index 04dd8990b..bb56dcd3f 100644
--- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationStoreException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
index ad771cba7..0279c685c 100644
--- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
@@ -16,8 +16,8 @@ package org.apache.maven.repository.configuration;
  * limitations under the License.
  */
 
-import org.apache.maven.repository.configuration.io.xpp3.ConfigurationXpp3Reader;
-import org.apache.maven.repository.configuration.io.xpp3.ConfigurationXpp3Writer;
+import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Reader;
+import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Writer;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -69,7 +69,7 @@ public class DefaultConfigurationStore
 
             if ( file == null )
             {
-                file = new File( System.getProperty( "user.home" ), "/.m2/repository-manager.xml" );
+                file = new File( System.getProperty( "user.home" ), "/.m2/archiva-manager.xml" );
             }
 
             FileReader fileReader;
diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java
index 05006df96..dfb53ef21 100644
--- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
index 814cec7b1..c8dfd2993 100644
--- a/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-configuration/src/main/mdo/configuration.mdo
index a2f772800..eabc96a60 100644
--- a/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-configuration/src/main/mdo/configuration.mdo
@@ -7,7 +7,7 @@
   <defaults>
     <default>
       <key>package</key>
-      <value>org.apache.maven.repository.configuration</value>
+      <value>org.apache.maven.archiva.configuration</value>
     </default>
   </defaults>
   <!-- TODO! break out subtypes such as <discovery> and create a list of blacklist -->
diff --git a/archiva-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties b/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties
index 0bf28d59c..0bf28d59c 100644
--- a/archiva-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties
+++ b/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties
diff --git a/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java
index 34d350a68..f4f90c0a3 100644
--- a/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java
+++ b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 import org.codehaus.plexus.PlexusTestCase;
 import org.easymock.MockControl;
diff --git a/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
index de8fb8d01..6cfbe4a90 100644
--- a/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java
+++ b/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.repository.configuration;
+package org.apache.maven.archiva.configuration;
 
 /*
  * Copyright 2005-2006 The Apache Software Foundation.
diff --git a/archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml b/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml
index 39a15a996..64a1849a3 100644
--- a/archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml
+++ b/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml
@@ -17,33 +17,33 @@
 <component-set>
   <components>
     <component>
-      <role>org.apache.maven.repository.configuration.ConfigurationStore</role>
+      <role>org.apache.maven.archiva.configuration.ConfigurationStore</role>
       <role-hint>default</role-hint>
-      <implementation>org.apache.maven.repository.configuration.DefaultConfigurationStore</implementation>
+      <implementation>org.apache.maven.archiva.configuration.DefaultConfigurationStore</implementation>
       <configuration>
         <file>${basedir}/src/test/conf/repository-manager.xml</file>
       </configuration>
     </component>
     <component>
-      <role>org.apache.maven.repository.configuration.ConfigurationStore</role>
+      <role>org.apache.maven.archiva.configuration.ConfigurationStore</role>
       <role-hint>corrupt-file</role-hint>
-      <implementation>org.apache.maven.repository.configuration.DefaultConfigurationStore</implementation>
+      <implementation>org.apache.maven.archiva.configuration.DefaultConfigurationStore</implementation>
       <configuration>
         <file>${basedir}/src/test/conf/corrupt.xml</file>
       </configuration>
     </component>
     <component>
-      <role>org.apache.maven.repository.configuration.ConfigurationStore</role>
+      <role>org.apache.maven.archiva.configuration.ConfigurationStore</role>
       <role-hint>invalid-file</role-hint>
-      <implementation>org.apache.maven.repository.configuration.DefaultConfigurationStore</implementation>
+      <implementation>org.apache.maven.archiva.configuration.DefaultConfigurationStore</implementation>
       <configuration>
         <file>${basedir}/src/test/conf/nada.txt</file>
       </configuration>
     </component>
     <component>
-      <role>org.apache.maven.repository.configuration.ConfigurationStore</role>
+      <role>org.apache.maven.archiva.configuration.ConfigurationStore</role>
       <role-hint>save-file</role-hint>
-      <implementation>org.apache.maven.repository.configuration.DefaultConfigurationStore</implementation>
+      <implementation>org.apache.maven.archiva.configuration.DefaultConfigurationStore</implementation>
       <configuration>
         <file>${basedir}/target/test/test-file.xml</file>
       </configuration>