540 files changed, 114 insertions, 118 deletions

diff --git a/maven-repository-artifact-applet/pom.xml b/archiva-applet/pom.xml
index c18b795a9..a581215ae 100644
--- a/maven-repository-artifact-applet/pom.xml
+++ b/archiva-applet/pom.xml
@@ -18,12 +18,12 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.repository</groupId>
-    <artifactId>maven-repository-manager</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>maven-repository-artifact-applet</artifactId>
-  <name>Maven Repository Manager Artifact Applet</name>
+  <artifactId>archiva-applet</artifactId>
+  <name>Archiva Applet</name>
   <description>
     Applet for performing local operations on files such as creating a checksum of an artifact
     before uploading it.
diff --git a/maven-repository-artifact-applet/src/keystore/keystore b/archiva-applet/src/keystore/keystore
index dda84744a..dda84744a 100644
--- a/maven-repository-artifact-applet/src/keystore/keystore
+++ b/archiva-applet/src/keystore/keystore
diff --git a/maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java b/archiva-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java
index 9b8697fd0..9b8697fd0 100644
--- a/maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java
+++ b/archiva-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java
diff --git a/maven-repository-configuration/pom.xml b/archiva-configuration/pom.xml
index 1b3fcbd8a..25c939a50 100644
--- a/maven-repository-configuration/pom.xml
+++ b/archiva-configuration/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <project>
   <parent>
-    <artifactId>maven-repository-manager</artifactId>
-    <groupId>org.apache.maven.repository</groupId>
+    <artifactId>archiva</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-repository-configuration</artifactId>
-  <name>Maven Repository Manager Configuration</name>
+  <artifactId>archiva-configuration</artifactId>
+  <name>Archiva Configuration</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java
index 547bff7a4..547bff7a4 100644
--- a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeException.java
diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java
index ca01a493f..ca01a493f 100644
--- a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationChangeListener.java
diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java
index 968ce25d6..968ce25d6 100644
--- a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStore.java
diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java
index 04dd8990b..04dd8990b 100644
--- a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/ConfigurationStoreException.java
diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java
index ad771cba7..ad771cba7 100644
--- a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/DefaultConfigurationStore.java
diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java
index 05006df96..05006df96 100644
--- a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/InvalidConfigurationException.java
diff --git a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java
index 814cec7b1..814cec7b1 100644
--- a/maven-repository-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoader.java
diff --git a/maven-repository-configuration/src/main/mdo/configuration.mdo b/archiva-configuration/src/main/mdo/configuration.mdo
index a2f772800..a2f772800 100644
--- a/maven-repository-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-configuration/src/main/mdo/configuration.mdo
diff --git a/maven-repository-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties b/archiva-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties
index 0bf28d59c..0bf28d59c 100644
--- a/maven-repository-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties
+++ b/archiva-configuration/src/main/resources/org/apache/maven/repository/configuration/SyncedRepositoryConfiguration-conversion.properties
diff --git a/maven-repository-configuration/src/test/conf/corrupt.xml b/archiva-configuration/src/test/conf/corrupt.xml
index 2476f91ff..2476f91ff 100644
--- a/maven-repository-configuration/src/test/conf/corrupt.xml
+++ b/archiva-configuration/src/test/conf/corrupt.xml
diff --git a/maven-repository-configuration/src/test/conf/maven-proxy-complete.conf b/archiva-configuration/src/test/conf/maven-proxy-complete.conf
index 7908a9ad9..7908a9ad9 100644
--- a/maven-repository-configuration/src/test/conf/maven-proxy-complete.conf
+++ b/archiva-configuration/src/test/conf/maven-proxy-complete.conf
diff --git a/maven-repository-configuration/src/test/conf/repository-manager.xml b/archiva-configuration/src/test/conf/repository-manager.xml
index a3f1f2745..a3f1f2745 100644
--- a/maven-repository-configuration/src/test/conf/repository-manager.xml
+++ b/archiva-configuration/src/test/conf/repository-manager.xml
diff --git a/maven-repository-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java b/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java
index 34d350a68..34d350a68 100644
--- a/maven-repository-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java
+++ b/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/ConfigurationStoreTest.java
diff --git a/maven-repository-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java b/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java
index de8fb8d01..de8fb8d01 100644
--- a/maven-repository-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java
+++ b/archiva-configuration/src/test/java/org/apache/maven/repository/configuration/MavenProxyPropertyLoaderTest.java
diff --git a/maven-repository-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml b/archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml
index 39a15a996..39a15a996 100644
--- a/maven-repository-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml
+++ b/archiva-configuration/src/test/resources/org/apache/maven/repository/configuration/ConfigurationStoreTest.xml
diff --git a/maven-repository-converter/pom.xml b/archiva-converter/pom.xml
index e72b0846b..5de65c928 100644
--- a/maven-repository-converter/pom.xml
+++ b/archiva-converter/pom.xml
@@ -17,13 +17,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.apache.maven.repository</groupId>
-    <artifactId>maven-repository-manager</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-repository-converter</artifactId>
-  <name>Maven Repository Converter</name>
+  <artifactId>archiva-converter</artifactId>
+  <name>Archiva Repository Converter</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -38,8 +38,8 @@
       <artifactId>maven-model-converter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-reports-standard</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-reports-standard</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
