From 840a5e94a2664384ba5fc4e2c3a1e7955d8ffabf Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 22 Mar 2007 21:10:28 +0000 Subject: [PATCH] More directory moves git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@521470 13f79535-47bb-0310-9956-ffa450edef68 --- .../{ => archiva-base}/archiva-common/pom.xml | 0 .../archiva/common/ArchivaException.java | 0 .../AbstractLayoutArtifactBuilder.java | 0 .../artifact/builder/BuilderException.java | 0 .../builder/DefaultLayoutArtifactBuilder.java | 0 .../builder/LayoutArtifactBuilder.java | 0 .../builder/LegacyLayoutArtifactBuilder.java | 0 .../artifact/managed/ManagedArtifact.java | 0 .../managed/ManagedArtifactTypes.java | 0 .../artifact/managed/ManagedEjbArtifact.java | 0 .../artifact/managed/ManagedJavaArtifact.java | 0 .../maven/archiva/common/utils/BaseFile.java | 0 .../maven/archiva/common/utils/DateUtil.java | 0 .../maven/archiva/common/utils/PathUtil.java | 0 .../common/AbstractArchivaCommonTestCase.java | 0 .../apache/maven/archiva/common/AllTests.java | 0 ...AbstractLayoutArtifactBuilderTestCase.java | 0 .../common/artifact/builder/AllTests.java | 0 .../DefaultLayoutArtifactBuilderTest.java | 0 .../LegacyLayoutArtifactBuilderTest.java | 0 .../maven/archiva/common/utils/AllTests.java | 0 .../archiva/common/utils/BaseFileTest.java | 0 .../archiva/common/utils/DateUtilTest.java | 0 .../archiva/common/utils/PathUtilTest.java | 0 .../src/test/legacy-repository/CVS/Root | 0 .../src/test/legacy-repository/KEYS | 0 .../invalid/foo/invalid-1.0.foo | 0 .../legacy-repository/invalid/invalid-1.0.jar | 0 .../invalid/jars/1.0/invalid-1.0.jar | 0 .../invalid/jars/invalid-1.0.rar | 0 .../invalid/jars/invalid.jar | 0 .../invalid/jars/no-extension | 0 .../javax.sql/jars/jdbc-2.0.jar | 0 .../jars/test-not-updated-1.0.jar | 0 .../jars/test-updated-1.0.jar | 0 .../jars/some-ejb-1.0-client.jar | 0 .../jars/testing-1.0-20050611.112233-1.jar | 0 .../jars/testing-1.0-sources.jar | 0 .../org.apache.maven/jars/testing-1.0.jar | 0 .../org.apache.maven/jars/testing-1.0.tar.gz | 0 .../org.apache.maven/jars/testing-1.0.zip | 0 .../org.apache.maven/jars/testing-UNKNOWN.jar | 0 .../src/test/repository/CVS/Root | 0 .../archiva-common/src/test/repository/KEYS | 0 .../test/repository/invalid/invalid-1.0.jar | 0 .../invalid-1.0-20050611.123456-1.jar | 0 .../invalid/1.0-SNAPSHOT/invalid-1.0.jar | 0 .../invalid/invalid/1.0/invalid-1.0b.jar | 0 .../invalid/invalid/1.0/invalid-2.0.jar | 0 .../repository/invalid/invalid/1/invalid-1 | 0 .../test/repository/javax/maven-metadata.xml | 0 .../javax/sql/jdbc/2.0/jdbc-2.0.jar | 0 .../jdbc/2.0/maven-metadata-repository.xml | 0 .../sql/jdbc/maven-metadata-repository.xml | 0 .../javax/sql/maven-metadata-repository.xml | 0 .../org/apache/maven/A/1.0/A-1.0.pom | 0 .../org/apache/maven/A/1.0/A-1.0.war | 0 .../org/apache/maven/B/1.0/B-1.0.pom | 0 .../org/apache/maven/B/2.0/B-2.0.pom | 0 .../org/apache/maven/C/1.0/C-1.0.pom | 0 .../org/apache/maven/C/1.0/C-1.0.war | 0 .../maven/discovery/1.0/discovery-1.0.pom | 0 .../org/apache/maven/maven-metadata.xml | 0 .../maven/samplejar/1.0/samplejar-1.0.jar | 0 .../maven/samplejar/1.0/samplejar-1.0.pom | 0 .../maven/samplejar/2.0/samplejar-2.0.jar | 0 .../maven/samplejar/2.0/samplejar-2.0.pom | 0 .../maven/some-ejb/1.0/maven-metadata.xml | 0 .../some-ejb/1.0/some-ejb-1.0-client.jar | 0 .../test-1.0-20050611.112233-1-javadoc.jar | 0 .../test-1.0-20050611.112233-1.jar | 0 ...wrong-artifactId-1.0-20050611.112233-1.jar | 0 .../maven/testing/1.0/testing-1.0-sources.jar | 0 .../testing/1.0/testing-1.0-test-sources.jar | 0 .../apache/maven/testing/1.0/testing-1.0.jar | 0 .../maven/testing/1.0/testing-1.0.tar.gz | 0 .../apache/maven/testing/1.0/testing-1.0.zip | 0 .../1.0/test-not-updated-1.0.jar | 0 .../1.0/test-not-updated-1.0.pom | 0 .../test-not-updated/maven-metadata.xml | 0 .../test-updated/1.0/test-updated-1.0.jar | 0 .../test-updated/1.0/test-updated-1.0.pom | 0 .../update/test-updated/maven-metadata.xml | 0 .../testgroup/discovery/1.0/discovery-1.0.pom | 0 .../discovery/1.0/maven-metadata.xml | 0 .../testgroup/discovery/maven-metadata.xml | 0 .../consumers/GenericArtifactConsumerTest.xml | 0 .../consumers/GenericModelConsumerTest.xml | 0 .../GenericRepositoryMetadataConsumerTest.xml | 0 .../archiva-configuration/pom.xml | 0 .../configuration/ArchivaConfiguration.java | 0 .../DefaultArchivaConfiguration.java | 0 .../InvalidConfigurationException.java | 0 .../MavenProxyPropertyLoader.java | 0 .../src/main/mdo/configuration.mdo | 0 ...ositoryConfiguration-conversion.properties | 0 .../archiva/configuration/default-archiva.xml | 0 .../src/test/conf/corrupt.xml | 0 .../src/test/conf/maven-proxy-complete.conf | 0 .../src/test/conf/repository-manager.xml | 0 .../src/test/conf/with-proxied-repos.xml | 0 .../ArchivaConfigurationTest.java | 0 .../MavenProxyPropertyLoaderTest.java | 0 .../ArchivaConfigurationTest.xml | 0 .../archiva-converter/pom.xml | 0 .../archiva/converter/ConversionEvent.java | 0 .../archiva/converter/ConversionListener.java | 0 .../converter/DefaultRepositoryConverter.java | 0 .../RepositoryConversionException.java | 0 .../converter/RepositoryConverter.java | 0 .../DefaultLegacyRepositoryConverter.java | 0 .../LegacyConverterArtifactConsumer.java | 0 .../legacy/LegacyRepositoryConverter.java | 0 .../transaction/AbstractTransactionEvent.java | 0 .../converter/transaction/CopyFileEvent.java | 0 .../transaction/CreateFileEvent.java | 0 .../transaction/FileTransaction.java | 0 .../transaction/TransactionEvent.java | 0 .../DefaultRepositoryConverter.properties | 0 .../expected-files/converted-artifact-one.pom | 0 .../converted-artifact-three.pom | 0 .../expected-files/converted-artifact-two.pom | 0 .../expected-files/converted-v3-snapshot.pom | 0 .../converted-v3-timestamped-snapshot.pom | 0 .../expected-files/converted-v3-warnings.pom | 0 .../src/test/expected-files/converted-v3.pom | 0 .../expected-files/maven-foo-plugin-1.0.pom | 0 .../newversion-artifact-metadata.xml | 0 .../1.0.0/maven-metadata.xml | 0 .../1.0.0/relocated-v3artifact-1.0.0.jar | 0 .../1.0.0/relocated-v3artifact-1.0.0.pom | 0 .../relocated-v3artifact/maven-metadata.xml | 0 .../1.0.0/relocated-v3artifact-1.0.0.pom | 0 .../expected-files/v3-artifact-metadata.xml | 0 .../v3-snapshot-artifact-metadata.xml | 0 .../expected-files/v3-snapshot-metadata.xml | 0 .../v3-timestamped-snapshot-metadata.xml | 0 .../expected-files/v3-version-metadata.xml | 0 .../expected-files/v4-artifact-metadata.xml | 0 .../v4-snapshot-artifact-metadata.xml | 0 .../expected-files/v4-snapshot-metadata.xml | 0 .../v4-timestamped-snapshot-metadata.xml | 0 .../expected-files/v4-version-metadata.xml | 0 .../maven/archiva/converter/AllTests.java | 0 .../converter/MockConversionListener.java | 0 .../converter/RepositoryConverterTest.java | 0 .../transaction/AbstractFileEventTest.java | 0 .../converter/transaction/AllTests.java | 0 .../transaction/CopyFileEventTest.java | 0 .../transaction/CreateFileEventTest.java | 0 .../src/test/resources/log4j.properties | 0 .../converter/RepositoryConverterTest.xml | 0 .../1.0.0/incorrectArtifactMetadata-1.0.0.jar | 0 .../1.0.0/incorrectArtifactMetadata-1.0.0.pom | 0 .../maven-metadata.xml | 0 ...apshotMetadata-1.0.0-20060102.030405-6.jar | 0 ...apshotMetadata-1.0.0-20060102.030405-6.pom | 0 .../1.0.0-SNAPSHOT/maven-metadata.xml | 0 .../maven-metadata.xml | 0 .../test/jars/artifact-one-1.0.0.jar | 0 .../test/jars/artifact-three-1.0.0.jar | 0 .../test/jars/artifact-two-1.0.0.jar | 0 .../test/jars/dryrun-artifact-1.0.0.jar | 0 .../test/jars/existing-artifact-1.0.0.jar | 0 .../test/jars/incorrectMd5Artifact-1.0.0.jar | 0 .../jars/incorrectMd5Artifact-1.0.0.jar.md5 | 0 .../test/jars/incorrectSha1Artifact-1.0.0.jar | 0 .../jars/incorrectSha1Artifact-1.0.0.jar.sha1 | 0 .../test/jars/modified-artifact-1.0.0.jar | 0 .../test/jars/newversion-artifact-1.0.1.jar | 0 .../test/jars/noPomArtifact-1.0.0.jar | 0 .../test/jars/relocated-v3artifact-1.0.0.jar | 0 .../jars/rollback-created-artifact-1.0.0.jar | 0 .../test/jars/unmodified-artifact-1.0.0.jar | 0 .../test/jars/v3-warnings-artifact-1.0.0.jar | 0 .../v3artifact-1.0.0-20060105.130101-3.jar | 0 .../test/jars/v3artifact-1.0.0-SNAPSHOT.jar | 0 .../test/jars/v3artifact-1.0.0.jar | 0 .../v4artifact-1.0.0-20060111.120115-1.jar | 0 .../test/jars/v4artifact-1.0.0-SNAPSHOT.jar | 0 .../test/jars/v4artifact-1.0.0.jar | 0 .../test/jars/v4artifact-1.0.0.jar.md5 | 0 .../test/jars/v4artifact-1.0.0.jar.sha1 | 0 .../test/plugins/maven-foo-plugin-1.0.jar | 0 .../test/poms/artifact-one-1.0.0.pom | 0 .../test/poms/artifact-three-1.0.0.pom | 0 .../test/poms/artifact-two-1.0.0.pom | 0 .../test/poms/dryrun-artifact-1.0.0.pom | 0 .../test/poms/incorrectMd5Artifact-1.0.0.pom | 0 .../test/poms/incorrectSha1Artifact-1.0.0.pom | 0 .../test/poms/maven-foo-plugin-1.0.pom | 0 .../test/poms/modified-artifact-1.0.0.pom | 0 .../test/poms/newversion-artifact-1.0.1.pom | 0 .../test/poms/relocated-v3artifact-1.0.0.pom | 0 .../poms/rollback-created-artifact-1.0.0.pom | 0 .../test/poms/unmodified-artifact-1.0.0.pom | 0 .../test/poms/v3-warnings-artifact-1.0.0.pom | 0 .../v3artifact-1.0.0-20060105.130101-3.pom | 0 .../test/poms/v3artifact-1.0.0-SNAPSHOT.pom | 0 .../test/poms/v3artifact-1.0.0.pom | 0 .../v4artifact-1.0.0-20060111.120115-1.pom | 0 .../test/poms/v4artifact-1.0.0-SNAPSHOT.pom | 0 .../test/poms/v4artifact-1.0.0.pom | 0 .../1.0.0/modified-artifact-1.0.0.jar | 0 .../1.0.0/modified-artifact-1.0.0.pom | 0 .../1.0.0/newversion-artifact-1.0.0.jar | 0 .../1.0.0/newversion-artifact-1.0.0.pom | 0 .../newversion-artifact/maven-metadata.xml | 0 .../1.0.0/unmodified-artifact-1.0.0.jar | 0 .../1.0.0/unmodified-artifact-1.0.0.pom | 0 .../archiva-base/archiva-model/pom.xml | 157 ++ .../archiva/model/RepositoryContentKey.java | 170 +++ .../src/main/mdo/archiva-base.xml | 1277 +++++++++++++++++ .../src/test/resources/log4j.xml | 76 + .../archiva-repository-layer/pom.xml | 0 .../layer/CachedRepositoryQueryLayer.java | 0 .../layer/DefaultRepositoryQueryLayer.java | 0 .../DefaultRepositoryQueryLayerFactory.java | 0 .../archiva/layer/RepositoryQueryLayer.java | 0 .../layer/RepositoryQueryLayerException.java | 0 .../layer/RepositoryQueryLayerFactory.java | 0 .../archiva/repository/ArchivaArtifact.java | 0 .../archiva/repository/ArchivaRepository.java | 0 .../repository/RepositoryException.java | 0 .../archiva/repository/RepositoryURL.java | 0 .../connector/RepositoryConnector.java | 0 .../archiva/repository/consumer/Consumer.java | 0 .../consumer/ConsumerException.java | 0 .../repository/consumer/ConsumerFactory.java | 0 .../AbstractArtifactExtensionMapping.java | 0 .../content/ArtifactExtensionMapping.java | 0 .../DefaultArtifactExtensionMapping.java | 0 .../LegacyArtifactExtensionMapping.java | 0 .../layout/BidirectionalRepositoryLayout.java | 0 .../DefaultBidirectionalRepositoryLayout.java | 0 .../repository/layout/LayoutException.java | 0 .../LegacyBidirectionalRepositoryLayout.java | 0 .../layout/RepositoryLayoutUtils.java | 0 .../repository/scanner/RepositoryScanner.java | 0 .../scanner/RepositoryScannerInstance.java | 0 .../repository/version/VersionUtil.java | 0 .../resources/META-INF/plexus/components.xml | 0 .../org/apache/maven/archiva/AllTests.java | 0 .../AbstractRepositoryQueryLayerTestCase.java | 0 .../apache/maven/archiva/layer/AllTests.java | 0 .../layer/CachedRepositoryQueryLayerTest.java | 0 .../DefaultRepositoryQueryLayerTest.java | 0 .../maven/archiva/repository/AllTests.java | 0 .../archiva/repository/RepositoryURLTest.java | 0 ...BidirectionalRepositoryLayoutTestCase.java | 0 ...aultBidirectionalRepositoryLayoutTest.java | 0 ...gacyBidirectionalRepositoryLayoutTest.java | 0 .../layout/RepositoryLayoutUtilsTest.java | 0 .../scanner/CentralScannerTiming.java | 0 .../scanner/RepositoryScannerTest.java | 0 .../repository/scanner/ScanConsumer.java | 0 .../repositories/default-repository/CVS/Root | 0 .../test/repositories/default-repository/KEYS | 0 .../invalid/invalid-1.0.jar | 0 .../invalid-1.0-20050611.123456-1.jar | 0 .../invalid/1.0-SNAPSHOT/invalid-1.0.jar | 0 .../invalid/invalid/1.0/invalid-1.0b.jar | 0 .../invalid/invalid/1.0/invalid-2.0.jar | 0 .../invalid/invalid/1/invalid-1 | 0 .../javax/maven-metadata.xml | 0 .../javax/sql/jdbc/2.0/jdbc-2.0.jar | 0 .../jdbc/2.0/maven-metadata-repository.xml | 0 .../sql/jdbc/maven-metadata-repository.xml | 0 .../javax/sql/maven-metadata-repository.xml | 0 .../org/apache/maven/A/1.0/A-1.0.pom | 0 .../org/apache/maven/A/1.0/A-1.0.war | 0 .../org/apache/maven/B/1.0/B-1.0.pom | 0 .../org/apache/maven/B/2.0/B-2.0.pom | 0 .../org/apache/maven/C/1.0/C-1.0.pom | 0 .../org/apache/maven/C/1.0/C-1.0.war | 0 .../maven/discovery/1.0/discovery-1.0.pom | 0 .../org/apache/maven/maven-metadata.xml | 0 .../maven/samplejar/1.0/samplejar-1.0.jar | 0 .../maven/samplejar/1.0/samplejar-1.0.pom | 0 .../maven/samplejar/2.0/samplejar-2.0.jar | 0 .../maven/samplejar/2.0/samplejar-2.0.pom | 0 .../maven/some-ejb/1.0/maven-metadata.xml | 0 .../some-ejb/1.0/some-ejb-1.0-client.jar | 0 .../test-1.0-20050611.112233-1-javadoc.jar | 0 .../test-1.0-20050611.112233-1.jar | 0 ...wrong-artifactId-1.0-20050611.112233-1.jar | 0 .../maven/testing/1.0/testing-1.0-sources.jar | 0 .../testing/1.0/testing-1.0-test-sources.jar | 0 .../apache/maven/testing/1.0/testing-1.0.jar | 0 .../maven/testing/1.0/testing-1.0.tar.gz | 0 .../apache/maven/testing/1.0/testing-1.0.zip | 0 .../1.0/test-not-updated-1.0.jar | 0 .../1.0/test-not-updated-1.0.pom | 0 .../test-not-updated/maven-metadata.xml | 0 .../test-updated/1.0/test-updated-1.0.jar | 0 .../test-updated/1.0/test-updated-1.0.pom | 0 .../update/test-updated/maven-metadata.xml | 0 .../testgroup/discovery/1.0/discovery-1.0.pom | 0 .../discovery/1.0/maven-metadata.xml | 0 .../testgroup/discovery/maven-metadata.xml | 0 .../repositories/legacy-repository/CVS/Root | 0 .../test/repositories/legacy-repository/KEYS | 0 .../invalid/foo/invalid-1.0.foo | 0 .../legacy-repository/invalid/invalid-1.0.jar | 0 .../invalid/jars/1.0/invalid-1.0.jar | 0 .../invalid/jars/invalid-1.0.rar | 0 .../invalid/jars/invalid.jar | 0 .../invalid/jars/no-extension | 0 .../javax.sql/jars/jdbc-2.0.jar | 0 .../jars/test-not-updated-1.0.jar | 0 .../jars/test-updated-1.0.jar | 0 .../jars/some-ejb-1.0-client.jar | 0 .../jars/testing-1.0-20050611.112233-1.jar | 0 .../jars/testing-1.0-sources.jar | 0 .../org.apache.maven/jars/testing-1.0.jar | 0 .../org.apache.maven/jars/testing-1.0.tar.gz | 0 .../org.apache.maven/jars/testing-1.0.zip | 0 .../org.apache.maven/jars/testing-UNKNOWN.jar | 0 .../1.0-alpha-1/artifactId-1.0-alpha-1.jar | Bin .../1.0-alpha-1/artifactId-1.0-alpha-1.pom | 0 .../groupId/artifactId/maven-metadata.xml | 0 ...artifact-1.0-alpha-1-20050611.202024-1.pom | 0 .../src/test/resources/log4j.xml | 0 323 files changed, 1680 insertions(+) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/pom.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/CVS/Root (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/KEYS (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/invalid/jars/no-extension (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/CVS/Root (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/KEYS (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/invalid/invalid-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/invalid/invalid/1/invalid-1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/javax/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/pom.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/main/mdo/configuration.mdo (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/test/conf/corrupt.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/test/conf/maven-proxy-complete.conf (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/test/conf/repository-manager.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/test/conf/with-proxied-repos.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/pom.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/converted-artifact-one.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/converted-artifact-three.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/converted-artifact-two.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/converted-v3-warnings.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/converted-v3.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v3-version-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/expected-files/v4-version-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/resources/log4j.properties (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom (100%) create mode 100755 archiva-jpox-database-refactor/archiva-base/archiva-model/pom.xml create mode 100644 archiva-jpox-database-refactor/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java create mode 100644 archiva-jpox-database-refactor/archiva-base/archiva-model/src/main/mdo/archiva-base.xml create mode 100644 archiva-jpox-database-refactor/archiva-base/archiva-model/src/test/resources/log4j.xml rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/pom.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/CVS/Root (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/KEYS (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar (100%) rename archiva-jpox-database-refactor/{ => 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 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar (100%) rename archiva-jpox-database-refactor/{ => 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 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip (100%) rename archiva-jpox-database-refactor/{ => 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 (100%) rename archiva-jpox-database-refactor/{ => 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 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/KEYS (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => 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 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-repository-layer/src/test/resources/log4j.xml (100%) diff --git a/archiva-jpox-database-refactor/archiva-common/pom.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/pom.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/pom.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/pom.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/ArchivaException.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilder.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/BuilderException.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilder.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LayoutArtifactBuilder.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilder.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifact.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedArtifactTypes.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedEjbArtifact.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/artifact/managed/ManagedJavaArtifact.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/BaseFile.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/DateUtil.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/PathUtil.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/AbstractArchivaCommonTestCase.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/AllTests.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AbstractLayoutArtifactBuilderTestCase.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/AllTests.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/DefaultLayoutArtifactBuilderTest.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/artifact/builder/LegacyLayoutArtifactBuilderTest.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/AllTests.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/CVS/Root b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/CVS/Root similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/CVS/Root rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/CVS/Root diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/KEYS b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/KEYS similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/KEYS rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/KEYS diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/jars/no-extension b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/no-extension similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/invalid/jars/no-extension rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/no-extension diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/CVS/Root b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/CVS/Root similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/CVS/Root rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/CVS/Root diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/KEYS b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/KEYS similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/KEYS rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/KEYS diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1/invalid-1 b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid/1/invalid-1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/invalid/invalid/1/invalid-1 rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/invalid/invalid/1/invalid-1 diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml diff --git a/archiva-jpox-database-refactor/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml b/archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml diff --git a/archiva-jpox-database-refactor/archiva-configuration/pom.xml b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/pom.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/pom.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/pom.xml diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/main/mdo/configuration.mdo rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/SyncedRepositoryConfiguration-conversion.properties diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/test/conf/corrupt.xml b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/conf/corrupt.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/test/conf/corrupt.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/conf/corrupt.xml diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/test/conf/maven-proxy-complete.conf b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/conf/maven-proxy-complete.conf similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/test/conf/maven-proxy-complete.conf rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/conf/maven-proxy-complete.conf diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/test/conf/repository-manager.xml b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/test/conf/repository-manager.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/test/conf/with-proxied-repos.xml b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/conf/with-proxied-repos.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/test/conf/with-proxied-repos.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/conf/with-proxied-repos.xml diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java diff --git a/archiva-jpox-database-refactor/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml b/archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/pom.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/pom.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/pom.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/pom.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionEvent.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/ConversionListener.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConversionException.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/RepositoryConverter.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyRepositoryConverter.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/FileTransaction.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/TransactionEvent.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/main/resources/org/apache/maven/archiva/converter/DefaultRepositoryConverter.properties diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-artifact-one.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-one.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-artifact-one.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-one.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-artifact-three.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-three.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-artifact-three.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-three.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-artifact-two.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-two.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-artifact-two.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-artifact-two.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-v3-snapshot.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-v3-warnings.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-v3-warnings.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-v3-warnings.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-v3-warnings.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-v3.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-v3.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/converted-v3.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/converted-v3.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/maven-foo-plugin-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/newversion-artifact-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-artifact-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-snapshot-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-version-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-version-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v3-version-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v3-version-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-artifact-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-snapshot-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-version-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-version-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/expected-files/v4-version-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/expected-files/v4-version-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/AllTests.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/MockConversionListener.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AbstractFileEventTest.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/AllTests.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/resources/log4j.properties b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/resources/log4j.properties similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/resources/log4j.properties rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/resources/log4j.properties diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar diff --git a/archiva-jpox-database-refactor/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom diff --git a/archiva-jpox-database-refactor/archiva-base/archiva-model/pom.xml b/archiva-jpox-database-refactor/archiva-base/archiva-model/pom.xml new file mode 100755 index 000000000..3fcb6843f --- /dev/null +++ b/archiva-jpox-database-refactor/archiva-base/archiva-model/pom.xml @@ -0,0 +1,157 @@ + + + + + + org.apache.maven.archiva + archiva + 1.0-SNAPSHOT + + 4.0.0 + archiva-model + Archiva Model + + + org.apache.maven.archiva + archiva-common + + + org.codehaus.plexus + plexus-utils + + + javax.jdo + jdo2-api + 2.0 + + + org.codehaus.plexus + plexus-container-default + + + commons-lang + commons-lang + + + commons-io + commons-io + + + + + + org.codehaus.plexus + plexus-maven-plugin + + + org.codehaus.modello + modello-maven-plugin + 1.0-alpha-15-SNAPSHOT + + 1.0.0 + false + src/main/mdo/archiva-base.xml + + + + archiva-base + + java + xsd + jpox-jdo-mapping + jpox-metadata-class + xpp3-writer + xpp3-reader + + + + + + org.codehaus.mojo + jpox-maven-plugin + 1.1.6 + + + org.apache.derby + derby + 10.2.1.6 + + + + + create-ddl + generate-test-resources + + schema-create + + + ${basedir}/target/classes/org/apache/maven/archiva/model/schema.ddl + + + javax.jdo.option.ConnectionDriverName + org.apache.derby.jdbc.EmbeddedDriver + + + javax.jdo.option.ConnectionURL + jdbc:derby:target/jdo-schema-create;create=true + + + javax.jdo.option.ConnectionUserName + sa + + + javax.jdo.option.ConnectionPassword + + + + log4j.configuration + ${basedir}/src/test/resources/log4j.xml + + + org.jpox.autoCreateTables + true + + + + + + enhance + + enhance + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + + org/apache/maven/archiva/reporting/model/** + + + + + + + diff --git a/archiva-jpox-database-refactor/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java b/archiva-jpox-database-refactor/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-jpox-database-refactor/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 Joakim Erdfelt + * @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-jpox-database-refactor/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/archiva-jpox-database-refactor/archiva-base/archiva-model/src/main/mdo/archiva-base.xml new file mode 100644 index 000000000..a6cc0fc40 --- /dev/null +++ b/archiva-jpox-database-refactor/archiva-base/archiva-model/src/main/mdo/archiva-base.xml @@ -0,0 +1,1277 @@ + + + archiva-base-model + ArchivaBaseModel + 1.0.0 + Archiva Model + + + package + org.apache.maven.archiva.model + + + + + + ArchivaAll + 1.0.0+ + + This object is only used for the XML backup / restore features of Archiva. + This object is not serialized to the Database. + + + + repositories + 1.0.0+ + + ArchivaRepositoryModel + * + + + + artifacts + 1.0.0+ + + ArchivaArtifactModel + * + + + + repositoryMetadata + 1.0.0+ + + ArchivaRepositoryMetadata + * + + + + projects + 1.0.0+ + + ArchivaProjectModel + * + + + + artifactHealth + 1.0.0+ + + ArchivaArtifactHealth + * + + + + repositoryMetadataHealth + 1.0.0+ + + ArchivaRepositoryMetadataHealth + * + + + + repositoryContentStatistics + 1.0.0+ + + RepositoryContentStatistics + * + + + + + + + + + ArchivaRepositoryModel + 1.0.0+ + + + id + true + 1.0.0+ + String + true + + The unique ID for the repository. + + + + name + false + 1.0.0+ + String + true + + The Name of the repository. + + + + url + false + 1.0.0+ + String + true + + The URL of the repository. + + + + creationSource + false + 1.0.0+ + String + true + + The Source of this repository. + (Example: Configuration, POM) + + + + layoutName + false + 1.0.0+ + String + true + + The layout of the repository. + (Either 'default', or 'legacy') + + default + + + releasePolicy + false + 1.0.0+ + boolean + true + + The releases policy of the repository. + + true + + + snapshotPolicy + false + 1.0.0+ + boolean + true + + The snapshot policy of the repository. + + false + + + + + RepositoryContent + 1.0.0+ + + Repository Content Identifier. + + + + groupId + true + 1.0.0+ + String + true + + The Group ID of the repository content. + + + + artifactId + true + 1.0.0+ + String + true + + The Artifact ID of the repository content. + + + + version + true + 1.0.0+ + String + false + + The version of the repository content. + + + + repositoryId + true + 1.0.0+ + true + String + + The repository associated with this content. + + + + + + 1.0.0+ + + + + + + + + + + ArchivaArtifactModel + 1.0.0+ + + + contentKey + true + 1.0.0+ + true + + RepositoryContent + 1 + + + The content key for this artifact. + + + + classifier + false + 1.0.0+ + String + false + + The classifier for this artifact. + + + + type + true + 1.0.0+ + String + true + + The type of artifact. + + + + checksumMD5 + false + 1.0.0+ + String + false + + The MD5 checksum for the artifact file. + + + + checksumSHA1 + false + 1.0.0+ + String + false + + The SHA1 checksum for the artifact file. + + + + checksumBytecode + false + 1.0.0+ + String + false + + The SHA1 checksum for the bytecode in the artifact file. (Can be empty if + the artifact contains no bytecode) + + + + whenIndexed + false + 1.0.0+ + Date + false + + The timestamp when this artifact was indexed. + + + + origin + false + 1.0.0+ + String + false + + The origin of this artifact. (Filesystem, Proxy, Deploy) + + + + + + ArchivaRepositoryMetadata + 1.0.0+ + + + contentKey + true + 1.0.0+ + true + + RepositoryContent + 1 + + + The content key for this repository metadata. + + + + releasedVersion + false + 1.0.0+ + false + String + + The released version id. + + + + availableVersions + false + 1.0.0+ + false + + String + * + + + The list of available version ids. + + + + whenIndexed + false + 1.0.0+ + Date + false + + The timestamp when this artifact was indexed. + + + + lastUpdated + false + 1.0.0+ + Date + false + + the timestamp when this artifact was indexed. + + + + origin + false + 1.0.0+ + String + false + + The origin of this artifact. (Filesystem, Proxy, Deploy) + + + + + + + + + ArchivaProjectModel + 1.0.0+ + + + contentKey + true + 1.0.0+ + true + + RepositoryContent + 1 + + + The content key for this artifact. + + + + parentContentKey + false + 1.0.0+ + false + + RepositoryContent + 1 + + + The content key for a parent reference. + + + + packaging + false + 1.0.0+ + true + String + + The declared packaging for this project model. + + + + origin + false + 1.0.0+ + true + String + + The Origin of this Model. (Filesystem, Proxy, or Deploy) + + + + whenIndexed + false + 1.0.0+ + true + Date + + The timestamp when this model was indexed. + + + + url + false + 1.0.0+ + false + String + + The URL for the project's homepage. + + + + organization + false + 1.0.0+ + false + + Organization + + + + licenses + false + 1.0.0+ + false + + License + * + + + + issueManagement + 1.0.0+ + + + IssueManagement + + + + ciManagement + 1.0.0+ + + + CiManagement + + + + scm + 1.0.0+ + + + + Scm + + + + individuals + 1.0.0+ + + The list of individuals around this project. + + + Individual + * + + + + dependencies + 1.0.0+ + + + Dependency + * + + + + repositories + 1.0.0+ + + The list project repositories in use by this project. + + + ProjectRepository + * + + + + plugins + 1.0.0+ + + The list of plugins that this project uses. + + + RepositoryContent + * + + + + reports + 1.0.0+ + + The list of reports that this project uses. + + + RepositoryContent + * + + + + + + Organization + Specifies the organization that produces this project. + 1.0.0+ + + + name + 1.0.0+ + + String + + + url + 1.0.0+ + + String + + + favicon + 1.0.0+ + /images/org-logo.png) or an absolute URL + (e.g., http://my.corp/logo.png). This value is used + when generating the project documentation. + ]]> + String + + + + + License + + 1.0.0+ + + + id + 1.0.0+ + int + + The type of license. + + + + name + 1.0.0+ + + String + + + url + 1.0.0+ + + String + + + comments + + Addendum information pertaining to this license. + + 1.0.0+ + String + + + + + IssueManagement + + Information about the issue tracking (or bug tracking) system used to manage this project. + + 1.0.0+ + + + system + 1.0.0+ + + String + + + url + 1.0.0+ + + String + + + + + CiManagement + 1.0.0+ + + + system + 1.0.0+ + + continuum.]]> + String + + + url + 1.0.0+ + + + String + + + + + Individual + + Description of a person who has contributed to the project. + This includes contributors and commitors. + + 1.0.0+ + + + name + 1.0.0+ + + String + + + email + 1.0.0+ + + String + + + principal + 1.0.0+ + + The RedBack (plexus security) principal associated with this Invididual. + + String + + + commitor + 1.0.0+ + + The flag if this user is a developer and/or commitor. + + boolean + + + url + 1.0.0+ + + String + + + + organization + organisation + 1.0.0+ + + String + + + organizationUrl + organisationUrl + 1.0.0+ + + String + + + roles + 1.0.0+ + role element, the body of which is a + role name. This can also be used to describe the contribution. + ]]> + + String + * + + + + timezone + 1.0.0+ + + String + + + properties + 1.0.0+ + + Properties + + String + * + + + + + + Dependency + 1.0.0+ + + + contentKey + true + 1.0.0+ + true + + RepositoryContent + 1 + + + The content key for this dependency. + + + + url + 1.0.0+ + + String + + + type + 1.0.0+ + jar. 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 jar, war, ejb-client and test-jar. + New types can be defined by plugins that set + extensions to true, so this is not a complete list. + ]]> + String + jar + + + classifier + 1.0.0+ + jdk14 and jdk15. + ]]> + String + false + + + scope + 1.0.0+ + compile, runtime, test, + system, and provided. 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 + the + dependency mechanism.]]> + + String + + + systemPath + 1.0.0+ + discouraged 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. ${java.home}. + ]]> + String + + + exclusions + 1.0.0+ + + Lists a set of artifacts that should be excluded from this dependency's artifact list when it comes to + calculating transitive dependencies. + + + Exclusion + * + + + + optional + 1.0.0+ + + 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. + + boolean + false + + + + + Exclusion + 1.0.0+ + + + groupId + 4.0.0 + + String + true + + + artifactId + 4.0.0 + + String + true + + + + + Scm + 1.0.0+ + + + connection + 1.0.0 + URL format + and list of supported SCMs. + This connection is read-only. + ]]> + String + + + developerConnection + 1.0.0 + connection, but for developers, i.e. this scm connection + will not be read only. + ]]> + String + + + url + 1.0.0 + + + String + + + + + ProjectRepository + 1.0.0+ + + + id + 4.0.0 + settings.xml file, for example. + ]]> + String + + + name + 4.0.0 + + String + + + url + 4.0.0 + protocol://hostname/path. + ]]> + String + + + layout + 4.0.0 + legacy or + default. + ]]> + String + default + + + plugins + 1.0.0+ + + Flag indicating if this repository is for plugin resolution. + + boolean + + + releases + 1.0.0+ + + Flag indicating if this repository has release versioned artifacts. + + boolean + + + snapshots + 1.0.0+ + + Flag indicating if this repository has snapshot versioned artifacts. + + boolean + + + + + + + + HealthProblem + 1.0.0+ + + + type + false + 1.0.0+ + true + String + + The type of health problem. + + + + origin + false + 1.0.0+ + true + String + + The origin of the health problem. + + + + message + false + 1.0.0+ + true + String + + The origin of the health problem. + + + + + + ArchivaArtifactHealth + 1.0.0+ + + + artifact + true + 1.0.0+ + true + + ArchivaArtifactModel + 1 + + + The Artifact to report on. + + + + problems + false + 1.0.0+ + false + + HealthProblem + * + + + The list of problems associated with this artifact. + + + + + + ArchivaRepositoryMetadataHealth + 1.0.0+ + + + repositoryMetadata + true + 1.0.0+ + true + + ArchivaRepositoryMetadata + 1 + + + The ArchivaRepositoryMetadata to report on. + + + + problems + false + 1.0.0+ + false + + HealthProblem + * + + + The list of problems associated with this repository metadata. + + + + + + + + + RepositoryContentStatistics + 1.0.0+ + + + repositoryId + 1.0.0+ + false + true + String + + The repository id the statistics belong to. + + + + whenGathered + 1.0.0+ + false + true + Date + + The timestamp on when this set of statistics was gathered. + + + + duration + 1.0.0+ + false + true + long + + The duration (in milliseconds) for the gathering of the statistics. + + + + totalFileCount + 1.0.0+ + false + true + long + + The total number of files in the repository. + + + + newFileCount + 1.0.0+ + false + true + long + + The number of new files discovered. + + + + + + 1.0.0+ + + 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++; + } + + + + + + diff --git a/archiva-jpox-database-refactor/archiva-base/archiva-model/src/test/resources/log4j.xml b/archiva-jpox-database-refactor/archiva-base/archiva-model/src/test/resources/log4j.xml new file mode 100644 index 000000000..395941ac3 --- /dev/null +++ b/archiva-jpox-database-refactor/archiva-base/archiva-model/src/test/resources/log4j.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/pom.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/pom.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/pom.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/pom.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayer.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayer.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerFactory.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayer.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerException.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/layer/RepositoryQueryLayerFactory.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaArtifact.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaRepository.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryException.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryURL.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/connector/RepositoryConnector.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/Consumer.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerException.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/consumer/ConsumerFactory.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractArtifactExtensionMapping.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactExtensionMapping.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/DefaultArtifactExtensionMapping.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/LegacyArtifactExtensionMapping.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LayoutException.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/version/VersionUtil.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/main/resources/META-INF/plexus/components.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/AllTests.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AbstractRepositoryQueryLayerTestCase.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/AllTests.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/CachedRepositoryQueryLayerTest.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/layer/DefaultRepositoryQueryLayerTest.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AllTests.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/RepositoryURLTest.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayoutTest.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayoutTest.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtilsTest.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/CentralScannerTiming.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/ScanConsumer.java diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/CVS/Root b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/CVS/Root similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/CVS/Root rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/CVS/Root diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/KEYS b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/KEYS similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/KEYS rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/KEYS diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-1.0b.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1.0/invalid-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/invalid/invalid/1/invalid-1 diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/jdbc-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.war diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.war diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/discovery/1.0/discovery-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/testing/1.0/testing-1.0.zip diff --git a/archiva-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-not-updated/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/update/test-updated/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/CVS/Root diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/KEYS b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/KEYS similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/KEYS rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/KEYS diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/foo/invalid-1.0.foo diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/invalid-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/1.0/invalid-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid-1.0.rar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/invalid.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/invalid/jars/no-extension diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/javax.sql/jars/jdbc-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-1.0.zip diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar diff --git a/archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.jar rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom b/archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/1.0-alpha-1/artifactId-1.0-alpha-1.pom rename to archiva-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/groupId/artifactId/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/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-jpox-database-refactor/archiva-repository-layer/src/test/resources/log4j.xml b/archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/resources/log4j.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-repository-layer/src/test/resources/log4j.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-repository-layer/src/test/resources/log4j.xml -- 2.39.5