diff --git a/archiva-common/pom.xml b/archiva-base/archiva-common/pom.xml
similarity index 100%
rename from archiva-common/pom.xml
rename to archiva-base/archiva-common/pom.xml
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java
diff --git a/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java b/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java
similarity index 100%
rename from archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java
rename to archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java
diff --git a/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java b/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java
similarity index 100%
rename from archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java
rename to archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java
diff --git a/archiva-common/src/test/legacy-repository/CVS/Root b/archiva-base/archiva-common/src/test/legacy-repository/CVS/Root
similarity index 100%
rename from archiva-common/src/test/legacy-repository/CVS/Root
rename to archiva-base/archiva-common/src/test/legacy-repository/CVS/Root
diff --git a/archiva-common/src/test/legacy-repository/KEYS b/archiva-base/archiva-common/src/test/legacy-repository/KEYS
similarity index 100%
rename from archiva-common/src/test/legacy-repository/KEYS
rename to archiva-base/archiva-common/src/test/legacy-repository/KEYS
diff --git a/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo b/archiva-base/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
similarity index 100%
rename from archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
rename to archiva-base/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
diff --git a/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar b/archiva-base/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar
diff --git a/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar b/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
diff --git a/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar b/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
rename to archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
diff --git a/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar b/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar
diff --git a/archiva-common/src/test/legacy-repository/invalid/jars/no-extension b/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/no-extension
similarity index 100%
rename from archiva-common/src/test/legacy-repository/invalid/jars/no-extension
rename to archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/no-extension
diff --git a/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar b/archiva-base/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
diff --git a/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar b/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
similarity index 100%
rename from archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
rename to archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
diff --git a/archiva-common/src/test/repository/CVS/Root b/archiva-base/archiva-common/src/test/repository/CVS/Root
similarity index 100%
rename from archiva-common/src/test/repository/CVS/Root
rename to archiva-base/archiva-common/src/test/repository/CVS/Root
diff --git a/archiva-common/src/test/repository/KEYS b/archiva-base/archiva-common/src/test/repository/KEYS
similarity index 100%
rename from archiva-common/src/test/repository/KEYS
rename to archiva-base/archiva-common/src/test/repository/KEYS
diff --git a/archiva-common/src/test/repository/invalid/invalid-1.0.jar b/archiva-base/archiva-common/src/test/repository/invalid/invalid-1.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/invalid/invalid-1.0.jar
rename to archiva-base/archiva-common/src/test/repository/invalid/invalid-1.0.jar
diff --git a/archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
similarity index 100%
rename from archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
rename to archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
diff --git a/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
rename to archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
diff --git a/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar b/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar
similarity index 100%
rename from archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar
rename to archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar
diff --git a/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar b/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
rename to archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
diff --git a/archiva-common/src/test/repository/invalid/invalid/1/invalid-1 b/archiva-base/archiva-common/src/test/repository/invalid/invalid/1/invalid-1
similarity index 100%
rename from archiva-common/src/test/repository/invalid/invalid/1/invalid-1
rename to archiva-base/archiva-common/src/test/repository/invalid/invalid/1/invalid-1
diff --git a/archiva-common/src/test/repository/javax/maven-metadata.xml b/archiva-base/archiva-common/src/test/repository/javax/maven-metadata.xml
similarity index 100%
rename from archiva-common/src/test/repository/javax/maven-metadata.xml
rename to archiva-base/archiva-common/src/test/repository/javax/maven-metadata.xml
diff --git a/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
rename to archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
diff --git a/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
similarity index 100%
rename from archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
rename to archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
diff --git a/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
similarity index 100%
rename from archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
rename to archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
diff --git a/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml b/archiva-base/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml
similarity index 100%
rename from archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml
rename to archiva-base/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml
diff --git a/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war b/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war
diff --git a/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war b/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war
diff --git a/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-base/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml
diff --git a/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
diff --git a/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
diff --git a/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip b/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip
diff --git a/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
diff --git a/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
diff --git a/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
rename to archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
diff --git a/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
rename to archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
diff --git a/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
rename to archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
diff --git a/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
similarity index 100%
rename from archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
rename to archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
diff --git a/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml b/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml
similarity index 100%
rename from archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml
rename to archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml
diff --git a/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml b/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml
similarity index 100%
rename from archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml
rename to archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml
diff --git a/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml b/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml
similarity index 100%
rename from archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml
rename to archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml
diff --git a/archiva-configuration/pom.xml b/archiva-base/archiva-configuration/pom.xml
similarity index 100%
rename from archiva-configuration/pom.xml
rename to archiva-base/archiva-configuration/pom.xml
diff --git a/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
similarity index 100%
rename from archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
rename to archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
diff --git a/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
similarity index 100%
rename from archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
rename to archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
diff --git a/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java
similarity index 100%
rename from archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java
rename to archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java
diff --git a/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java b/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
similarity index 100%
rename from archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
rename to archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
diff --git a/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
similarity index 100%
rename from archiva-configuration/src/main/mdo/configuration.mdo
rename to archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
diff --git a/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties b/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties
similarity index 100%
rename from archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties
rename to archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties
diff --git a/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml b/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
similarity index 100%
rename from archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
rename to archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
diff --git a/archiva-configuration/src/test/conf/corrupt.xml b/archiva-base/archiva-configuration/src/test/conf/corrupt.xml
similarity index 100%
rename from archiva-configuration/src/test/conf/corrupt.xml
rename to archiva-base/archiva-configuration/src/test/conf/corrupt.xml
diff --git a/archiva-configuration/src/test/conf/maven-proxy-complete.conf b/archiva-base/archiva-configuration/src/test/conf/maven-proxy-complete.conf
similarity index 100%
rename from archiva-configuration/src/test/conf/maven-proxy-complete.conf
rename to archiva-base/archiva-configuration/src/test/conf/maven-proxy-complete.conf
diff --git a/archiva-configuration/src/test/conf/repository-manager.xml b/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
similarity index 100%
rename from archiva-configuration/src/test/conf/repository-manager.xml
rename to archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
diff --git a/archiva-configuration/src/test/conf/with-proxied-repos.xml b/archiva-base/archiva-configuration/src/test/conf/with-proxied-repos.xml
similarity index 100%
rename from archiva-configuration/src/test/conf/with-proxied-repos.xml
rename to archiva-base/archiva-configuration/src/test/conf/with-proxied-repos.xml
diff --git a/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
similarity index 100%
rename from archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
rename to archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
diff --git a/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
similarity index 100%
rename from archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
rename to archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
diff --git a/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml b/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
similarity index 100%
rename from archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
rename to archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
diff --git a/archiva-converter/pom.xml b/archiva-base/archiva-converter/pom.xml
similarity index 100%
rename from archiva-converter/pom.xml
rename to archiva-base/archiva-converter/pom.xml
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java
diff --git a/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java
similarity index 100%
rename from archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java
rename to archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java
diff --git a/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties b/archiva-base/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties
similarity index 100%
rename from archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties
rename to archiva-base/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties
diff --git a/archiva-converter/src/test/expected-files/converted-artifact-one.pom b/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-one.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/converted-artifact-one.pom
rename to archiva-base/archiva-converter/src/test/expected-files/converted-artifact-one.pom
diff --git a/archiva-converter/src/test/expected-files/converted-artifact-three.pom b/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-three.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/converted-artifact-three.pom
rename to archiva-base/archiva-converter/src/test/expected-files/converted-artifact-three.pom
diff --git a/archiva-converter/src/test/expected-files/converted-artifact-two.pom b/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-two.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/converted-artifact-two.pom
rename to archiva-base/archiva-converter/src/test/expected-files/converted-artifact-two.pom
diff --git a/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom b/archiva-base/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
rename to archiva-base/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom
diff --git a/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom b/archiva-base/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
rename to archiva-base/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
diff --git a/archiva-converter/src/test/expected-files/converted-v3-warnings.pom b/archiva-base/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/converted-v3-warnings.pom
rename to archiva-base/archiva-converter/src/test/expected-files/converted-v3-warnings.pom
diff --git a/archiva-converter/src/test/expected-files/converted-v3.pom b/archiva-base/archiva-converter/src/test/expected-files/converted-v3.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/converted-v3.pom
rename to archiva-base/archiva-converter/src/test/expected-files/converted-v3.pom
diff --git a/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom b/archiva-base/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom
rename to archiva-base/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom
diff --git a/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v3-artifact-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v3-version-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v3-version-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v3-version-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v3-version-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v4-artifact-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
diff --git a/archiva-converter/src/test/expected-files/v4-version-metadata.xml b/archiva-base/archiva-converter/src/test/expected-files/v4-version-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/expected-files/v4-version-metadata.xml
rename to archiva-base/archiva-converter/src/test/expected-files/v4-version-metadata.xml
diff --git a/archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java
similarity index 100%
rename from archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java
rename to archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java
diff --git a/archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java
similarity index 100%
rename from archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java
rename to archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java
diff --git a/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
similarity index 100%
rename from archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
rename to archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
diff --git a/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java
similarity index 100%
rename from archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java
rename to archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java
diff --git a/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java
similarity index 100%
rename from archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java
rename to archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java
diff --git a/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java
similarity index 100%
rename from archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java
rename to archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java
diff --git a/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java b/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java
similarity index 100%
rename from archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java
rename to archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java
diff --git a/archiva-converter/src/test/resources/log4j.properties b/archiva-base/archiva-converter/src/test/resources/log4j.properties
similarity index 100%
rename from archiva-converter/src/test/resources/log4j.properties
rename to archiva-base/archiva-converter/src/test/resources/log4j.properties
diff --git a/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml b/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
similarity index 100%
rename from archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
rename to archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml b/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
rename to archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar b/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
similarity index 100%
rename from archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
rename to archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom b/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
similarity index 100%
rename from archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
rename to archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml b/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
rename to archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
diff --git a/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml b/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
rename to archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
diff --git a/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 b/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
diff --git a/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 b/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
diff --git a/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
diff --git a/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 b/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
rename to archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
diff --git a/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar b/archiva-base/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar
rename to archiva-base/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar
diff --git a/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
diff --git a/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
diff --git a/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml b/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
similarity index 100%
rename from archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
rename to archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
diff --git a/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar b/archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
similarity index 100%
rename from archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
rename to archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
diff --git a/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom b/archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
similarity index 100%
rename from archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
rename to archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
diff --git a/archiva-base/archiva-model/pom.xml b/archiva-base/archiva-model/pom.xml
new file mode 100755
index 000000000..3fcb6843f
--- /dev/null
+++ b/archiva-base/archiva-model/pom.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<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.archiva</groupId>
+    <artifactId>archiva</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>archiva-model</artifactId>
+  <name>Archiva Model</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.jdo</groupId>
+      <artifactId>jdo2-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-15-SNAPSHOT</version>
+        <configuration>
+          <version>1.0.0</version>
+          <packageWithVersion>false</packageWithVersion>
+          <model>src/main/mdo/archiva-base.xml</model>
+        </configuration>
+        <executions>
+          <execution>
+            <id>archiva-base</id>
+            <goals>
+              <goal>java</goal>
+              <goal>xsd</goal>
+              <goal>jpox-jdo-mapping</goal>
+              <goal>jpox-metadata-class</goal>
+              <goal>xpp3-writer</goal>
+              <goal>xpp3-reader</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+       <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jpox-maven-plugin</artifactId>
+        <version>1.1.6</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.2.1.6</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>create-ddl</id>
+            <phase>generate-test-resources</phase>
+            <goals>
+              <goal>schema-create</goal>
+            </goals>
+            <configuration>
+              <outputFile>${basedir}/target/classes/org/apache/maven/archiva/model/schema.ddl</outputFile>
+              <toolProperties>
+                <property>
+                  <name>javax.jdo.option.ConnectionDriverName</name>
+                  <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+                </property>
+                <property>
+                  <name>javax.jdo.option.ConnectionURL</name>
+                  <value>jdbc:derby:target/jdo-schema-create;create=true</value>
+                </property>
+                <property>
+                  <name>javax.jdo.option.ConnectionUserName</name>
+                  <value>sa</value>
+                </property>
+                <property>
+                  <name>javax.jdo.option.ConnectionPassword</name>
+                  <value></value>
+                </property>
+                <property>
+                  <name>log4j.configuration</name>
+                  <value>${basedir}/src/test/resources/log4j.xml</value>
+                </property>
+                <property>
+                  <name>org.jpox.autoCreateTables</name>
+                  <value>true</value>
+                </property>
+              </toolProperties>
+            </configuration>
+          </execution>
+          <execution>
+            <id>enhance</id>
+            <goals>
+              <goal>enhance</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <configuration>
+          <instrumentation>
+            <!-- exclude generated -->
+            <excludes>
+              <exclude>org/apache/maven/archiva/reporting/model/**</exclude>
+            </excludes>
+          </instrumentation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java b/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java
new file mode 100644
index 000000000..a198eaec2
--- /dev/null
+++ b/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java
@@ -0,0 +1,170 @@
+package org.apache.maven.archiva.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.lang.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * RepositoryContentKey - the jpox application key support class for all content within the repository.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class RepositoryContentKey implements Serializable
+{
+    /**
+     * The Repository ID. (JPOX Requires this remain public)
+     */
+    public String repositoryId = "";
+
+    /**
+     * The Group ID. (JPOX Requires this remain public)
+     */
+    public String groupId = "";
+
+    /**
+     * The Artifact ID. (JPOX Requires this remain public)
+     */
+    public String artifactId = "";
+
+    /**
+     * The Version. (JPOX Requires this remain public)
+     */
+    public String version = "";
+
+    /**
+     * Default Constructor.  Required by JPOX.
+     */
+    public RepositoryContentKey()
+    {
+
+    }
+
+    /**
+     * Key Based Constructor.  Required by JPOX.
+     * 
+     * @param key the String representing this object's values.
+     */
+    public RepositoryContentKey( String key )
+    {
+        String parts[] = StringUtils.splitPreserveAllTokens( key, ':' );
+        repositoryId = parts[0];
+        groupId = parts[1];
+        artifactId = parts[2];
+        version = parts[3];
+    }
+
+    /**
+     * Get the String representation of this object. - Required by JPOX.
+     */
+    public String toString()
+    {
+        return StringUtils.join( new String[] { repositoryId, groupId, artifactId, version } );
+    }
+
+    /**
+     * Get the hashcode for this object's values - Required by JPOX.
+     */
+    public int hashCode()
+    {
+        final int PRIME = 31;
+        int result = 1;
+        result = PRIME * result + ( ( repositoryId == null ) ? 0 : repositoryId.hashCode() );
+        result = PRIME * result + ( ( groupId == null ) ? 0 : groupId.hashCode() );
+        result = PRIME * result + ( ( artifactId == null ) ? 0 : artifactId.hashCode() );
+        result = PRIME * result + ( ( version == null ) ? 0 : version.hashCode() );
+        return result;
+    }
+
+    /**
+     * Get the equals for this object's values - Required by JPOX.
+     */
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
+        {
+            return true;
+        }
+
+        if ( obj == null )
+        {
+            return false;
+        }
+
+        if ( getClass() != obj.getClass() )
+        {
+            return false;
+        }
+
+        final RepositoryContentKey other = (RepositoryContentKey) obj;
+
+        if ( repositoryId == null )
+        {
+            if ( other.repositoryId != null )
+            {
+                return false;
+            }
+        }
+        else if ( !repositoryId.equals( other.repositoryId ) )
+        {
+            return false;
+        }
+
+        if ( groupId == null )
+        {
+            if ( other.groupId != null )
+            {
+                return false;
+            }
+        }
+        else if ( !groupId.equals( other.groupId ) )
+        {
+            return false;
+        }
+
+        if ( artifactId == null )
+        {
+            if ( other.artifactId != null )
+            {
+                return false;
+            }
+        }
+        else if ( !artifactId.equals( other.artifactId ) )
+        {
+            return false;
+        }
+
+        if ( version == null )
+        {
+            if ( other.version != null )
+            {
+                return false;
+            }
+        }
+        else if ( !version.equals( other.version ) )
+        {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
new file mode 100644
index 000000000..a6cc0fc40
--- /dev/null
+++ b/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
@@ -0,0 +1,1277 @@
+<?xml version="1.0" ?>
+<model jpox.mapping-in-package="true"
+       jpox.table-prefix="ARCHIVA_"
+       xsd.namespace="http://maven.apache.org/archiva/MODEL-1.0.0"
+       xsd.target-namespace="http://maven.apache.org/archiva/MODEL-1.0.0">
+  <id>archiva-base-model</id>
+  <name>ArchivaBaseModel</name>
+  <version>1.0.0</version>
+  <description>Archiva Model</description>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.apache.maven.archiva.model</value>
+    </default>
+  </defaults>
+
+  <classes>
+    <class stash.storable="false" 
+           rootElement="true"
+           jpox.enabled="false">
+      <name>ArchivaAll</name>
+      <version>1.0.0+</version>
+      <description>
+        This object is only used for the XML backup / restore features of Archiva.
+        This object is not serialized to the Database.
+      </description>
+      <fields>
+        <field>
+          <name>repositories</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>ArchivaRepositoryModel</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>artifacts</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>ArchivaArtifactModel</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>repositoryMetadata</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>ArchivaRepositoryMetadata</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>projects</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>ArchivaProjectModel</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>artifactHealth</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>ArchivaArtifactHealth</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>repositoryMetadataHealth</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>ArchivaRepositoryMetadataHealth</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>repositoryContentStatistics</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>RepositoryContentStatistics</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+
+    <!-- _______________________________________________________________
+          ____                      _ _
+         |  _ \ ___ _ __   ___  ___(_) |_ ___  _ __ _   _
+         | |_) / _ \ '_ \ / _ \/ __| | __/ _ \| '__| | | |
+         |  _ <  __/ |_) | (_) \__ \ | || (_) | |  | |_| |
+         |_| \_\___| .__/ \___/|___/_|\__\___/|_|   \__, |
+                   |_|                              |___/
+      -->
+
+    <class stash.storable="true"
+           jpox.table="REPOSITORIES"
+           jpox.not-persisted-fields="modelEncoding">
+      <name>ArchivaRepositoryModel</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field jpox.primary-key="true"
+               jpox.value-strategy="off">
+          <name>id</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+            The unique ID for the repository.
+          </description>
+        </field>
+        <field>
+          <name>name</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+            The Name of the repository.
+          </description>
+        </field>
+        <field>
+          <name>url</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+            The URL of the repository.
+          </description>
+        </field>
+        <field>
+          <name>creationSource</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+            The Source of this repository.
+            (Example: Configuration, POM)
+          </description>
+        </field>
+        <field>
+          <name>layoutName</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+            The layout of the repository.
+            (Either 'default', or 'legacy')
+          </description>
+          <defaultValue>default</defaultValue>
+        </field>
+        <field>
+          <name>releasePolicy</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>boolean</type>
+          <required>true</required>
+          <description>
+            The releases policy of the repository.
+          </description>
+          <defaultValue>true</defaultValue>
+        </field>
+        <field>
+          <name>snapshotPolicy</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>boolean</type>
+          <required>true</required>
+          <description>
+            The snapshot policy of the repository.
+          </description>
+          <defaultValue>false</defaultValue>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="REPOSITORY_CONTENT_KEYS"
+           jpox.use-identifiers-as-primary-key="true"
+           jpox.identity-type="application"
+           jpox.identity-class="RepositoryContentKey">
+      <name>RepositoryContent</name>
+      <version>1.0.0+</version>
+      <description>
+        Repository Content Identifier.
+      </description>
+      <fields>
+        <field jpox.primary-key="true"
+               jpox.value-strategy="off"
+               jpox.persistence-modifier="persistent">
+          <name>groupId</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+            The Group ID of the repository content.
+          </description>
+        </field>
+        <field jpox.primary-key="true"
+               jpox.value-strategy="off"
+               jpox.persistence-modifier="persistent">
+          <name>artifactId</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+            The Artifact ID of the repository content.
+          </description>
+        </field>
+        <field jpox.primary-key="true"
+               jpox.value-strategy="off"
+               jpox.persistence-modifier="persistent">
+          <name>version</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>false</required>
+          <description>
+            The version of the repository content.
+          </description>
+        </field>
+        <field jpox.primary-key="true"
+               jpox.value-strategy="off"
+               jpox.persistence-modifier="persistent">
+          <name>repositoryId</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <type>String</type>
+          <description>
+            The repository associated with this content.
+          </description>
+        </field>
+      </fields>
+      <codeSegments>
+        <codeSegment>
+          <version>1.0.0+</version>
+          <code>
+          <![CDATA[
+    /**
+     * Default Constructor.
+     * NOTE: The RepositoryContent object is invalid, and cannot be persisted to
+     *       the database until you set the {@link #setGroupId(String)}, 
+     *       {@link #setArtifactId(String)}, and {@link #setVersion(String)} values
+     *       first.
+     */ 
+    public RepositoryContent()
+    {
+        /* Do nothing */
+    }
+
+    public RepositoryContent( String groupId, String artifactId, String version )
+    {
+        this.setGroupId( groupId );
+        this.setArtifactId( artifactId );
+        this.setVersion( version );
+    }
+
+    public RepositoryContent( String repositoryId, String groupId, String artifactId, String version )
+    {
+        this.setRepositoryId( repositoryId );
+        this.setGroupId( groupId );
+        this.setArtifactId( artifactId );
+        this.setVersion( version );
+    }
+
+    public RepositoryContent( ArchivaRepositoryModel repository, String groupId, String artifactId, String version )
+    {
+        this.setRepositoryId( repository.getId() );
+        this.setGroupId( groupId );
+        this.setArtifactId( artifactId );
+        this.setVersion( version );
+    }
+          ]]></code>
+        </codeSegment>
+      </codeSegments>
+    </class>
+
+    <!-- _______________________________________________________________
+           _         _   _  __            _
+          / \   _ __| |_(_)/ _| __ _  ___| |_
+         / _ \ | '__| __| | |_ / _` |/ __| __|
+        / ___ \| |  | |_| |  _| (_| | (__| |_
+       /_/   \_\_|   \__|_|_|  \__,_|\___|\__|
+
+      -->
+
+    <class stash.storable="true"
+           jpox.table="ARTIFACT">
+      <name>ArchivaArtifactModel</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>contentKey</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <association>
+            <type>RepositoryContent</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The content key for this artifact.
+          </description>
+        </field>
+        <field>
+          <name>classifier</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>false</required>
+          <description>
+            The classifier for this artifact.
+          </description>
+        </field>
+        <field jpox.column="FILE_TYPE">
+          <name>type</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+            The type of artifact.
+          </description>
+        </field>
+        <field>
+          <name>checksumMD5</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>false</required>
+          <description>
+            The MD5 checksum for the artifact file.
+          </description>
+        </field>
+        <field>
+          <name>checksumSHA1</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>false</required>
+          <description>
+            The SHA1 checksum for the artifact file.
+          </description>
+        </field>
+        <field>
+          <name>checksumBytecode</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>false</required>
+          <description>
+            The SHA1 checksum for the bytecode in the artifact file. (Can be empty if
+            the artifact contains no bytecode)
+          </description>
+        </field>
+        <field>
+          <name>whenIndexed</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>Date</type>
+          <required>false</required>
+          <description>
+            The timestamp when this artifact was indexed.
+          </description>
+        </field>
+        <field>
+          <name>origin</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>false</required>
+          <description>
+            The origin of this artifact. (Filesystem, Proxy, Deploy)
+          </description>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="REPOSITORY_METADATA">
+      <name>ArchivaRepositoryMetadata</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>contentKey</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <association>
+            <type>RepositoryContent</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The content key for this repository metadata.
+          </description>
+        </field>
+        <field>
+          <name>releasedVersion</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>false</required>
+          <type>String</type>
+          <description>
+            The released version id.
+          </description>
+        </field>
+        <field>
+          <name>availableVersions</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>false</required>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <description>
+            The list of available version ids.
+          </description>
+        </field>
+        <field>
+          <name>whenIndexed</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>Date</type>
+          <required>false</required>
+          <description>
+            The timestamp when this artifact was indexed.
+          </description>
+        </field>
+        <field>
+          <name>lastUpdated</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>Date</type>
+          <required>false</required>
+          <description>
+            the timestamp when this artifact was indexed.
+          </description>
+        </field>
+        <field>
+          <name>origin</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <required>false</required>
+          <description>
+            The origin of this artifact. (Filesystem, Proxy, Deploy)
+          </description>
+        </field>
+      </fields>
+    </class>
+
+    <!-- _______________________________________________________________
+         __  __                         ____            _           _
+        |  \/  | __ ___   _____ _ __   |  _ \ _ __ ___ (_) ___  ___| |_
+        | |\/| |/ _` \ \ / / _ \ '_ \  | |_) | '__/ _ \| |/ _ \/ __| __|
+        | |  | | (_| |\ V /  __/ | | | |  __/| | | (_) | |  __/ (__| |_
+        |_|  |_|\__,_| \_/ \___|_| |_| |_|   |_|  \___// |\___|\___|\__|
+                                                     |__/
+     -->
+
+    <class stash.storable="true"
+           jpox.table="PROJECT">
+      <name>ArchivaProjectModel</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>contentKey</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <association>
+            <type>RepositoryContent</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The content key for this artifact.
+          </description>
+        </field>
+        <field>
+          <name>parentContentKey</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>false</required>
+          <association>
+            <type>RepositoryContent</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The content key for a parent reference.
+          </description>
+        </field>
+        <field>
+          <name>packaging</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <type>String</type>
+          <description>
+            The declared packaging for this project model.
+          </description>
+        </field>
+        <field>
+          <name>origin</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <type>String</type>
+          <description>
+            The Origin of this Model. (Filesystem, Proxy, or Deploy)
+          </description>
+        </field>
+        <field>
+          <name>whenIndexed</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <type>Date</type>
+          <description>
+            The timestamp when this model was indexed.
+          </description>
+        </field>
+        <field>
+          <name>url</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>false</required>
+          <type>String</type>
+          <description>
+            The URL for the project's homepage.
+          </description>
+        </field>
+        <field>
+          <name>organization</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>false</required>
+          <association>
+            <type>Organization</type>
+          </association>
+        </field>
+        <field>
+          <name>licenses</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>false</required>
+          <association>
+            <type>License</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>issueManagement</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The project's issue management system information.]]></description>
+          <association>
+            <type>IssueManagement</type>
+          </association>
+        </field>
+        <field>
+          <name>ciManagement</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The project's continuous integration information.]]></description>
+          <association>
+            <type>CiManagement</type>
+          </association>
+        </field>
+        <field>
+          <name>scm</name>
+          <version>1.0.0+</version>
+          <description>
+            <![CDATA[Specification for the SCM used by the project, such as CVS, Subversion, etc.]]></description>
+          <association>
+            <type>Scm</type>
+          </association>
+        </field>
+        <field>
+          <name>individuals</name>
+          <version>1.0.0+</version>
+          <description>
+            The list of individuals around this project.
+          </description>
+          <association>
+            <type>Individual</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>dependencies</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+              This element describes all of the dependencies associated with a
+              project.
+          ]]></description>
+          <association>
+            <type>Dependency</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>repositories</name>
+          <version>1.0.0+</version>
+          <description>
+            The list project repositories in use by this project.
+          </description>
+          <association>
+            <type>ProjectRepository</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>plugins</name>
+          <version>1.0.0+</version>
+          <description>
+            The list of plugins that this project uses.
+          </description>
+          <association>
+            <type>RepositoryContent</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>reports</name>
+          <version>1.0.0+</version>
+          <description>
+            The list of reports that this project uses.
+          </description>
+          <association>
+            <type>RepositoryContent</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="ORGANIZATION">
+      <name>Organization</name>
+      <description>Specifies the organization that produces this project.</description>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>name</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The full name of the organization.]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The URL to the organization's home page.]]></description>
+          <type>String</type>
+        </field>
+        <field jpox.column="FAVICON_URL">
+          <name>favicon</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            The URL to the organization's logo image.  This can be an URL relative
+            to the base directory of the generated web site,
+            (e.g., <code>/images/org-logo.png</code>) or an absolute URL
+            (e.g., <code>http://my.corp/logo.png</code>).  This value is used
+            when generating the project documentation.
+          ]]></description>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="LICENSES">
+      <name>License</name>
+      <description><![CDATA[
+        Describes the licenses for this project.  This is used to generate
+        the license page of the project's web site, as well as being taken into consideration in other reporting and
+        validation. The licenses listed for the project are that of the project itself, and not of dependencies.
+      ]]></description>
+      <version>1.0.0+</version>
+      <fields>
+        <field jpox.column="LICENSE_ID">
+          <name>id</name>
+          <version>1.0.0+</version>
+          <type>int</type>
+          <description>
+            The type of license.
+          </description>
+        </field>
+        <field>
+          <name>name</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The full legal name of the license.]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The official url for the license text.]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>comments</name>
+          <description>
+            Addendum information pertaining to this license.
+          </description>
+          <version>1.0.0+</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="ISSUE_MANAGEMENT">
+      <name>IssueManagement</name>
+      <description>
+        Information about the issue tracking (or bug tracking) system used to manage this project.
+      </description>
+      <version>1.0.0+</version>
+      <fields>
+        <field jpox.column="SYSTEM_NAME">
+          <name>system</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The name of the issue management system, e.g. Bugzilla]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[URL for the issue management system used by the project.]]></description>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>CiManagement</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field jpox.column="SYSTEM_NAME">
+          <name>system</name>
+          <version>1.0.0+</version>
+          <description>
+            <![CDATA[The name of the continuous integration system, e.g. <code>continuum</code>.]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0+</version>
+          <description>
+            <![CDATA[URL for the continuous integration system used by the project if it has a web interface.]]></description>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>Individual</name>
+      <description>
+        Description of a person who has contributed to the project.
+        This includes contributors and commitors.
+      </description>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>name</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The full name of the individual.]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>email</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The email address of the individual.]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>principal</name>
+          <version>1.0.0+</version>
+          <description>
+            The RedBack (plexus security) principal associated with this Invididual.
+          </description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>commitor</name>
+          <version>1.0.0+</version>
+          <description>
+            The flag if this user is a developer and/or commitor.
+          </description>
+          <type>boolean</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[The URL for the homepage of the individual.]]></description>
+          <type>String</type>
+        </field>
+        <!-- TODO: should this just be a single Organization element -->
+        <field>
+          <name>organization</name>
+          <alias>organisation</alias>
+          <version>1.0.0+</version>
+          <description><![CDATA[The organization to which the individual belongs.]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>organizationUrl</name>
+          <alias>organisationUrl</alias>
+          <version>1.0.0+</version>
+          <description><![CDATA[The URL of the organization.]]></description>
+          <type>String</type>
+        </field>
+        <field jpox.column="CONTRIBUTOR_ROLES">
+          <name>roles</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            The roles the individual plays in the project.  Each role is
+            described by a <code>role</code> element, the body of which is a
+            role name. This can also be used to describe the contribution.
+          ]]></description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>timezone</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            The timezone the individual is in. This is a number in the range -11 to 12.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>properties</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            Properties about the individual, such as an instant messenger handle.
+          ]]></description>
+          <type>Properties</type>
+          <association xml.mapStyle="inline">
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="DEPENDENCY">
+      <name>Dependency</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>contentKey</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <association>
+            <type>RepositoryContent</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The content key for this dependency.
+          </description>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            This url will be provided to the user if the jar file cannot be downloaded
+            from the central repository.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field jpox.column="DEPENDENCY_TYPE">
+          <name>type</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            The type of dependency. This defaults to <code>jar</code>. While it usually represents the extension on
+            the filename of the dependency, that is not always the case. A type can be mapped to a different
+            extension and a classifier.
+            The type often correspongs to the packaging used, though this is also not always the case.
+            Some examples are <code>jar</code>, <code>war</code>, <code>ejb-client</code> and <code>test-jar</code>.
+            New types can be defined by plugins that set
+            <code>extensions</code> to <code>true</code>, so this is not a complete list.
+          ]]></description>
+          <type>String</type>
+          <defaultValue>jar</defaultValue>
+        </field>
+        <field>
+          <name>classifier</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            The classifier of the dependency. This allows distinguishing two artifacts that belong to the same POM but
+            were built differently, and is appended to the filename after the version. For example,
+            <code>jdk14</code> and <code>jdk15</code>.
+          ]]></description>
+          <type>String</type>
+          <required>false</required>
+        </field>
+        <field jpox.column="DEPENDENCY_SCOPE">
+          <name>scope</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            The scope of the dependency - <code>compile</code>, <code>runtime</code>, <code>test</code>,
+            <code>system</code>, and <code>provided</code>. Used to
+            calculate the various classpaths used for compilation, testing, and so on. It also assists in determining
+            which artifacts to include in a distribution of this project. For more information, see
+            <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
+            dependency mechanism</a>.]]>
+          </description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>systemPath</name>
+          <version>1.0.0+</version>
+          <description><![CDATA[
+            FOR SYSTEM SCOPE ONLY. Note that use of this property is <b>discouraged</b> and may be replaced in later
+            versions. This specifies the path on the filesystem for this dependency.
+            Requires an absolute path for the value, not relative.
+            Use a property that gives the machine specific absolute path,
+            e.g. <code>${java.home}</code>.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>exclusions</name>
+          <version>1.0.0+</version>
+          <description>
+            Lists a set of artifacts that should be excluded from this dependency's artifact list when it comes to
+            calculating transitive dependencies.
+          </description>
+          <association>
+            <type>Exclusion</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>optional</name>
+          <version>1.0.0+</version>
+          <description>
+            Indicates the dependency is optional for use of this library. While the version of the dependency will be
+            taken into account for dependency calculation if the library is used elsewhere, it will not be passed on
+            transitively.
+          </description>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="EXCLUSIONS">
+      <name>Exclusion</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>groupId</name>
+          <version>4.0.0</version>
+          <description><![CDATA[The group ID of the project to exclude.]]></description>
+          <type>String</type>
+          <required>true</required>
+        </field>
+        <field>
+          <name>artifactId</name>
+          <version>4.0.0</version>
+          <description><![CDATA[The artifact ID of the project to exclude.]]></description>
+          <type>String</type>
+          <required>true</required>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="SCM">
+      <name>Scm</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field jpox.column="SCM_URL">
+          <name>connection</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+              The source control management system URL
+              that describes the repository and how to connect to the
+              repository. For more information, see the
+              <a href="http://maven.apache.org/scm/scm-url-format.html">URL format</a>
+              and <a href="http://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
+              This connection is read-only.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>developerConnection</name>
+          <version>1.0.0</version>
+          <description><![CDATA[
+            Just like <code>connection</code>, but for developers, i.e. this scm connection
+            will not be read only.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>1.0.0</version>
+          <description>
+            <![CDATA[The URL to the project's browsable SCM repository, such as ViewVC or Fisheye.]]></description>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="PROJECT_REPOSITORIES">
+      <name>ProjectRepository</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>id</name>
+          <version>4.0.0</version>
+          <description><![CDATA[
+            A unique identifier for a repository. This is used to match the repository to configuration in
+            the <code>settings.xml</code> file, for example.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>name</name>
+          <version>4.0.0</version>
+          <description><![CDATA[
+            Human readable name of the repository.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>url</name>
+          <version>4.0.0</version>
+          <description><![CDATA[
+             The url of the repository, in the form <code>protocol://hostname/path</code>.
+          ]]></description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>layout</name>
+          <version>4.0.0</version>
+          <description><![CDATA[
+            The type of layout this repository uses for locating and storing artifacts - can be <code>legacy</code> or
+            <code>default</code>.
+          ]]></description>
+          <type>String</type>
+          <defaultValue>default</defaultValue>
+        </field>
+        <field>
+          <name>plugins</name>
+          <version>1.0.0+</version>
+          <description>
+            Flag indicating if this repository is for plugin resolution.
+          </description>
+          <type>boolean</type>
+        </field>
+        <field>
+          <name>releases</name>
+          <version>1.0.0+</version>
+          <description>
+            Flag indicating if this repository has release versioned artifacts.
+          </description>
+          <type>boolean</type>
+        </field>
+        <field>
+          <name>snapshots</name>
+          <version>1.0.0+</version>
+          <description>
+            Flag indicating if this repository has snapshot versioned artifacts.
+          </description>
+          <type>boolean</type>
+        </field>
+      </fields>
+    </class>
+
+    <!-- _______________________________________________________________
+          _   _            _ _   _
+         | | | | ___  __ _| | |_| |__
+         | |_| |/ _ \/ _` | | __| '_ \
+         |  _  |  __/ (_| | | |_| | | |
+         |_| |_|\___|\__,_|_|\__|_| |_|
+      -->
+
+    <class stash.storable="true"
+           jpox.table="HEALTH_PROBLEMS">
+      <name>HealthProblem</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field jpox.column="PROBLEM_TYPE">
+          <name>type</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <type>String</type>
+          <description>
+            The type of health problem.
+          </description>
+        </field>
+        <field jpox.column="PROBLEM_ORIGIN">
+          <name>origin</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <type>String</type>
+          <description>
+            The origin of the health problem.
+          </description>
+        </field>
+        <field>
+          <name>message</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <type>String</type>
+          <description>
+            The origin of the health problem.
+          </description>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="HEALTH_ARTIFACTS">
+      <name>ArchivaArtifactHealth</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>artifact</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <association>
+            <type>ArchivaArtifactModel</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The Artifact to report on.
+          </description>
+        </field>
+        <field>
+          <name>problems</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>false</required>
+          <association>
+            <type>HealthProblem</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <description>
+            The list of problems associated with this artifact.
+          </description>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true"
+           jpox.table="HEALTH_REPOSITORY_METADATAS">
+      <name>ArchivaRepositoryMetadataHealth</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>repositoryMetadata</name>
+          <identity>true</identity>
+          <version>1.0.0+</version>
+          <required>true</required>
+          <association>
+            <type>ArchivaRepositoryMetadata</type>
+            <multiplicity>1</multiplicity>
+          </association>
+          <description>
+            The ArchivaRepositoryMetadata to report on.
+          </description>
+        </field>
+        <field>
+          <name>problems</name>
+          <identity>false</identity>
+          <version>1.0.0+</version>
+          <required>false</required>
+          <association>
+            <type>HealthProblem</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <description>
+            The list of problems associated with this repository metadata.
+          </description>
+        </field>
+      </fields>
+    </class>
+
+    <!-- _______________________________________________________________
+          ____  _        _   _     _   _
+         / ___|| |_ __ _| |_(_)___| |_(_) ___ ___
+         \___ \| __/ _` | __| / __| __| |/ __/ __|
+          ___) | || (_| | |_| \__ \ |_| | (__\__ \
+         |____/ \__\__,_|\__|_|___/\__|_|\___|___/
+      -->
+
+    <class stash.storable="true"
+           jpox.table="REPOSITORY_STATS">
+      <name>RepositoryContentStatistics</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>repositoryId</name>
+          <version>1.0.0+</version>
+          <identity>false</identity>
+          <required>true</required>
+          <type>String</type>
+          <description>
+            The repository id the statistics belong to.
+          </description>
+        </field>
+        <field>
+          <name>whenGathered</name>
+          <version>1.0.0+</version>
+          <identity>false</identity>
+          <required>true</required>
+          <type>Date</type>
+          <description>
+            The timestamp on when this set of statistics was gathered.
+          </description>
+        </field>
+        <field>
+          <name>duration</name>
+          <version>1.0.0+</version>
+          <identity>false</identity>
+          <required>true</required>
+          <type>long</type>
+          <description>
+            The duration (in milliseconds) for the gathering of the statistics.
+          </description>
+        </field>
+        <field>
+          <name>totalFileCount</name>
+          <version>1.0.0+</version>
+          <identity>false</identity>
+          <required>true</required>
+          <type>long</type>
+          <description>
+            The total number of files in the repository.
+          </description>
+        </field>
+        <field>
+          <name>newFileCount</name>
+          <version>1.0.0+</version>
+          <identity>false</identity>
+          <required>true</required>
+          <type>long</type>
+          <description>
+            The number of new files discovered.
+          </description>
+        </field>
+      </fields>
+      <codeSegments>
+        <codeSegment>
+          <version>1.0.0+</version>
+          <code>
+            private transient long startTimestamp;
+
+            public void triggerStart() {
+              startTimestamp = System.currentTimeMillis();
+            }
+
+            public void triggerFinished() {
+              long finished = System.currentTimeMillis();
+              setDuration( finished - startTimestamp );
+              setWhenGathered( new java.util.Date( finished ) );
+            }
+
+            public void increaseFileCount() {
+              this.totalFileCount++;
+            }
+
+            public void increaseNewFileCount() {
+              this.newFileCount++;
+            }
+          </code>
+        </codeSegment>
+      </codeSegments>
+    </class>
+  </classes>
+</model>
diff --git a/archiva-base/archiva-model/src/test/resources/log4j.xml b/archiva-base/archiva-model/src/test/resources/log4j.xml
new file mode 100644
index 000000000..395941ac3
--- /dev/null
+++ b/archiva-base/archiva-model/src/test/resources/log4j.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+  <appender name="console" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %-5p %-30c{1} - %m%n"/>
+    </layout>
+  </appender>
+
+  <!-- Help identify bugs during testing -->
+  <logger name="org.apache.maven">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus.security">
+    <level value="info"/>
+  </logger>
+
+  <!-- squelch noisy objects (for now) -->
+  <logger name="org.codehaus.plexus.mailsender.MailSender">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.quartz">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.apache.jasper">
+    <level value="info"/>
+  </logger>
+
+  <logger name="com.opensymphony.xwork">
+    <level value="info"/>
+  </logger>
+
+  <logger name="com.opensymphony.webwork">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus.PlexusContainer">
+    <level value="info"/>
+  </logger>
+
+  <logger name="JPOX">
+    <level value="warn"/>
+  </logger>
+
+  <logger name="JPOX.MetaData">
+    <level value="error"/>
+  </logger>
+
+  <logger name="JPOX.RDBMS.SQL">
+    <level value="error"/>
+  </logger>
+
+  <logger name="SQL">
+    <level value="error"/>
+  </logger>
+
+  <logger name="freemarker">
+    <level value="warn"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager">
+    <level value="error"/>
+  </logger>
+
+  <root>
+    <priority value ="info" />
+    <appender-ref ref="console" />
+  </root>
+
+</log4j:configuration>
diff --git a/archiva-repository-layer/pom.xml b/archiva-base/archiva-repository-layer/pom.xml
similarity index 100%
rename from archiva-repository-layer/pom.xml
rename to archiva-base/archiva-repository-layer/pom.xml
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
diff --git a/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java
similarity index 100%
rename from archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java
rename to archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java
diff --git a/archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml b/archiva-base/archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml
rename to archiva-base/archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
diff --git a/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java
similarity index 100%
rename from archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java
rename to archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/CVS/Root b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/CVS/Root
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/CVS/Root
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/CVS/Root
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/KEYS b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/KEYS
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/KEYS
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/KEYS
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
diff --git a/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/KEYS b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/KEYS
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/KEYS
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/KEYS
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip
diff --git a/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar b/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
diff --git a/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar b/archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar
rename to archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar
diff --git a/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom b/archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom
diff --git a/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml b/archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml
rename to archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml
diff --git a/archiva-repository-layer/src/test/repositories/simple-repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom b/archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom
similarity index 100%
rename from archiva-repository-layer/src/test/repositories/simple-repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom
rename to archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/snapshot-artifact/1.0-alpha-1-SNAPSHOT/snapshot-artifact-1.0-alpha-1-20050611.202024-1.pom
diff --git a/archiva-repository-layer/src/test/resources/log4j.xml b/archiva-base/archiva-repository-layer/src/test/resources/log4j.xml
similarity index 100%
rename from archiva-repository-layer/src/test/resources/log4j.xml
rename to archiva-base/archiva-repository-layer/src/test/resources/log4j.xml