index 86078ef6b..86078ef6b 100644
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
+++ b/archiva-converter/src/main/java/org/apache/maven/repository/converter/DefaultRepositoryConverter.java
diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java
index 2409235bb..2409235bb 100644
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java
+++ b/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConversionException.java
diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java
index cf6e1b151..cf6e1b151 100644
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java
+++ b/archiva-converter/src/main/java/org/apache/maven/repository/converter/RepositoryConverter.java
diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java
index 521930a28..521930a28 100644
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java
+++ b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/AbstractTransactionEvent.java
diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java
index cddc854cc..cddc854cc 100644
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java
+++ b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CopyFileEvent.java
diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java
index 283ee60fd..283ee60fd 100644
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java
+++ b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/CreateFileEvent.java
diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java
index ceb368660..ceb368660 100644
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java
+++ b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/FileTransaction.java
diff --git a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java
index 2f8a528e4..2f8a528e4 100644
--- a/maven-repository-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java
+++ b/archiva-converter/src/main/java/org/apache/maven/repository/converter/transaction/TransactionEvent.java
diff --git a/maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties b/archiva-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties
index f6089c1f5..f6089c1f5 100644
--- a/maven-repository-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties
+++ b/archiva-converter/src/main/resources/org/apache/maven/repository/converter/DefaultRepositoryConverter.properties
diff --git a/maven-repository-converter/src/test/expected-files/converted-artifact-one.pom b/archiva-converter/src/test/expected-files/converted-artifact-one.pom
index cd3862d35..cd3862d35 100644
--- a/maven-repository-converter/src/test/expected-files/converted-artifact-one.pom
+++ b/archiva-converter/src/test/expected-files/converted-artifact-one.pom
diff --git a/maven-repository-converter/src/test/expected-files/converted-artifact-three.pom b/archiva-converter/src/test/expected-files/converted-artifact-three.pom
index 343291037..343291037 100644
--- a/maven-repository-converter/src/test/expected-files/converted-artifact-three.pom
+++ b/archiva-converter/src/test/expected-files/converted-artifact-three.pom
diff --git a/maven-repository-converter/src/test/expected-files/converted-artifact-two.pom b/archiva-converter/src/test/expected-files/converted-artifact-two.pom
index 227470167..227470167 100644
--- a/maven-repository-converter/src/test/expected-files/converted-artifact-two.pom
+++ b/archiva-converter/src/test/expected-files/converted-artifact-two.pom
diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom b/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
index 9134c3cdf..9134c3cdf 100644
--- a/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom
+++ b/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom b/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
index 46eacaf2e..46eacaf2e 100644
--- a/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
+++ b/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom b/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
index e07664932..e07664932 100644
--- a/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom
+++ b/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
diff --git a/maven-repository-converter/src/test/expected-files/converted-v3.pom b/archiva-converter/src/test/expected-files/converted-v3.pom
index 29ba92771..29ba92771 100644
--- a/maven-repository-converter/src/test/expected-files/converted-v3.pom
+++ b/archiva-converter/src/test/expected-files/converted-v3.pom
diff --git a/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml b/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml
index ecc7f09a0..ecc7f09a0 100644
--- a/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml
+++ b/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
index ebd9be970..ebd9be970 100644
--- a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
+++ b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
+++ b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
index 253ef3466..253ef3466 100644
--- a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
+++ b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
index b4b1a864a..b4b1a864a 100644
--- a/maven-repository-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
+++ b/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
index b20f62f9e..b20f62f9e 100644
--- a/maven-repository-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
+++ b/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml b/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml
index a8a7f3748..a8a7f3748 100644
--- a/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml b/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
index 24d25a0e0..24d25a0e0 100644
--- a/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml b/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml
index b19c537b5..b19c537b5 100644
--- a/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml b/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
index 602c38ec8..602c38ec8 100644
--- a/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml b/archiva-converter/src/test/expected-files/v3-version-metadata.xml
index 3c8938984..3c8938984 100644
--- a/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v3-version-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml b/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml
index c0cdbfdb4..c0cdbfdb4 100644
--- a/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml b/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
index f8072b0df..f8072b0df 100644
--- a/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml b/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml
index d5ecb7d47..d5ecb7d47 100644
--- a/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml b/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
index 060a79cdd..060a79cdd 100644
--- a/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
diff --git a/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml b/archiva-converter/src/test/expected-files/v4-version-metadata.xml
index 7cbd8ad3d..7cbd8ad3d 100644
--- a/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
+++ b/archiva-converter/src/test/expected-files/v4-version-metadata.xml
diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java b/archiva-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
index d7b83cf7e..d7b83cf7e 100644
--- a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
+++ b/archiva-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java b/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java
index 627c32cde..627c32cde 100644
--- a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java
+++ b/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CopyFileEventTest.java
diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java b/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java
index 2018e89a2..2018e89a2 100644
--- a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java
+++ b/archiva-converter/src/test/java/org/apache/maven/repository/converter/transaction/CreateFileEventTest.java
diff --git a/maven-repository-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml b/archiva-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml
index f2caaffca..f2caaffca 100644
--- a/maven-repository-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml
+++ b/archiva-converter/src/test/resources/org/apache/maven/repository/converter/RepositoryConverterTest.xml
diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
index 72af4bc10..72af4bc10 100644
--- a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
index e9ec6a15c..e9ec6a15c 100644
--- a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
index 5ed142599..5ed142599 100644
--- a/maven-repository-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
index 72af4bc10..72af4bc10 100644
--- a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
index 70118f64a..70118f64a 100644
--- a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
index 031fb19b6..031fb19b6 100644
--- a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
diff --git a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
index db6ce9a7f..db6ce9a7f 100644
--- a/maven-repository-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
+++ b/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
index 5626abf0f..5626abf0f 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
index 2bdf67abb..2bdf67abb 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
index f719efd43..f719efd43 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
index cbaf024e5..cbaf024e5 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
index cbaf024e5..cbaf024e5 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
index 72af4bc10..72af4bc10 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 b/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
index 316d9a4eb..316d9a4eb 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
+++ b/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
index f5812f3e5..f5812f3e5 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 b/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
index cce322eb2..cce322eb2 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
+++ b/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
index 2e0996000..2e0996000 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar b/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
index c694117fd..c694117fd 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
index 3d27acdcc..3d27acdcc 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
index 27597bc21..27597bc21 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
index c694117fd..c694117fd 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
+++ b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
index 1930bc6d3..1930bc6d3 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
+++ b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
diff --git a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
index 466f209a7..466f209a7 100644
--- a/maven-repository-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
+++ b/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
index cd3862d35..cd3862d35 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
index 343291037..343291037 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
index 227470167..227470167 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
index 1953c5523..1953c5523 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
index 74d5e12b4..74d5e12b4 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
index fe3c7fd91..fe3c7fd91 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
index fcfdaacb4..fcfdaacb4 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom b/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
index f441c9a46..f441c9a46 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
index 10823fe89..10823fe89 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
index 00692be72..00692be72 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
index c570979f4..c570979f4 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
index 5f347f371..5f347f371 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
index d7ae8953b..d7ae8953b 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
index 3958a3358..3958a3358 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
index 5aed3437a..5aed3437a 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
index e4f36566a..e4f36566a 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
index be5b8b7e2..be5b8b7e2 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
diff --git a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
index fa6e82b1e..fa6e82b1e 100644
--- a/maven-repository-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
+++ b/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar b/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
index 27597bc21..27597bc21 100644
--- a/maven-repository-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom b/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
index fcfdaacb4..fcfdaacb4 100644
--- a/maven-repository-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
+++ b/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar b/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
index 27597bc21..27597bc21 100644
--- a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom b/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
index 836cc236b..836cc236b 100644
--- a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
+++ b/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
diff --git a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml b/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
index f4d211741..f4d211741 100644
--- a/maven-repository-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
+++ b/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
diff --git a/maven-repository-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar b/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
index 27597bc21..27597bc21 100644
--- a/maven-repository-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
+++ b/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
diff --git a/maven-repository-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom b/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
index c570979f4..c570979f4 100644
--- a/maven-repository-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
+++ b/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
diff --git a/maven-repository-core/pom.xml b/archiva-core/pom.xml
index 19c9874f5..8862ab6b3 100644
--- a/maven-repository-core/pom.xml
+++ b/archiva-core/pom.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <project>
   <parent>
