From 1f8c1c2816105dbaf8ce75a9679ae290cb7bf57e Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 22 Mar 2007 21:12:12 +0000 Subject: [PATCH] More directory moves git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@521472 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-indexer/pom.xml | 0 .../indexer/RepositoryArtifactIndex.java | 0 .../RepositoryArtifactIndexFactory.java | 0 .../indexer/RepositoryIndexException.java | 0 .../RepositoryIndexSearchException.java | 0 .../lucene/LuceneIndexRecordConverter.java | 0 .../LuceneMinimalIndexRecordConverter.java | 0 .../archiva/indexer/lucene/LuceneQuery.java | 0 .../lucene/LuceneRepositoryArtifactIndex.java | 0 .../LuceneRepositoryArtifactIndexFactory.java | 0 .../LuceneStandardIndexRecordConverter.java | 0 .../archiva/indexer/query/CompoundQuery.java | 0 .../indexer/query/CompoundQueryTerm.java | 0 .../maven/archiva/indexer/query/Query.java | 0 .../archiva/indexer/query/QueryTerm.java | 0 .../archiva/indexer/query/RangeQuery.java | 0 .../indexer/query/SingleTermQuery.java | 0 .../AbstractArtifactIndexRecordFactory.java | 0 .../IndexRecordExistsArtifactFilter.java | 0 .../record/MinimalArtifactIndexRecord.java | 0 .../MinimalArtifactIndexRecordFactory.java | 0 .../record/MinimalIndexRecordFields.java | 0 .../indexer/record/RepositoryIndexRecord.java | 0 .../record/RepositoryIndexRecordFactory.java | 0 .../record/StandardArtifactIndexRecord.java | 0 .../StandardArtifactIndexRecordFactory.java | 0 .../record/StandardIndexRecordFields.java | 0 .../archiva-indexer/src/site/apt/design.apt | 0 .../archiva-indexer/src/site/site.xml | 0 .../LuceneMinimalArtifactIndexSearchTest.java | 0 .../LuceneMinimalArtifactIndexTest.java | 0 ...LuceneStandardArtifactIndexSearchTest.java | 0 .../LuceneStandardArtifactIndexTest.java | 0 .../archiva/indexer/query/QueryTest.java | 0 ...MinimalArtifactIndexRecordFactoryTest.java | 0 ...tandardArtifactIndexRecordFactoryTest.java | 0 .../record/parent-pom/1/parent-pom-1.pom | 0 .../test-archetype/1.0/test-archetype-1.0.jar | Bin .../test-archetype/1.0/test-archetype-1.0.pom | 0 .../test-child-pom-1.0-20060728.121314-1.jar | Bin .../test-child-pom-1.0-20060728.121314-1.pom | 0 .../1.0/test-corrupt-jar-1.0.jar | 0 .../test-dll/1.0.1.34/test-dll-1.0.1.34.dll | 0 .../test-jar-and-pom-1.0-alpha-1-jdk14.jar | Bin .../test-jar-and-pom-1.0-alpha-1.jar | Bin .../test-jar-and-pom-1.0-alpha-1.pom | 0 .../test-jar/1.0/test-jar-1.0-jdk14.jar | Bin .../record/test-jar/1.0/test-jar-1.0.jar | Bin .../test-plugin/1.0/test-plugin-1.0.jar | Bin .../test-plugin/1.0/test-plugin-1.0.pom | 0 .../record/test-pom/1.0/test-pom-1.0.pom | 0 .../record/test-skin/1.0/test-skin-1.0.jar | Bin .../record/test-skin/1.0/test-skin-1.0.pom | 0 .../2.0.1/maven-artifact-2.0.1.jar | Bin .../2.0.1/maven-artifact-2.0.1.pom | 0 .../maven-artifact/2.0.1/maven-metadata.xml | 0 .../maven/maven-artifact/maven-metadata.xml | 0 .../2.0/maven-corrupt-jar-2.0.jar | 0 .../2.0/maven-corrupt-jar-2.0.pom | 0 .../org/apache/maven/maven-metadata.xml | 0 .../maven/maven-model/2.0/maven-model-2.0.jar | Bin .../maven/maven-model/2.0/maven-model-2.0.pom | 0 .../1.0.15/test-inherited-1.0.15.pom | 0 .../test/repository/test/maven-metadata.xml | 0 .../1.0/test-artifactId-1.0.jar | Bin .../1.0/test-artifactId-1.0.pom | 0 .../{ => archiva-base}/archiva-proxy/pom.xml | 0 .../proxy/DefaultProxyRequestHandler.java | 0 .../proxy/ProxiedArtifactRepository.java | 0 .../maven/archiva/proxy/ProxyException.java | 0 .../archiva/proxy/ProxyRequestHandler.java | 0 .../archiva-proxy/src/site/apt/how-to.apt | 0 .../proxy/ProxyRequestHandlerTest.java | 0 .../maven/archiva/proxy/WagonDelegate.java | 0 .../jars/get-default-layout-present-1.0.jar | 0 .../get-default-layout-present-1.0.jar.md5 | 0 .../poms/get-relocated-artefact-1.0.pom | 0 .../jars/get-default-layout-1.0.jar | 0 .../jars/get-default-layout-present-1.0.jar | 0 .../1.0/get-bad-local-checksum-1.0.jar | 0 .../1.0/get-bad-local-checksum-1.0.jar.md5 | 0 .../1.0/get-bad-local-checksum-1.0.jar.sha1 | 0 ...et-checksum-from-managed-repo-1.0.jar.sha1 | 0 ...et-default-layout-present-with-pom-1.0.jar | 0 ...et-default-layout-present-with-pom-1.0.pom | 0 .../1.0/get-default-layout-present-1.0.jar | 0 .../get-default-layout-present-1.0.jar.md5 | 0 .../1.0/get-doubly-relocated-artefact-1.0.pom | 0 .../get-merged-metadata/maven-metadata.xml | 0 ...etadata-snapshot-1.0-20050831.101112-1.jar | 0 ...sent-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 .../get-relocated-artefact-with-pom-1.0.pom | 0 .../1.0/get-relocated-artefact-1.0.pom | 0 .../1.0/get-removed-from-proxies-1.0.jar | 0 .../1.0/maven-metadata.xml | 0 .../get-updated-metadata/.metadata-proxied1 | 0 .../1.0-SNAPSHOT/.metadata-proxied1 | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../get-updated-metadata/maven-metadata.xml | 0 .../1.0/get-bad-local-checksum-1.0.jar | 0 .../1.0/get-checksum-both-bad-1.0.jar | 0 .../1.0/get-checksum-both-bad-1.0.jar.md5 | 0 .../1.0/get-checksum-both-bad-1.0.jar.sha1 | 0 .../1.0/get-checksum-both-right-1.0.jar | 0 .../1.0/get-checksum-both-right-1.0.jar.md5 | 0 .../1.0/get-checksum-both-right-1.0.jar.sha1 | 0 ...et-checksum-from-managed-repo-1.0.jar.sha1 | 0 .../1.0/get-checksum-md5-bad-sha1-1.0.jar | 0 .../1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 | 0 .../get-checksum-md5-bad-sha1-1.0.jar.sha1 | 0 .../1.0/get-checksum-md5-only-1.0.jar | 0 .../1.0/get-checksum-md5-only-1.0.jar.md5 | 0 .../1.0/get-checksum-sha1-bad-md5-1.0.jar | 0 .../1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 | 0 .../get-checksum-sha1-bad-md5-1.0.jar.sha1 | 0 .../1.0/get-checksum-sha1-only-1.0.jar | 0 .../1.0/get-checksum-sha1-only-1.0.jar.sha1 | 0 .../1.0/get-default-layout-present-1.0.jar | 0 .../1.0/get-default-layout-1.0.jar | 0 .../1.0/maven-metadata.xml | 0 .../1.0/get-in-both-proxies-1.0.jar | 0 .../get-merged-metadata/maven-metadata.xml | 0 ...etadata-snapshot-1.0-20050831.101112-1.jar | 0 ...etadata-snapshot-1.0-20050831.101112-1.jar | 0 ...sent-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 ...estamped-snapshot-in-both-1.0-SNAPSHOT.jar | 0 .../get-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../get-updated-metadata/maven-metadata.xml | 0 .../1.0/get-in-both-proxies-1.0.jar | 0 .../1.0/get-in-second-proxy-1.0.jar | 0 .../get-merged-metadata/maven-metadata.xml | 0 ...estamped-snapshot-in-both-1.0-SNAPSHOT.jar | 0 .../archiva/proxy/ProxyRequestHandlerTest.xml | 0 .../archiva-model/pom.xml | 157 -- .../archiva/model/RepositoryContentKey.java | 170 --- .../src/main/mdo/archiva-base.xml | 1277 ----------------- .../src/test/resources/log4j.xml | 76 - 138 files changed, 1680 deletions(-) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/pom.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndex.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndexFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexSearchException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneIndexRecordConverter.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneQuery.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndex.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndexFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQuery.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQueryTerm.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/Query.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/QueryTerm.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/SingleTermQuery.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/IndexRecordExistsArtifactFilter.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalIndexRecordFields.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecord.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecordFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardIndexRecordFields.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/site/apt/design.apt (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/site/site.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexSearchTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexSearchTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/query/QueryTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/test/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/pom.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifactRepository.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyException.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/site/apt/how-to.apt (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/WagonDelegate.java (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/poms/get-relocated-artefact-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar (100%) rename archiva-jpox-database-refactor/{ => archiva-base}/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml (100%) delete mode 100755 archiva-jpox-database-refactor/archiva-model/pom.xml delete mode 100644 archiva-jpox-database-refactor/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java delete mode 100644 archiva-jpox-database-refactor/archiva-model/src/main/mdo/archiva-base.xml delete mode 100644 archiva-jpox-database-refactor/archiva-model/src/test/resources/log4j.xml diff --git a/archiva-jpox-database-refactor/archiva-indexer/pom.xml b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/pom.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/pom.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/pom.xml diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndex.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndex.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndex.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndex.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndexFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndexFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndexFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryArtifactIndexFactory.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexException.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexException.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexSearchException.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexSearchException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexSearchException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/RepositoryIndexSearchException.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneIndexRecordConverter.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneIndexRecordConverter.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneIndexRecordConverter.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneIndexRecordConverter.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneQuery.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneQuery.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneQuery.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneQuery.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndex.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndex.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndex.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndex.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndexFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndexFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndexFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryArtifactIndexFactory.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQuery.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQuery.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQuery.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQuery.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQueryTerm.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQueryTerm.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQueryTerm.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/CompoundQueryTerm.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/Query.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/Query.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/Query.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/Query.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/QueryTerm.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/QueryTerm.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/QueryTerm.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/QueryTerm.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/RangeQuery.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/SingleTermQuery.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/SingleTermQuery.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/SingleTermQuery.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/query/SingleTermQuery.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/IndexRecordExistsArtifactFilter.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/IndexRecordExistsArtifactFilter.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/IndexRecordExistsArtifactFilter.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/IndexRecordExistsArtifactFilter.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalIndexRecordFields.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalIndexRecordFields.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalIndexRecordFields.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalIndexRecordFields.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecord.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecord.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecord.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecord.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecordFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecordFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecordFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/RepositoryIndexRecordFactory.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardIndexRecordFields.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardIndexRecordFields.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardIndexRecordFields.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardIndexRecordFields.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/site/apt/design.apt b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/site/apt/design.apt similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/site/apt/design.apt rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/site/apt/design.apt diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/site/site.xml b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/site/site.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/site/site.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/site/site.xml diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexSearchTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexSearchTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexSearchTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexSearchTest.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalArtifactIndexTest.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexSearchTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexSearchTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexSearchTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexSearchTest.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardArtifactIndexTest.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/query/QueryTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/query/QueryTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/query/QueryTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/query/QueryTest.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/parent-pom/1/parent-pom-1.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-archetype/1.0/test-archetype-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-child-pom/1.0-SNAPSHOT/test-child-pom-1.0-20060728.121314-1.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-corrupt-jar/1.0/test-corrupt-jar-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-dll/1.0.1.34/test-dll-1.0.1.34.dll diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1-jdk14.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar-and-pom/1.0-alpha-1/test-jar-and-pom-1.0-alpha-1.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0-jdk14.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-jar/1.0/test-jar-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-plugin/1.0/test-plugin-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-pom/1.0/test-pom-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-corrupt-jar/2.0/maven-corrupt-jar-2.0.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/org/apache/maven/maven-model/2.0/maven-model-2.0.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/test/inherited/test-inherited/1.0.15/test-inherited-1.0.15.pom diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/test/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/test/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/test/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/test/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-proxy/pom.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/pom.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/pom.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/pom.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifactRepository.java b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifactRepository.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifactRepository.java rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxiedArtifactRepository.java diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyException.java b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyException.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyException.java rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyException.java diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ProxyRequestHandler.java diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/site/apt/how-to.apt b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/site/apt/how-to.apt similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/site/apt/how-to.apt rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/site/apt/how-to.apt diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/WagonDelegate.java b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/WagonDelegate.java similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/WagonDelegate.java rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/WagonDelegate.java diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/jars/get-default-layout-present-1.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/poms/get-relocated-artefact-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/poms/get-relocated-artefact-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/poms/get-relocated-artefact-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-managed/org.apache.maven.test/poms/get-relocated-artefact-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/legacy-proxied/org.apache.maven.test/jars/get-default-layout-present-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present-with-pom/1.0/get-default-layout-present-with-pom-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact-with-pom/1.0/get-relocated-artefact-with-pom-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-from-managed-repo/1.0/get-checksum-from-managed-repo-1.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-bad-sha1/1.0/get-checksum-md5-bad-sha1-1.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.md5 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar.sha1 diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/get-metadata-snapshot-1.0-20050831.101112-1.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/get-present-metadata-snapshot-1.0-20050831.101112-1.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar diff --git a/archiva-jpox-database-refactor/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml b/archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml similarity index 100% rename from archiva-jpox-database-refactor/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml rename to archiva-jpox-database-refactor/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.xml diff --git a/archiva-jpox-database-refactor/archiva-model/pom.xml b/archiva-jpox-database-refactor/archiva-model/pom.xml deleted file mode 100755 index 3fcb6843f..000000000 --- a/archiva-jpox-database-refactor/archiva-model/pom.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - 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-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java b/archiva-jpox-database-refactor/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java deleted file mode 100644 index a198eaec2..000000000 --- a/archiva-jpox-database-refactor/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryContentKey.java +++ /dev/null @@ -1,170 +0,0 @@ -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-model/src/main/mdo/archiva-base.xml b/archiva-jpox-database-refactor/archiva-model/src/main/mdo/archiva-base.xml deleted file mode 100644 index a6cc0fc40..000000000 --- a/archiva-jpox-database-refactor/archiva-model/src/main/mdo/archiva-base.xml +++ /dev/null @@ -1,1277 +0,0 @@ - - - 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-model/src/test/resources/log4j.xml b/archiva-jpox-database-refactor/archiva-model/src/test/resources/log4j.xml deleted file mode 100644 index 395941ac3..000000000 --- a/archiva-jpox-database-refactor/archiva-model/src/test/resources/log4j.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.39.5