-    <artifactId>maven-repository-manager</artifactId>
-    <groupId>org.apache.maven.repository</groupId>
+    <artifactId>archiva</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-repository-core</artifactId>
-  <name>Maven Repository Manager Core</name>
+  <artifactId>archiva-core</artifactId>
+  <name>Archiva Core</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-configuration</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-converter</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-converter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-discovery</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-discoverer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-proxy</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-proxy</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-reports-standard</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-reports-standard</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java
index e753c0d3f..e753c0d3f 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/DefaultRepositoryManager.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/RepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/repository/RepositoryManager.java
index 40d176e83..40d176e83 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/RepositoryManager.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/RepositoryManager.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java b/archiva-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java
index 568e436da..568e436da 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/configuration/ConfiguredRepositoryFactory.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java b/archiva-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java
index 290a52301..290a52301 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/configuration/DefaultConfiguredRepositoryFactory.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java b/archiva-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
index 5389fe5c7..5389fe5c7 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java b/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java
index 326646c6f..326646c6f 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxiedRepositoryGroup.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java b/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java
index 7973013a2..7973013a2 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/proxy/ProxyManager.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java
index 4e145b890..4e145b890 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java
index 38b43a0ac..38b43a0ac 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/IndexerTask.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java
index 92b6f93cd..92b6f93cd 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTask.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java
index 874f6bcf2..874f6bcf2 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskJob.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java
index 46db976b3..46db976b3 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/RepositoryTaskScheduler.java
diff --git a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java
index 7ab229021..7ab229021 100644
--- a/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java
+++ b/archiva-core/src/main/java/org/apache/maven/repository/scheduler/TaskExecutionException.java
diff --git a/maven-repository-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java b/archiva-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java
index 5fb084590..5fb084590 100644
--- a/maven-repository-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java
+++ b/archiva-core/src/test/java/org/apache/maven/repository/RepositoryManagerTest.java
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-one-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-one-1.0.0.jar
index 5626abf0f..5626abf0f 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-one-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-one-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-three-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-three-1.0.0.jar
index 2bdf67abb..2bdf67abb 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-three-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-three-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-two-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-two-1.0.0.jar
index f719efd43..f719efd43 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/artifact-two-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/artifact-two-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/dryrun-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/dryrun-artifact-1.0.0.jar
index cbaf024e5..cbaf024e5 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/dryrun-artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/dryrun-artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/existing-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/existing-artifact-1.0.0.jar
index cbaf024e5..cbaf024e5 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/existing-artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/existing-artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
index 72af4bc10..72af4bc10 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
index 316d9a4eb..316d9a4eb 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
index f5812f3e5..f5812f3e5 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
index cce322eb2..cce322eb2 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/modified-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/modified-artifact-1.0.0.jar
index 2e0996000..2e0996000 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/modified-artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/modified-artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/newversion-artifact-1.0.1.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/newversion-artifact-1.0.1.jar
index c694117fd..c694117fd 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/newversion-artifact-1.0.1.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/newversion-artifact-1.0.1.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/noPomArtifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/noPomArtifact-1.0.0.jar
index 3d27acdcc..3d27acdcc 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/noPomArtifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/noPomArtifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/relocated-v3artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/relocated-v3artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/relocated-v3artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/relocated-v3artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/rollback-created-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/rollback-created-artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/rollback-created-artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/rollback-created-artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/unmodified-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/unmodified-artifact-1.0.0.jar
index 27597bc21..27597bc21 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/unmodified-artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/unmodified-artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3-warnings-artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v3-warnings-artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3-warnings-artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v3-warnings-artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v3artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
index 29ef827e8..29ef827e8 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar
index c694117fd..c694117fd 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.md5 b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.md5
index 1930bc6d3..1930bc6d3 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.md5
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.md5
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.sha1 b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.sha1
index 466f209a7..466f209a7 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.sha1
+++ b/archiva-core/src/test/maven-1.x-repository/test/jars/v4artifact-1.0.0.jar.sha1
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-one-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-one-1.0.0.pom
index cd3862d35..cd3862d35 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-one-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-one-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-three-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-three-1.0.0.pom
index 343291037..343291037 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-three-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-three-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-two-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-two-1.0.0.pom
index 227470167..227470167 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/artifact-two-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/artifact-two-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/dryrun-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/dryrun-artifact-1.0.0.pom
index 1953c5523..1953c5523 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/dryrun-artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/dryrun-artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/incorrectMd5Artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
index 74d5e12b4..74d5e12b4 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/incorrectSha1Artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
index fe3c7fd91..fe3c7fd91 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/modified-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/modified-artifact-1.0.0.pom
index fcfdaacb4..fcfdaacb4 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/modified-artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/modified-artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/newversion-artifact-1.0.1.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/newversion-artifact-1.0.1.pom
index f441c9a46..f441c9a46 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/newversion-artifact-1.0.1.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/newversion-artifact-1.0.1.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom
index 10823fe89..10823fe89 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/relocated-v3artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/rollback-created-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/rollback-created-artifact-1.0.0.pom
index 00692be72..00692be72 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/rollback-created-artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/rollback-created-artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/unmodified-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/unmodified-artifact-1.0.0.pom
index c570979f4..c570979f4 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/unmodified-artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/unmodified-artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3-warnings-artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v3-warnings-artifact-1.0.0.pom
index 5f347f371..5f347f371 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3-warnings-artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/v3-warnings-artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
index d7ae8953b..d7ae8953b 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
index 3958a3358..3958a3358 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0.pom
index 5aed3437a..5aed3437a 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/v3artifact-1.0.0.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
index e4f36566a..e4f36566a 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
index be5b8b7e2..be5b8b7e2 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
diff --git a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0.pom b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0.pom
index fa6e82b1e..fa6e82b1e 100644
--- a/maven-repository-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0.pom
+++ b/archiva-core/src/test/maven-1.x-repository/test/poms/v4artifact-1.0.0.pom
diff --git a/maven-repository-discovery/pom.xml b/archiva-discoverer/pom.xml
index dfd1a8b7f..fed41016b 100755
--- a/maven-repository-discovery/pom.xml
+++ b/archiva-discoverer/pom.xml
@@ -17,17 +17,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.apache.maven.repository</groupId>
-    <artifactId>maven-repository-manager</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-repository-discovery</artifactId>
-  <name>Maven Repository Artifact Discovery</name>
+  <artifactId>archiva-discoverer</artifactId>
+  <name>Archiva Artifact Discoverer</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-utils</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java
index 3faa8bd47..3faa8bd47 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractArtifactDiscoverer.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java
index 6888b23a9..6888b23a9 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/AbstractDiscoverer.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java
index ec9698cdf..ec9698cdf 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/ArtifactDiscoverer.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
index f7dabe3fc..f7dabe3fc 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
index 6aad837df..6aad837df 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DefaultMetadataDiscoverer.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/Discoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/Discoverer.java
index b0896bcad..b0896bcad 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/Discoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/Discoverer.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java
index 02e45e699..02e45e699 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererException.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java
index ae2ecee73..ae2ecee73 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/DiscovererPath.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
index 9a8f7fc22..9a8f7fc22 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java
index 3877c7723..3877c7723 100644
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/repository/discovery/MetadataDiscoverer.java
diff --git a/maven-repository-discovery/src/site/apt/design.apt b/archiva-discoverer/src/site/apt/design.apt
index 6a482e0ab..6a482e0ab 100644
--- a/maven-repository-discovery/src/site/apt/design.apt
+++ b/archiva-discoverer/src/site/apt/design.apt
diff --git a/maven-repository-discovery/src/site/site.xml b/archiva-discoverer/src/site/site.xml
index 245a0bf34..245a0bf34 100644
--- a/maven-repository-discovery/src/site/site.xml
+++ b/archiva-discoverer/src/site/site.xml
diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java
index c016fe0bc..c016fe0bc 100644
--- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java
+++ b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/AbstractArtifactDiscovererTest.java
diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
index 7832c4d68..7832c4d68 100644
--- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
+++ b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java
index 52471ab25..52471ab25 100644
--- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java
+++ b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/DefaultMetadataDiscovererTest.java
diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
index 88cc07ad1..88cc07ad1 100644
--- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
+++ b/archiva-discoverer/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
diff --git a/maven-repository-discovery/src/test/legacy-repository/KEYS b/archiva-discoverer/src/test/legacy-repository/KEYS
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/KEYS
+++ b/archiva-discoverer/src/test/legacy-repository/KEYS
diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/foo/invalid-1.0.foo b/archiva-discoverer/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
+++ b/archiva-discoverer/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/invalid-1.0.jar b/archiva-discoverer/src/test/legacy-repository/invalid/invalid-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/invalid/invalid-1.0.jar
+++ b/archiva-discoverer/src/test/legacy-repository/invalid/invalid-1.0.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar b/archiva-discoverer/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
+++ b/archiva-discoverer/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid-1.0.rar b/archiva-discoverer/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
+++ b/archiva-discoverer/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid.jar b/archiva-discoverer/src/test/legacy-repository/invalid/jars/invalid.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/invalid.jar
+++ b/archiva-discoverer/src/test/legacy-repository/invalid/jars/invalid.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/no-extension b/archiva-discoverer/src/test/legacy-repository/invalid/jars/no-extension
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/invalid/jars/no-extension
+++ b/archiva-discoverer/src/test/legacy-repository/invalid/jars/no-extension
diff --git a/maven-repository-discovery/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar b/archiva-discoverer/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar
+++ b/archiva-discoverer/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
diff --git a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
+++ b/archiva-discoverer/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom
index 411d77c7d..411d77c7d 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.pom
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.war b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.war
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.war
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/A/1.0/A-1.0.war
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom
index 35641a048..35641a048 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/1.0/B-1.0.pom
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom
index 6ab1e498b..6ab1e498b 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/B/2.0/B-2.0.pom
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom
index 867de41f0..867de41f0 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.pom
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.war b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.war
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.war
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/C/1.0/C-1.0.war
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom
index 4dfd1f4e5..4dfd1f4e5 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/discovery/1.0/discovery-1.0.pom
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
index 51d5e433c..51d5e433c 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
index c6f89f932..c6f89f932 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
diff --git a/maven-repository-discovery/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-discoverer/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
index ac5ca14b3..ac5ca14b3 100644
--- a/maven-repository-discovery/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
+++ b/archiva-discoverer/src/test/pom-artifacts/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/KEYS b/archiva-discoverer/src/test/repository/KEYS
index d3b34d5ad..d3b34d5ad 100644
--- a/maven-repository-discovery/src/test/repository/KEYS
+++ b/archiva-discoverer/src/test/repository/KEYS
diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid-1.0.jar b/archiva-discoverer/src/test/repository/invalid/invalid-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/invalid/invalid-1.0.jar
+++ b/archiva-discoverer/src/test/repository/invalid/invalid-1.0.jar
diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/archiva-discoverer/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
+++ b/archiva-discoverer/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/archiva-discoverer/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
+++ b/archiva-discoverer/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar b/archiva-discoverer/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar
+++ b/archiva-discoverer/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar
diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar b/archiva-discoverer/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
+++ b/archiva-discoverer/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
diff --git a/maven-repository-discovery/src/test/repository/invalid/invalid/1/invalid-1 b/archiva-discoverer/src/test/repository/invalid/invalid/1/invalid-1
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/invalid/invalid/1/invalid-1
+++ b/archiva-discoverer/src/test/repository/invalid/invalid/1/invalid-1
diff --git a/maven-repository-discovery/src/test/repository/javax/maven-metadata.xml b/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
index 17775863b..17775863b 100644
--- a/maven-repository-discovery/src/test/repository/javax/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
diff --git a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
+++ b/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
diff --git a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
index 17775863b..17775863b 100644
--- a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
+++ b/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
diff --git a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
index 214b7dc28..214b7dc28 100644
--- a/maven-repository-discovery/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
+++ b/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
diff --git a/maven-repository-discovery/src/test/repository/javax/sql/maven-metadata-repository.xml b/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml
index 17775863b..17775863b 100644
--- a/maven-repository-discovery/src/test/repository/javax/sql/maven-metadata-repository.xml
+++ b/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
index 411d77c7d..411d77c7d 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/A/1.0/A-1.0.war b/archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.war
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/A/1.0/A-1.0.war
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/A/1.0/A-1.0.war
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
index 35641a048..35641a048 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
index 6ab1e498b..6ab1e498b 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
index 867de41f0..867de41f0 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/C/1.0/C-1.0.war b/archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.war
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/C/1.0/C-1.0.war
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/C/1.0/C-1.0.war
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
index 4dfd1f4e5..4dfd1f4e5 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml
index 22f46c19b..22f46c19b 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
index 51d5e433c..51d5e433c 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
index c6f89f932..c6f89f932 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/archiva-discoverer/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip
index e69de29bb..e69de29bb 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
index 21bef0276..21bef0276 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
index 71fc9790f..71fc9790f 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
index 54d190b23..54d190b23 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
index 5f88c44df..5f88c44df 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
index fc17a16d7..fc17a16d7 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
diff --git a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
index ac5ca14b3..ac5ca14b3 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
+++ b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
diff --git a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
index 9bb9b5a58..9bb9b5a58 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
diff --git a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
index 50215f42b..50215f42b 100644
--- a/maven-repository-discovery/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
+++ b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
diff --git a/maven-repository-indexer/pom.xml b/archiva-indexer/pom.xml
index 430b63565..8f5aa5e51 100644
--- a/maven-repository-indexer/pom.xml
+++ b/archiva-indexer/pom.xml
@@ -17,13 +17,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.apache.maven.repository</groupId>
-    <artifactId>maven-repository-manager</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-repository-indexer</artifactId>
-  <name>Maven Repository Indexer</name>
+  <artifactId>archiva-indexer</artifactId>
+  <name>Archiva Repository Indexer</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -55,8 +55,8 @@
       <artifactId>plexus-container-default</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-utils</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java
index 03803ed53..03803ed53 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndex.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java
index ed0100527..ed0100527 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryArtifactIndexFactory.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java
index fe16c022c..fe16c022c 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexException.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java
index cd84bde19..cd84bde19 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/RepositoryIndexSearchException.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java
index 7aaf123e3..7aaf123e3 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneIndexRecordConverter.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java
index 02def2dbd..02def2dbd 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalIndexRecordConverter.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java
index 13fdcaf5c..13fdcaf5c 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneQuery.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java
index dff648ec5..dff648ec5 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndex.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java
index 97278b009..97278b009 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneRepositoryArtifactIndexFactory.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java
index f8f6a53b2..f8f6a53b2 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/lucene/LuceneStandardIndexRecordConverter.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java
index 85760b621..85760b621 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQuery.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java
index abc99bd13..abc99bd13 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/CompoundQueryTerm.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java
index 2c6ac6137..2c6ac6137 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/Query.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java
index 6db240b3a..6db240b3a 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/QueryTerm.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java
index 68e6d4a6a..68e6d4a6a 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/RangeQuery.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java
index f7ae019fa..f7ae019fa 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/query/SingleTermQuery.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java
index 8a9a8cc91..8a9a8cc91 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/AbstractArtifactIndexRecordFactory.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java
index 4c212520c..4c212520c 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecord.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java
index 7f007747c..7f007747c 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactory.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java
index 5bb8add24..5bb8add24 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/MinimalIndexRecordFields.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java
index 10c99f1a3..10c99f1a3 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecord.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java
index 2dde9674d..2dde9674d 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/RepositoryIndexRecordFactory.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java
index d2e97a4b2..d2e97a4b2 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecord.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java
index ec20288b2..ec20288b2 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactory.java
diff --git a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java
index 5bfdf3347..5bfdf3347 100644
--- a/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/repository/indexing/record/StandardIndexRecordFields.java
diff --git a/maven-repository-indexer/src/site/apt/design.apt b/archiva-indexer/src/site/apt/design.apt
index d083789e3..d083789e3 100644
--- a/maven-repository-indexer/src/site/apt/design.apt
+++ b/archiva-indexer/src/site/apt/design.apt
diff --git a/maven-repository-indexer/src/site/site.xml b/archiva-indexer/src/site/site.xml
index 565d18fd0..565d18fd0 100644
--- a/maven-repository-indexer/src/site/site.xml
+++ b/archiva-indexer/src/site/site.xml
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java
index 63198db55..63198db55 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexSearchTest.java
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java
index a08d181ac..a08d181ac 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneMinimalArtifactIndexTest.java
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java
index 19ff16439..19ff16439 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexSearchTest.java
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java
index 4329dc452..4329dc452 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/lucene/LuceneStandardArtifactIndexTest.java
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java
index 17364046f..17364046f 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/query/QueryTest.java
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java
index 32d97b329..32d97b329 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/MinimalArtifactIndexRecordFactoryTest.java
diff --git a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java
index 790c2bed4..790c2bed4 100644
--- a/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java
+++ b/archiva-indexer/src/test/java/org/apache/maven/repository/indexing/record/StandardArtifactIndexRecordFactoryTest.java
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom
index 162f02ac6..162f02ac6 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/parent-pom/1/parent-pom-1.pom
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar
index e1686a206..e1686a206 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.jar
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom
index 7b9d7c7f7..7b9d7c7f7 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-archetype/1.0/test-archetype-1.0.pom
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar
index b78be2eb8..b78be2eb8 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom
index b247e7aa3..b247e7aa3 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll
index e69de29bb..e69de29bb 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar
index b78be2eb8..b78be2eb8 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar
index b78be2eb8..b78be2eb8 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom
index 6d2d2a78a..6d2d2a78a 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar
index b78be2eb8..b78be2eb8 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0-jdk14.jar
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar
index b78be2eb8..b78be2eb8 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-jar/1.0/test-jar-1.0.jar
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar
index a7f3a67a8..a7f3a67a8 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.jar
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom
index 7baa980d2..7baa980d2 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-plugin/1.0/test-plugin-1.0.pom
diff --git a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom
index 34b9e1f3f..34b9e1f3f 100644
--- a/maven-repository-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom
+++ b/archiva-indexer/src/test/managed-repository/org/apache/maven/repository/record/test-pom/1.0/test-pom-1.0.pom
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar
index 14fa95ab9..14fa95ab9 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom
index 0121c43d3..0121c43d3 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
index f9f9abc99..f9f9abc99 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
index d4b28f93e..d4b28f93e 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar b/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar
index e69de29bb..e69de29bb 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom b/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom
index e5dc3f3a8..e5dc3f3a8 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml
index 3a837529b..3a837529b 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-metadata.xml
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar b/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar
index d6820d6fe..d6820d6fe 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar
diff --git a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom b/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom
index 2abd766dc..2abd766dc 100644
--- a/maven-repository-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom
+++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom
diff --git a/maven-repository-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom b/archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom
index 19faa7910..19faa7910 100644
--- a/maven-repository-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom
+++ b/archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom
diff --git a/maven-repository-indexer/src/test/repository/test/maven-metadata.xml b/archiva-indexer/src/test/repository/test/maven-metadata.xml
index e1f2008ef..e1f2008ef 100644
--- a/maven-repository-indexer/src/test/repository/test/maven-metadata.xml
+++ b/archiva-indexer/src/test/repository/test/maven-metadata.xml
diff --git a/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar b/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar
index 00eb58b70..00eb58b70 100644
--- a/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar
+++ b/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar
diff --git a/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom b/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom
index 157d74f41..157d74f41 100644
--- a/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom
+++ b/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom
diff --git a/maven-repository-proxy/pom.xml b/archiva-proxy/pom.xml
index 77bdc01de..a4cfbcfdd 100644
--- a/maven-repository-proxy/pom.xml
+++ b/archiva-proxy/pom.xml
@@ -17,17 +17,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

   <parent>

-    <groupId>org.apache.maven.repository</groupId>

-    <artifactId>maven-repository-manager</artifactId>

+    <groupId>org.apache.maven.archiva</groupId>

+    <artifactId>archiva</artifactId>

     <version>1.0-SNAPSHOT</version>

   </parent>

   <modelVersion>4.0.0</modelVersion>

-  <artifactId>maven-repository-proxy</artifactId>

-  <name>Maven Repository Proxy</name>

+  <artifactId>archiva-proxy</artifactId>

+  <name>Archiva Proxy</name>

   <dependencies>

     <dependency>

-      <groupId>org.apache.maven.repository</groupId>

-      <artifactId>maven-repository-discovery</artifactId>

+      <groupId>org.apache.maven.archiva</groupId>

+      <artifactId>archiva-discoverer</artifactId>

     </dependency>

     <dependency>

       <groupId>org.apache.maven</groupId>

diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
index 90a21726a..90a21726a 100644
--- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
+++ b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyRequestHandler.java
diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java
index ff3aaa3ff..ff3aaa3ff 100644
--- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java
+++ b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxiedArtifactRepository.java
diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java
index cd6ecc323..cd6ecc323 100644
--- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java
+++ b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyException.java
diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java
index 4b8e3e5da..4b8e3e5da 100644
--- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java
+++ b/archiva-proxy/src/main/java/org/apache/maven/repository/proxy/ProxyRequestHandler.java
diff --git a/maven-repository-proxy/src/site/apt/how-to.apt b/archiva-proxy/src/site/apt/how-to.apt
index 14cf1ef4b..14cf1ef4b 100644
--- a/maven-repository-proxy/src/site/apt/how-to.apt
+++ b/archiva-proxy/src/site/apt/how-to.apt
diff --git a/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java b/archiva-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java
index 3837ca91f..3837ca91f 100644
--- a/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java
+++ b/archiva-proxy/src/test/java/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.java
diff --git a/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/WagonDelegate.java b/archiva-proxy/src/test/java/org/apache/maven/repository/proxy/WagonDelegate.java
index 023195e4d..023195e4d 100644
--- a/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/WagonDelegate.java
+++ b/archiva-proxy/src/test/java/org/apache/maven/repository/proxy/WagonDelegate.java
diff --git a/maven-repository-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar b/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar
index bf26f6b57..bf26f6b57 100644
--- a/maven-repository-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar
+++ b/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar b/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar
index 77dbb7858..77dbb7858 100644
--- a/maven-repository-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar
+++ b/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar b/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar
index 9f4121a86..9f4121a86 100644
--- a/maven-repository-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar
+++ b/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar
index 62a1e1c71..62a1e1c71 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5
index 5fd0ae2b7..5fd0ae2b7 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1
index 5fd0ae2b7..5fd0ae2b7 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1
index de9618d2f..de9618d2f 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar
index a3b38382c..a3b38382c 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
index 8404eb8a9..8404eb8a9 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar
index b71eb7b74..b71eb7b74 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
index 0c2d93e3c..0c2d93e3c 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar
index 54dc5ee86..54dc5ee86 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml
index 7bd77c137..7bd77c137 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1
index 76b43d62a..76b43d62a 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1
index 6354f21bc..6354f21bc 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml
index cd7216a64..cd7216a64 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml
index 5cd8af101..5cd8af101 100644
--- a/maven-repository-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar
index b5d8045c9..b5d8045c9 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar
index 98fae8093..98fae8093 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5
index 5fd0ae2b7..5fd0ae2b7 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1
index a2d3f29ea..a2d3f29ea 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar
index 7fa9ec4a0..7fa9ec4a0 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5
index 9b9e3374c..9b9e3374c 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1
index cdd9a336b..cdd9a336b 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1
index 8fc645ca3..8fc645ca3 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar
index 68e3480fc..68e3480fc 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5
index d785caa7f..d785caa7f 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1
index a2d3f29ea..a2d3f29ea 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar
index 915323d0e..915323d0e 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5
index f5ecac3db..f5ecac3db 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar
index f02c91843..f02c91843 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5
index a2d3f29ea..a2d3f29ea 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1
index 425623525..425623525 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar
index efd9ed015..efd9ed015 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1
index e64dccfd8..e64dccfd8 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar
index 15fd36d5d..15fd36d5d 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar
index a129891a7..a129891a7 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml
index 7855530fb..7855530fb 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar
index 3cc35fa29..3cc35fa29 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
index f697f68a9..f697f68a9 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar
index 139c17b97..139c17b97 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar
index 8bbffa00f..8bbffa00f 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
index 0bf178413..0bf178413 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar
index dfacfaa15..dfacfaa15 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar
index af86df92f..af86df92f 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml
index 67a3c6206..67a3c6206 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml
index 27c44b418..27c44b418 100644
--- a/maven-repository-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar
index e46d60ac3..e46d60ac3 100644
--- a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar
index 3460f656d..3460f656d 100644
--- a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar
+++ b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar
diff --git a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
index 5a7a94818..5a7a94818 100644
--- a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
+++ b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml
diff --git a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar
index 915b2b22c..915b2b22c 100644
--- a/maven-repository-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar
+++ b/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar
diff --git a/maven-repository-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml b/archiva-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml
index a3a47dbbe..a3a47dbbe 100644
--- a/maven-repository-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml
+++ b/archiva-proxy/src/test/resources/org/apache/maven/repository/proxy/ProxyRequestHandlerTest.xml
diff --git a/maven-repository-reports-standard/pom.xml b/archiva-reports-standard/pom.xml
index bbead04d7..f6d85a9ba 100755
--- a/maven-repository-reports-standard/pom.xml
+++ b/archiva-reports-standard/pom.xml
@@ -17,13 +17,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.apache.maven.repository</groupId>
-    <artifactId>maven-repository-manager</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-repository-reports-standard</artifactId>
-  <name>Maven Repository Standard Reports</name>
+  <artifactId>archiva-reports-standard</artifactId>
+  <name>Archiva Standard Reports</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -58,12 +58,12 @@
       <artifactId>maven-artifact-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-utils</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-indexer</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-indexer</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java
index 997597c77..997597c77 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayer.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java
index 773b2c7f5..773b2c7f5 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReportProcessor.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java
index a48476491..a48476491 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactReporter.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java
index 6c0aba900..6c0aba900 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ArtifactResult.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java
index fdba18d39..fdba18d39 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/BadMetadataReportProcessor.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java
index 8f695f91d..8f695f91d 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/Cache.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java
index b0c1eac27..b0c1eac27 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayer.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
index 51b4a8772..51b4a8772 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumArtifactReporter.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java
index df732f656..df732f656 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ChecksumMetadataReporter.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java
index b869e7e49..b869e7e49 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReportProcessor.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java
index 32b4cd755..32b4cd755 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultArtifactReporter.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java
index 5570666dd..5570666dd 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayer.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java
index 56f9826dc..56f9826dc 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DefaultRepositoryQueryLayerFactory.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java
index df8c81a85..df8c81a85 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessor.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java
index a11f35754..a11f35754 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessor.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java
index 140425656..140425656 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessor.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java
index 0431a8adf..0431a8adf 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/MetadataReportProcessor.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java
index 5f73dbdc0..5f73dbdc0 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/ReportProcessorException.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java
index 4c962986a..4c962986a 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryMetadataResult.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java
index 950f7a252..950f7a252 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayer.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java
index ae7f77947..ae7f77947 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerException.java
diff --git a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java
index 00f42b30d..00f42b30d 100644
--- a/maven-repository-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/repository/reporting/RepositoryQueryLayerFactory.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java
index 93b9b2e6e..93b9b2e6e 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractChecksumArtifactReporterTestCase.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java
index 6de998c8f..6de998c8f 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryQueryLayerTestCase.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java
index 45f12964e..45f12964e 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/AbstractRepositoryReportsTestCase.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java
index 4d6c697f3..4d6c697f3 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReportProcessorTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java
index e3fc97f6b..e3fc97f6b 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ArtifactReporterTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java
index 828b27274..828b27274 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/BadMetadataReportProcessorTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java
index cfc83b309..cfc83b309 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CacheTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java
index 11c0b8e95..11c0b8e95 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/CachedRepositoryQueryLayerTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java
index 64585c52d..64585c52d 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ChecksumArtifactReporterTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java
index ac19ab3e0..ac19ab3e0 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DefaultArtifactReporterTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java
index 31dec3015..31dec3015 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java
index 7ab3de250..7ab3de250 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/GenericMockObject.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java
index 71c53d8bd..71c53d8bd 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/InvalidPomArtifactReportProcessorTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java
index d892dd3a6..d892dd3a6 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/LocationArtifactReportProcessorTest.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
index a9f3cd3f2..a9f3cd3f2 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
index 7bdc708a9..7bdc708a9 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java
index 00bdc23ae..00bdc23ae 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReportProcessor.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java
index f13e660cf..f13e660cf 100755
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactReporter.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java
index e6ec4eef3..e6ec4eef3 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockRepositoryQueryLayer.java
diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java
index 98df89646..98df89646 100644
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java
+++ b/archiva-reports-standard/src/test/java/org/apache/maven/repository/reporting/ReportCondition.java
diff --git a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar
index c2ea777c1..c2ea777c1 100644
--- a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar
+++ b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar
diff --git a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom
index 24bca8028..24bca8028 100644
--- a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom
+++ b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom
diff --git a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom
index fd07c6f14..fd07c6f14 100644
--- a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom
+++ b/archiva-reports-standard/src/test/repository/groupId/artifactId/1.0-alpha-2/artifactId-1.0-alpha-2.pom
diff --git a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml b/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml
index a8ea6e7e0..a8ea6e7e0 100644
--- a/maven-repository-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml
+++ b/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml
diff --git a/maven-repository-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom b/archiva-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom
index e69de29bb..e69de29bb 100644
--- a/maven-repository-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom
+++ b/archiva-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom
diff --git a/maven-repository-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-SNAPSHOT.pom b/archiva-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-SNAPSHOT.pom
index e69de29bb..e69de29bb 100644
--- a/maven-repository-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-SNAPSHOT.pom
+++ b/archiva-reports-standard/src/test/repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-SNAPSHOT.pom
diff --git a/maven-repository-reports-standard/src/test/repository/groupId/unexpectedfile.xml b/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml
index 44c9d51ff..44c9d51ff 100644
--- a/maven-repository-reports-standard/src/test/repository/groupId/unexpectedfile.xml
+++ b/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml
diff --git a/maven-repository-reports-standard/src/test/repository/maven-metadata.xml b/archiva-reports-standard/src/test/repository/maven-metadata.xml
index 9efaee38c..9efaee38c 100644
--- a/maven-repository-reports-standard/src/test/repository/maven-metadata.xml
+++ b/archiva-reports-standard/src/test/repository/maven-metadata.xml
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/artifactId/1.0-alpha-3/artifactId-1.0-alpha-3.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/artifactId/1.0-alpha-3/artifactId-1.0-alpha-3.pom
index 31d626277..31d626277 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/artifactId/1.0-alpha-3/artifactId-1.0-alpha-3.pom
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/artifactId/1.0-alpha-3/artifactId-1.0-alpha-3.pom
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.jar b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.jar
index 2acfe605d..2acfe605d 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.jar
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.jar
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.pom
index e5cbe38fd..e5cbe38fd 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.pom
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/maven-archiver-2.0.pom
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/note.txt b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/note.txt
index bc218ba95..bc218ba95 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/note.txt
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-archiver/2.0/note.txt
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar
index d6820d6fe..d6820d6fe 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom
index 17bc67891..17bc67891 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/note.txt b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/note.txt
index 13b46ec93..13b46ec93 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/note.txt
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-model/2.0/note.txt
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.jar b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.jar
index c499d94ff..c499d94ff 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.jar
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.jar
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.pom
index 44ba7ed4e..44ba7ed4e 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.pom
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/maven-monitor-2.1.pom
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/note.txt b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/note.txt
index 796d100b0..796d100b0 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/note.txt
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-monitor/2.1/note.txt
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.jar b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.jar
index efeb8d456..efeb8d456 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.jar
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.jar
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.pom b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.pom
index 8993ed385..8993ed385 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.pom
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/maven-project-2.1.pom
diff --git a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/note.txt b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/note.txt
index 38aefadac..38aefadac 100644
--- a/maven-repository-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/note.txt
+++ b/archiva-reports-standard/src/test/repository/org/apache/maven/maven-project/2.1/note.txt
diff --git a/maven-repository-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml
index d8b910c2e..d8b910c2e 100644
--- a/maven-repository-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml
+++ b/archiva-reports-standard/src/test/resources/org/apache/maven/repository/reporting/DuplicateArtifactFileReportProcessorTest.xml
diff --git a/maven-repository-utils/pom.xml b/archiva-utils/pom.xml
index 7c211a127..baa86124e 100644
--- a/maven-repository-utils/pom.xml
+++ b/archiva-utils/pom.xml
@@ -17,13 +17,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.apache.maven.repository</groupId>
-    <artifactId>maven-repository-manager</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-repository-utils</artifactId>
-  <name>Maven Repository Utilities</name>
+  <artifactId>archiva-utils</artifactId>
+  <name>Archiva Digester Utilities</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java
index c4c8cc7b1..c4c8cc7b1 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractDigester.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java
index 7d148f657..7d148f657 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/AbstractStreamingDigester.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java
index 8bc76b8d2..8bc76b8d2 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigestUtils.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Digester.java
index 70fb8f6ee..70fb8f6ee 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Digester.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Digester.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java
index 789957b84..789957b84 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/DigesterException.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java
index 3ac6a04b2..3ac6a04b2 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Md5Digester.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java
index f0383a0c1..f0383a0c1 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/Sha1Digester.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java
index ec0c5a4b7..ec0c5a4b7 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingDigester.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java
index 2fc11e45c..2fc11e45c 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingMd5Digester.java
diff --git a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java
index 845989eca..845989eca 100644
--- a/maven-repository-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java
+++ b/archiva-utils/src/main/java/org/apache/maven/repository/digest/StreamingSha1Digester.java
diff --git a/maven-repository-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java b/archiva-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java
index 97477d142..97477d142 100644
--- a/maven-repository-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java
+++ b/archiva-utils/src/test/java/org/apache/maven/repository/digest/DigesterTest.java
diff --git a/maven-repository-utils/src/test/resources/test-file.txt b/archiva-utils/src/test/resources/test-file.txt
index ece41df91..ece41df91 100644
--- a/maven-repository-utils/src/test/resources/test-file.txt
+++ b/archiva-utils/src/test/resources/test-file.txt
diff --git a/maven-repository-webapp/pom.xml b/archiva-webapp/pom.xml
index 1201eeb7b..5a7f9c82b 100644
--- a/maven-repository-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -18,13 +18,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.repository</groupId>
-    <artifactId>maven-repository-manager</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>maven-repository-webapp</artifactId>
+  <artifactId>archiva-webapp</artifactId>
   <packaging>war</packaging>
-  <name>Maven Repository Manager Web Application</name>
+  <name>Archiva Web Application</name>
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -75,28 +75,28 @@
       <version>1.0-alpha-10-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-indexer</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-indexer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-discovery</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-discoverer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-configuration</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-proxy</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-proxy</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-core</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.repository</groupId>
-      <artifactId>maven-repository-artifact-applet</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-applet</artifactId>
       <!-- TODO: actually, just exclude from WAR plugin -->
       <scope>provided</scope>
     </dependency>
@@ -106,7 +106,7 @@
     </dependency>
   </dependencies>
   <build>
-    <finalName>maven-repository-webapp</finalName>
+    <finalName>archiva-webapp</finalName>
     <plugins>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
@@ -136,10 +136,10 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
-                  <artifactId>maven-repository-artifact-applet</artifactId>
+                  <artifactId>archiva-applet</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>src/main/webapp</outputDirectory>
-                  <destFileName>maven-repository-artifact-applet.jar</destFileName>
+                  <destFileName>archiva-applet.jar</destFileName>
                 </artifactItem>
               </artifactItems>
             </configuration>
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java
index ad7e9cbb5..ad7e9cbb5 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/BrowseAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java
index 246463d5d..246463d5d 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ProxyAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java
index d17b19349..d17b19349 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/SearchAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java
index b739f6aa9..b739f6aa9 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/ShowArtifactAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java
index 223136b74..223136b74 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractConfigureRepositoryAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java
index 31244c227..31244c227 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/AbstractDeleteRepositoryAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java
index 5077365bb..5077365bb 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java
index 82607f814..82607f814 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java
index 9c00b52a0..9c00b52a0 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java
index 7546238bc..7546238bc 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java
index 69a7500fe..69a7500fe 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteProxiedRepositoryAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java
index 0823afc61..0823afc61 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteRepositoryAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java
index f12fe09e3..f12fe09e3 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/DeleteSyncedRepositoryAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java
index 244346081..244346081 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/action/admin/RunIndexerAction.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java
index 388c7222a..388c7222a 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/interceptor/ConfigurationInterceptor.java
diff --git a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java
index ae89c3704..ae89c3704 100644
--- a/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/repository/manager/web/mapper/RepositoryActionMapper.java
diff --git a/maven-repository-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index 89bfd4b7e..89bfd4b7e 100644
--- a/maven-repository-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
diff --git a/maven-repository-webapp/src/main/resources/maven-proxy-complete.conf b/archiva-webapp/src/main/resources/maven-proxy-complete.conf
index cfa847144..cfa847144 100644
--- a/maven-repository-webapp/src/main/resources/maven-proxy-complete.conf
+++ b/archiva-webapp/src/main/resources/maven-proxy-complete.conf
diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml
index 771a8ab6b..771a8ab6b 100644
--- a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-checksumSearch-validation.xml
diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml
index 961cb7c8d..961cb7c8d 100644
--- a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/SearchAction-quickSearch-validation.xml
diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml
index 60b774bc7..60b774bc7 100644
--- a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureAction-validation.xml
diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
index ee58ed9f9..ee58ed9f9 100644
--- a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml
index 0a1bb779d..0a1bb779d 100644
--- a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureRepositoryAction-validation.xml
diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
index 0a9f275f7..0a9f275f7 100644
--- a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
diff --git a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
index 154b28fb3..154b28fb3 100644
--- a/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
+++ b/archiva-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
diff --git a/maven-repository-webapp/src/main/resources/webwork.properties b/archiva-webapp/src/main/resources/webwork.properties
index 6837803ce..6837803ce 100644
--- a/maven-repository-webapp/src/main/resources/webwork.properties
+++ b/archiva-webapp/src/main/resources/webwork.properties
diff --git a/maven-repository-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index db1d796a7..db1d796a7 100644
--- a/maven-repository-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/decorators.xml b/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
index 03131ae9f..03131ae9f 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/decorators.xml
+++ b/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp
index 6b70fda5b..6b70fda5b 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
index 82c470120..82c470120 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp
index 524164c81..524164c81 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
index 725e4be7d..725e4be7d 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp
index b064b5678..b064b5678 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
index cb2245256..cb2245256 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp
index 7db55d5c7..7db55d5c7 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp
index ee60cfe67..ee60cfe67 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
index 9afd85681..9afd85681 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp
index a39e2ac84..a39e2ac84 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf
index 2dcbce3be..2dcbce3be 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf
index 4b46713e8..4b46713e8 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf
index 91b2a1047..91b2a1047 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
index 6f8a66e78..6f8a66e78 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
index b0670d29c..b0670d29c 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp
index 9cd8384d4..9cd8384d4 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
index 31ad29e64..31ad29e64 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
index da6c69ecc..da6c69ecc 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
index f7ba822ee..f7ba822ee 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
index fb352b5ad..fb352b5ad 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 76f7b3402..76f7b3402 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
index bfc1b0959..bfc1b0959 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/form.jspf
index 6049fe788..6049fe788 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/form.jspf
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp
index bef5023c3..bef5023c3 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
index b40dcd7be..b40dcd7be 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
index 82ed0351c..82ed0351c 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
index 9ef4f69e3..9ef4f69e3 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
index ed843a634..ed843a634 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag b/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
index 6febd7f06..6febd7f06 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
+++ b/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index 49da01f29..49da01f29 100644
--- a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/maven-repository-webapp/src/main/webapp/css/maven-base.css b/archiva-webapp/src/main/webapp/css/maven-base.css
index 9dc7da470..9dc7da470 100644
--- a/maven-repository-webapp/src/main/webapp/css/maven-base.css
+++ b/archiva-webapp/src/main/webapp/css/maven-base.css
diff --git a/maven-repository-webapp/src/main/webapp/css/maven-theme.css b/archiva-webapp/src/main/webapp/css/maven-theme.css
index e035dce77..e035dce77 100644
--- a/maven-repository-webapp/src/main/webapp/css/maven-theme.css
+++ b/archiva-webapp/src/main/webapp/css/maven-theme.css
diff --git a/maven-repository-webapp/src/main/webapp/css/print.css b/archiva-webapp/src/main/webapp/css/print.css
index 9a6106d2d..9a6106d2d 100644
--- a/maven-repository-webapp/src/main/webapp/css/print.css
+++ b/archiva-webapp/src/main/webapp/css/print.css
diff --git a/maven-repository-webapp/src/main/webapp/css/site.css b/archiva-webapp/src/main/webapp/css/site.css
index 98931b472..98931b472 100644
--- a/maven-repository-webapp/src/main/webapp/css/site.css
+++ b/archiva-webapp/src/main/webapp/css/site.css
diff --git a/maven-repository-webapp/src/main/webapp/images/collapsed.gif b/archiva-webapp/src/main/webapp/images/collapsed.gif
index 6e7108406..6e7108406 100644
--- a/maven-repository-webapp/src/main/webapp/images/collapsed.gif
+++ b/archiva-webapp/src/main/webapp/images/collapsed.gif
diff --git a/maven-repository-webapp/src/main/webapp/images/expanded.gif b/archiva-webapp/src/main/webapp/images/expanded.gif
index 0fef3d89e..0fef3d89e 100644
--- a/maven-repository-webapp/src/main/webapp/images/expanded.gif
+++ b/archiva-webapp/src/main/webapp/images/expanded.gif
diff --git a/maven-repository-webapp/src/main/webapp/images/external.png b/archiva-webapp/src/main/webapp/images/external.png
index 3f999fc88..3f999fc88 100644
--- a/maven-repository-webapp/src/main/webapp/images/external.png
+++ b/archiva-webapp/src/main/webapp/images/external.png
diff --git a/maven-repository-webapp/src/main/webapp/images/footerborder.gif b/archiva-webapp/src/main/webapp/images/footerborder.gif
index 958ce7ae3..958ce7ae3 100644
--- a/maven-repository-webapp/src/main/webapp/images/footerborder.gif
+++ b/archiva-webapp/src/main/webapp/images/footerborder.gif
diff --git a/maven-repository-webapp/src/main/webapp/images/icon_error_sml.gif b/archiva-webapp/src/main/webapp/images/icon_error_sml.gif
index 61132ef2b..61132ef2b 100644
--- a/maven-repository-webapp/src/main/webapp/images/icon_error_sml.gif
+++ b/archiva-webapp/src/main/webapp/images/icon_error_sml.gif
diff --git a/maven-repository-webapp/src/main/webapp/images/icon_info_sml.gif b/archiva-webapp/src/main/webapp/images/icon_info_sml.gif
index c6cb9ad7c..c6cb9ad7c 100644
--- a/maven-repository-webapp/src/main/webapp/images/icon_info_sml.gif
+++ b/archiva-webapp/src/main/webapp/images/icon_info_sml.gif
diff --git a/maven-repository-webapp/src/main/webapp/images/icon_success_sml.gif b/archiva-webapp/src/main/webapp/images/icon_success_sml.gif
index 52e85a430..52e85a430 100644
--- a/maven-repository-webapp/src/main/webapp/images/icon_success_sml.gif
+++ b/archiva-webapp/src/main/webapp/images/icon_success_sml.gif
diff --git a/maven-repository-webapp/src/main/webapp/images/icon_warning_sml.gif b/archiva-webapp/src/main/webapp/images/icon_warning_sml.gif
index 873bbb52c..873bbb52c 100644
--- a/maven-repository-webapp/src/main/webapp/images/icon_warning_sml.gif
+++ b/archiva-webapp/src/main/webapp/images/icon_warning_sml.gif
diff --git a/maven-repository-webapp/src/main/webapp/images/newwindow.png b/archiva-webapp/src/main/webapp/images/newwindow.png
index 6287f72bd..6287f72bd 100644
--- a/maven-repository-webapp/src/main/webapp/images/newwindow.png
+++ b/archiva-webapp/src/main/webapp/images/newwindow.png
diff --git a/maven-repository-webapp/src/main/webapp/images/super.gif b/archiva-webapp/src/main/webapp/images/super.gif
index c8ee24344..c8ee24344 100644
--- a/maven-repository-webapp/src/main/webapp/images/super.gif
+++ b/archiva-webapp/src/main/webapp/images/super.gif
diff --git a/maven-repository-webapp/src/main/webapp/images/super_hl.gif b/archiva-webapp/src/main/webapp/images/super_hl.gif
index d90b8f0f8..d90b8f0f8 100644
--- a/maven-repository-webapp/src/main/webapp/images/super_hl.gif
+++ b/archiva-webapp/src/main/webapp/images/super_hl.gif
diff --git a/maven-repository-webapp/src/main/webapp/index.jsp b/archiva-webapp/src/main/webapp/index.jsp
index 867a05e78..867a05e78 100644
--- a/maven-repository-webapp/src/main/webapp/index.jsp
+++ b/archiva-webapp/src/main/webapp/index.jsp
diff --git a/maven-repository-webapp/src/main/webapp/template/repository-manager/radiomap.ftl b/archiva-webapp/src/main/webapp/template/repository-manager/radiomap.ftl
index 89ef578d1..89ef578d1 100644
--- a/maven-repository-webapp/src/main/webapp/template/repository-manager/radiomap.ftl
+++ b/archiva-webapp/src/main/webapp/template/repository-manager/radiomap.ftl
diff --git a/maven-repository-webapp/src/main/webapp/template/repository-manager/theme.properties b/archiva-webapp/src/main/webapp/template/repository-manager/theme.properties
index b0dfbe775..b0dfbe775 100644
--- a/maven-repository-webapp/src/main/webapp/template/repository-manager/theme.properties
+++ b/archiva-webapp/src/main/webapp/template/repository-manager/theme.properties
diff --git a/maven-repository-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java b/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java
index 02c8fe5a7..02c8fe5a7 100644
--- a/maven-repository-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java
+++ b/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/HttpServletRequestStub.java
diff --git a/maven-repository-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java b/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java
index e5919d19b..e5919d19b 100644
--- a/maven-repository-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java
+++ b/archiva-webapp/src/test/java/org/apache/maven/repository/proxy/web/action/test/stub/ServletRequestStub.java
diff --git a/maven-repository-webapp/src/test/resources/unit/proxy-test/maven-proxy-complete.conf b/archiva-webapp/src/test/resources/unit/proxy-test/maven-proxy-complete.conf
index 95f01bb30..95f01bb30 100644
--- a/maven-repository-webapp/src/test/resources/unit/proxy-test/maven-proxy-complete.conf
+++ b/archiva-webapp/src/test/resources/unit/proxy-test/maven-proxy-complete.conf
diff --git a/maven-meeper/pom.xml b/maven-meeper/pom.xml
index 81abc0924..158a2c353 100644
--- a/maven-meeper/pom.xml
+++ b/maven-meeper/pom.xml
@@ -19,14 +19,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>maven-repository-manager</artifactId>
-    <groupId>org.apache.maven.repository</groupId>
-    <version>2.1-SNAPSHOT</version>
+    <artifactId>archiva</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-meeper</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <name>Maven Meeper</name>
-  <version>1.0-SNAPSHOT</version>
-  <description></description>
 </project>
diff --git a/pom.xml b/pom.xml
index 46c227b97..8e57c63a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,13 @@
     <version>1</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.maven.repository</groupId>
-  <artifactId>maven-repository-manager</artifactId>
+  <groupId>org.apache.maven.archiva</groupId>
+  <artifactId>archiva</artifactId>
   <packaging>pom</packaging>
-  <name>Maven Repository Manager</name>
+  <name>Archiva</name>
   <version>1.0-SNAPSHOT</version>
   <description>
-    The Maven Repository Manager is an application for managing one or more remote repositories, including
+    Archiva is an application for managing one or more remote repositories, including
     administration, artifact handling,
     browsing and searching.
   </description>
@@ -115,19 +115,17 @@
     </pluginManagement>
   </build>
   <modules>
-    <!--
-    <module>maven-repository-application</module>
-    -->
-    <module>maven-repository-artifact-applet</module>
-    <module>maven-repository-converter</module>
-    <module>maven-repository-discovery</module>
-    <module>maven-repository-reports-standard</module>
-    <module>maven-repository-indexer</module>
-    <module>maven-repository-utils</module>
-    <module>maven-repository-webapp</module>
-    <module>maven-repository-proxy</module>
-    <module>maven-repository-core</module>
-    <module>maven-repository-configuration</module>
+    <module>archiva-applet</module>
+    <module>archiva-converter</module>
+    <module>archiva-discoverer</module>
+    <module>archiva-reports-standard</module>
+    <module>archiva-indexer</module>
+    <module>archiva-utils</module>
+    <module>archiva-webapp</module>
+    <module>archiva-proxy</module>
+    <module>archiva-core</module>
+    <module>archiva-configuration</module>
+    <module>maven-meeper</module>
   </modules>
   <dependencies>
     <dependency>
@@ -200,48 +198,48 @@
         <version>1.0-alpha-6</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-core</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-core</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-reports-standard</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-reports-standard</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-discovery</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-discoverer</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-indexer</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-indexer</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-proxy</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-proxy</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-utils</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-utils</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-artifact-applet</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-applet</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-configuration</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-configuration</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.repository</groupId>
-        <artifactId>maven-repository-converter</artifactId>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-converter</artifactId>
         <version>${pom.version}</version>
       </dependency>
     </dependencies>