This is an automated email from the ASF dual-hosted git repository. martin_s pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 847727d Merge pull request #50 from jacobtolar/patch-1 new 21220fc Starting refactoring of proxy handling. new 7a0e81d Fixing unit tests after refactoring The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/test/resources/spring-context.xml | 16 +- .../pom.xml | 38 +- .../proxy/maven}/DebugTransferListener.java | 2 +- .../archiva/proxy/maven}/DefaultWagonFactory.java | 2 +- .../apache/archiva/proxy/maven}/WagonFactory.java | 2 +- .../proxy/maven}/WagonFactoryException.java | 2 +- .../archiva/proxy/maven}/WagonFactoryRequest.java | 4 +- .../archiva-base/archiva-maven2-indexer/pom.xml | 6 +- .../archiva/indexer/maven/MavenIndexManager.java | 25 +- .../apache/archiva/proxy/model}/NetworkProxy.java | 15 +- .../apache/archiva/proxy/model/ProxyConnector.java | 11 + .../proxy/model}/ProxyConnectorRuleType.java | 2 +- ...Connectors.java => RepositoryProxyHandler.java} | 15 +- .../archiva-base/archiva-proxy-common/pom.xml | 90 -- .../src/test/resources/META-INF/spring-context.xml | 29 - .../archiva-proxy-maven}/pom.xml | 142 ++- .../proxy/maven/MavenRepositoryProxyHandler.java | 373 ++++++++ .../src/main/resources/META-INF/spring-context.xml | 2 +- .../MockRepositoryArchivaTaskScheduler.java | 0 .../archiva/proxy/AbstractProxyTestCase.java | 33 +- .../archiva/proxy/CacheFailuresTransferTest.java | 0 .../apache/archiva/proxy/ChecksumTransferTest.java | 0 .../apache/archiva/proxy/ErrorHandlingTest.java | 0 .../archiva/proxy/HttpProxyTransferTest.java | 58 +- .../archiva/proxy/ManagedDefaultTransferTest.java | 0 .../apache/archiva/proxy/MetadataTransferTest.java | 0 .../apache/archiva/proxy/MockConfiguration.java | 0 .../apache/archiva/proxy/SnapshotTransferTest.java | 0 .../org/apache/archiva/proxy/WagonDelegate.java | 0 .../archiva/proxy/common/WagonFactoryTest.java | 8 +- .../repository/mock/ArchivaIndexManagerMock.java | 0 .../mock/ManagedRepositoryContentMock.java} | 254 +++--- .../mock/RemoteRepositoryContentMock.java | 22 +- .../mock/RepositoryContentProviderMock.java | 14 +- .../repository/mock/RepositoryProviderMock.java | 0 .../repositories/create-managed-to-proxy-map.sh | 0 .../src/test/repositories/managed-to-proxy-map.txt | 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 .../get-checksum-from-managed-repo-1.0.jar.sha1 | 0 .../get-default-layout-present-with-pom-1.0.jar | 0 .../get-default-layout-present-with-pom-1.0.pom | 0 .../1.0/get-default-layout-present-1.0.jar | 0 .../1.0/get-default-layout-present-1.0.jar.asc | 0 .../1.0/get-default-layout-present-1.0.jar.md5 | 0 .../1.0/get-default-metadata-1.0.jar} | 0 .../get-default-metadata/1.0/maven-metadata.xml | 0 .../1.0/get-doubly-relocated-artefact-1.0.pom | 0 .../test/get-merged-metadata/maven-metadata.xml | 0 .../1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar} | 0 .../1.0-beta-2/maven-metadata.xml | 0 .../test/get-not-on-remotes/maven-metadata.xml | 0 .../1.0.22/get-on-local-on-remote-1.0.22.pom} | 0 .../1.0.22/maven-metadata.xml | 0 .../1.0.8/get-on-local-on-remote-1.0.8.pom} | 0 .../test/get-on-local-on-remote/maven-metadata.xml | 0 .../1.0/get-on-multiple-repos-1.0.pom} | 0 .../get-on-multiple-repos/1.0/maven-metadata.xml | 0 .../test/get-on-multiple-repos/maven-metadata.xml | 0 ...ent-metadata-snapshot-1.0-20050831.101112-1.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 ...t-present-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 .../1.0/get-project-metadata-1.0.jar} | 0 .../1.1/get-project-metadata-1.1.jar} | 0 .../2.0/get-project-metadata-2.0.pom} | 0 .../test/get-project-metadata/maven-metadata.xml | 0 .../2.2/get-release-metadata-2.2.jar} | 0 .../get-release-metadata/2.2/maven-metadata.xml | 0 .../1.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 .../get-removed-metadata/1.0/maven-metadata.xml | 0 ...l-not-remote-2.0-alpha-2-20070821.123456-1.jar} | 0 ...l-not-remote-2.0-alpha-2-20070821.220304-2.jar} | 0 .../2.0-alpha-2-SNAPSHOT/maven-metadata.xml | 0 ...get-snapshot-popular-2.0-20070821.102030-1.jar} | 0 ...get-snapshot-popular-2.0-20070821.185701-2.jar} | 0 ...get-snapshot-popular-2.0-20070822.021008-3.jar} | 0 .../2.0-SNAPSHOT/maven-metadata.xml | 0 .../test/get-updated-metadata/.metadata-proxied1 | 0 .../1.0-SNAPSHOT/.metadata-proxied1 | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../test/get-updated-metadata/maven-metadata.xml | 0 .../groups/get-not-on-remotes/maven-metadata.xml | 0 .../get-on-local-on-remote/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 .../groups/get-project-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 .../get-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 .../1.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 .../1.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-present-1.0.jar.asc | 0 .../1.0/get-default-layout-1.0.jar | 0 .../1.0/get-default-layout-1.0.jar.asc | 0 .../test/get-default-layout/1.0/maven-metadata.xml | 0 .../test/get-default-layout/maven-metadata.xml | 0 .../get-default-metadata/1.0/maven-metadata.xml | 0 .../1.0.5/get-found-in-proxy-1.0.5-javadoc.jar} | 0 .../test/get-found-in-proxy/maven-metadata.xml | 0 .../1.0/get-in-both-proxies-1.0.jar | 0 .../test/get-merged-metadata/maven-metadata.xml | 0 ...get-metadata-snapshot-1.0-20050831.101112-1.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../1.0.22/maven-metadata.xml | 0 .../test/get-on-local-on-remote/maven-metadata.xml | 0 .../get-on-multiple-repos/1.0/maven-metadata.xml | 0 .../test/get-on-multiple-repos/maven-metadata.xml | 0 ...ent-metadata-snapshot-1.0-20050831.101112-1.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 ...t-present-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 ...get-snapshot-popular-2.0-20070819.040004-1.jar} | 0 ...get-snapshot-popular-2.0-20070822.145534-9.jar} | 0 .../2.0-SNAPSHOT/maven-metadata.xml | 0 ...ped-snapshot-in-both-1.0-20061222.034118-1.jar} | 0 ...ped-snapshot-in-both-1.0-20061227.112101-2.jar} | 0 ...t-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../get-timestamped-snapshot-1.0-SNAPSHOT.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../test/get-updated-metadata/maven-metadata.xml | 0 .../groups/get-default-layout/maven-metadata.xml | 0 .../groups/get-found-in-proxy/maven-metadata.xml | 0 .../get-on-local-on-remote/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 .../1.0.1/get-default-layout-1.0.1.pom} | 0 .../1.0/get-default-layout-1.0.jar | 0 .../test/get-default-layout/1.0/maven-metadata.xml | 0 .../test/get-default-layout/maven-metadata.xml | 0 .../1.0/get-in-both-proxies-1.0.jar | 0 .../1.0/get-in-second-proxy-1.0.jar | 0 .../test/get-merged-metadata/maven-metadata.xml | 0 .../get-on-multiple-repos/1.0/maven-metadata.xml | 0 .../test/get-on-multiple-repos/maven-metadata.xml | 0 ...get-snapshot-popular-2.0-20070821.102030-1.jar} | 0 ...get-snapshot-popular-2.0-20070823.111741-5.jar} | 0 ...get-snapshot-popular-2.0-20070823.212711-6.jar} | 0 .../2.0-SNAPSHOT/maven-metadata.xml | 0 ...ped-snapshot-in-both-1.0-20061222.034118-1.jar} | 0 ...ped-snapshot-in-both-1.0-20070101.000103-2.jar} | 0 ...t-timestamped-snapshot-in-both-1.0-SNAPSHOT.jar | 0 .../1.0-SNAPSHOT/maven-metadata.xml | 0 .../groups/get-default-layout/maven-metadata.xml | 0 .../get-on-multiple-repos/maven-metadata.xml | 0 .../test/resources/META-INF}/spring-context.xml | 30 +- .../src/test/resources/spring-context.xml | 7 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 52 +- .../apache/archiva/proxy/ArchivaProxyRegistry.java | 174 ++++ ...ors.java => DefaultRepositoryProxyHandler.java} | 539 ++---------- .../org/apache/archiva/proxy/ProxyRegistry.java | 73 ++ .../1.0/get-default-metadata-1.0.jar | 0 .../1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar | 0 .../1.0.22/get-on-local-on-remote-1.0.22.pom | 0 .../1.0.8/get-on-local-on-remote-1.0.8.pom | 0 .../1.0/get-on-multiple-repos-1.0.pom | 0 .../1.0/get-project-metadata-1.0.jar | 0 .../1.1/get-project-metadata-1.1.jar | 0 .../2.0/get-project-metadata-2.0.pom | 0 .../2.2/get-release-metadata-2.2.jar | 0 ...al-not-remote-2.0-alpha-2-20070821.123456-1.jar | 0 ...al-not-remote-2.0-alpha-2-20070821.220304-2.jar | 0 .../get-snapshot-popular-2.0-20070821.102030-1.jar | 0 .../get-snapshot-popular-2.0-20070821.185701-2.jar | 0 .../get-snapshot-popular-2.0-20070822.021008-3.jar | 0 .../1.0.5/get-found-in-proxy-1.0.5-javadoc.jar | 0 .../get-snapshot-popular-2.0-20070819.040004-1.jar | 0 .../get-snapshot-popular-2.0-20070822.145534-9.jar | 0 ...mped-snapshot-in-both-1.0-20061222.034118-1.jar | 0 ...mped-snapshot-in-both-1.0-20061227.112101-2.jar | 0 .../1.0.1/get-default-layout-1.0.1.pom | 0 .../get-snapshot-popular-2.0-20070821.102030-1.jar | 0 .../get-snapshot-popular-2.0-20070823.111741-5.jar | 0 .../get-snapshot-popular-2.0-20070823.212711-6.jar | 0 ...mped-snapshot-in-both-1.0-20061222.034118-1.jar | 0 ...mped-snapshot-in-both-1.0-20070101.000103-2.jar | 0 .../archiva-repository-admin-api/pom.xml | 4 + .../admin/model/beans/ProxyConnectorRule.java | 2 + .../DefaultProxyConnectorRuleAdmin.java | 2 +- .../admin/mock/ArchivaIndexManagerMock.java | 22 +- .../ProxyConnectorRuleAdminTest.java | 2 +- .../archiva/repository/metadata/MetadataTools.java | 3 + archiva-modules/archiva-base/pom.xml | 3 +- .../archiva-scheduler-indexing-maven2/pom.xml | 2 +- .../maven/DefaultDownloadRemoteIndexScheduler.java | 128 ++- .../indexing/maven/DownloadRemoteIndexTask.java | 6 +- .../maven/DownloadRemoteIndexTaskRequest.java | 4 +- .../archiva-rest/archiva-rest-services/pom.xml | 5 + .../rest/services/DefaultBrowseService.java | 15 +- .../services/DefaultRemoteRepositoriesService.java | 13 +- .../services/ProxyConnectorRuleServiceTest.java | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 8 + .../archiva/webdav/ArchivaDavResourceFactory.java | 31 +- .../webdav/AbstractRepositoryServletTestCase.java | 9 +- .../webdav/ArchivaDavResourceFactoryTest.java | 33 +- .../webdav/OverridingRepositoryProxyHandler.java | 55 ++ archiva-modules/plugins/maven2-repository/pom.xml | 7 +- .../storage/maven2/Maven2RepositoryStorage.java | 968 +++++++++------------ .../storage/maven2/RepositoryModelResolver.java | 35 +- .../MockRepositoryArchivaTaskScheduler.java | 0 ...sitoryMetadataResolverMRM1411RepoGroupTest.java | 8 +- ...aven2RepositoryMetadataResolverMRM1411Test.java | 16 +- ...positoryMetadataResolverManagedReleaseTest.java | 2 +- .../Maven2RepositoryMetadataResolverTest.java | 4 +- .../index/mock/ArchivaIndexManagerMock.java | 24 +- .../metadata/Maven2RepositoryStorageTest.java | 2 +- .../src/test/resources/META-INF/spring-context.xml | 1 + .../src/test/resources/spring-context-storage.xml} | 41 +- .../src/test/resources/spring-context.xml | 28 +- pom.xml | 7 +- src/ci/scripts/prepareWorkspace.sh | 2 +- 225 files changed, 1795 insertions(+), 1739 deletions(-) copy archiva-modules/archiva-base/{archiva-maven2-metadata => archiva-maven2-common}/pom.xml (64%) rename archiva-modules/archiva-base/{archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common => archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven}/DebugTransferListener.java (98%) rename archiva-modules/archiva-base/{archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common => archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven}/DefaultWagonFactory.java (98%) rename archiva-modules/archiva-base/{archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common => archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven}/WagonFactory.java (96%) rename archiva-modules/archiva-base/{archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common => archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven}/WagonFactoryException.java (96%) rename archiva-modules/archiva-base/{archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common => archiva-maven2-common/src/main/java/org/apache/archiva/proxy/maven}/WagonFactoryRequest.java (97%) copy archiva-modules/archiva-base/{archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans => archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model}/NetworkProxy.java (92%) rename archiva-modules/archiva-base/{archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans => archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model}/ProxyConnectorRuleType.java (97%) rename archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/{RepositoryProxyConnectors.java => RepositoryProxyHandler.java} (91%) delete mode 100644 archiva-modules/archiva-base/archiva-proxy-common/pom.xml delete mode 100644 archiva-modules/archiva-base/archiva-proxy-common/src/test/resources/META-INF/spring-context.xml copy archiva-modules/{archiva-scheduler/archiva-scheduler-indexing-maven2 => archiva-base/archiva-proxy-maven}/pom.xml (60%) create mode 100644 archiva-modules/archiva-base/archiva-proxy-maven/src/main/java/org/apache/archiva/proxy/maven/MavenRepositoryProxyHandler.java rename archiva-modules/archiva-base/{archiva-proxy-common => archiva-proxy-maven}/src/main/resources/META-INF/spring-context.xml (99%) copy archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java (94%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/ErrorHandlingTest.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java (85%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/MockConfiguration.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/WagonDelegate.java (100%) rename archiva-modules/archiva-base/{archiva-proxy-common => archiva-proxy-maven}/src/test/java/org/apache/archiva/proxy/common/WagonFactoryTest.java (81%) copy archiva-modules/archiva-base/{archiva-repository-layer => archiva-proxy-maven}/src/test/java/org/apache/archiva/repository/mock/ArchivaIndexManagerMock.java (100%) copy archiva-modules/{plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java => archiva-base/archiva-proxy-maven/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java} (56%) copy archiva-modules/archiva-base/{archiva-repository-layer => archiva-proxy-maven}/src/test/java/org/apache/archiva/repository/mock/RemoteRepositoryContentMock.java (69%) copy archiva-modules/archiva-base/{archiva-repository-layer => archiva-proxy-maven}/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java (76%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/create-managed-to-proxy-map.sh (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed-to-proxy-map.txt (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.md5 (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/get-default-metadata-1.0.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-doubly-relocated-artefact/1.0/get-doubly-relocated-artefact-1.0.pom (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/get-on-local-on-remote-1.0.22.pom} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy/src/test/repositories/proxied1 => archiva-proxy-maven/src/test/repositories/managed}/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.8/get-on-local-on-remote-1.0.8.pom} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/get-on-multiple-repos-1.0.pom} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy/src/test/repositories/proxied2 => archiva-proxy-maven/src/test/repositories/managed}/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy/src/test/repositories/proxied1 => archiva-proxy-maven/src/test/repositories/managed}/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.0/get-project-metadata-1.0.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.1/get-project-metadata-1.1.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/2.0/get-project-metadata-2.0.pom} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/get-release-metadata-2.2.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-relocated-artefact/1.0/get-relocated-artefact-1.0.pom (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-removed-from-proxies/1.0/get-removed-from-proxies-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-removed-metadata/1.0/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.123456-1.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.220304-2.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.185701-2.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.021008-3.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/.metadata-proxied1 (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/.metadata-proxied1 (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/get-updated-metadata/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/groups/get-not-on-remotes/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/managed/org/apache/maven/test/groups/get-project-metadata/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar.asc (100%) rename archiva-modules/archiva-base/{archiva-proxy/src/test/repositories/proxied2 => archiva-proxy-maven/src/test/repositories/proxied1}/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar.asc (100%) rename archiva-modules/archiva-base/{archiva-proxy/src/test/repositories/proxied2 => archiva-proxy-maven/src/test/repositories/proxied1}/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-default-layout/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-default-metadata/1.0/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/1.0.5/get-found-in-proxy-1.0.5-javadoc.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy/src/test/repositories/managed => archiva-proxy-maven/src/test/repositories/proxied1}/org/apache/maven/test/get-on-local-on-remote/1.0.22/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-on-local-on-remote/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy/src/test/repositories/managed => archiva-proxy-maven/src/test/repositories/proxied1}/org/apache/maven/test/get-present-metadata-snapshot/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070819.040004-1.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.145534-9.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061227.112101-2.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-timestamped-snapshot/1.0-SNAPSHOT/get-timestamped-snapshot-1.0-SNAPSHOT.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/get-updated-metadata/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/groups/get-found-in-proxy/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-local-on-remote/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied1/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0.1/get-default-layout-1.0.1.pom} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy/src/test/repositories/proxied1 => archiva-proxy-maven/src/test/repositories/proxied2}/org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy/src/test/repositories/proxied1 => archiva-proxy-maven/src/test/repositories/proxied2}/org/apache/maven/test/get-default-layout/1.0/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/get-merged-metadata/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy/src/test/repositories/managed => archiva-proxy-maven/src/test/repositories/proxied2}/org/apache/maven/test/get-on-multiple-repos/1.0/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/get-on-multiple-repos/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.111741-5.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.212711-6.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/maven-metadata.xml (100%) copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20061222.034118-1.jar} (100%) mode change 100755 => 100644 copy archiva-modules/{plugins/stage-repository-merge/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.jar => archiva-base/archiva-proxy-maven/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/get-timestamped-snapshot-in-both-1.0-20070101.000103-2.jar} (100%) mode change 100755 => 100644 rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/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-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/get-timestamped-snapshot-in-both/1.0-SNAPSHOT/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/groups/get-default-layout/maven-metadata.xml (100%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/repositories/proxied2/org/apache/maven/test/groups/get-on-multiple-repos/maven-metadata.xml (100%) copy archiva-modules/archiva-base/{archiva-consumers/archiva-core-consumers/src/test/resources => archiva-proxy-maven/src/test/resources/META-INF}/spring-context.xml (79%) rename archiva-modules/archiva-base/{archiva-proxy => archiva-proxy-maven}/src/test/resources/spring-context.xml (96%) create mode 100644 archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ArchivaProxyRegistry.java rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{DefaultRepositoryProxyConnectors.java => DefaultRepositoryProxyHandler.java} (63%) create mode 100644 archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyRegistry.java delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-default-metadata/1.0/get-default-metadata-1.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-not-on-remotes/1.0-beta-2/get-not-on-remotes-1.0-beta-2.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.22/get-on-local-on-remote-1.0.22.pom delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-local-on-remote/1.0.8/get-on-local-on-remote-1.0.8.pom delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-on-multiple-repos/1.0/get-on-multiple-repos-1.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.0/get-project-metadata-1.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/1.1/get-project-metadata-1.1.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-project-metadata/2.0/get-project-metadata-2.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-release-metadata/2.2/get-release-metadata-2.2.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.123456-1.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-on-local-not-remote/2.0-alpha-2-SNAPSHOT/get-snapshot-on-local-not-remote-2.0-alpha-2-20070821.220304-2.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.185701-2.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/managed/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.021008-3.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-found-in-proxy/1.0.5/get-found-in-proxy-1.0.5-javadoc.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070819.040004-1.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070822.145534-9.jar delete mode 100644 archiva-modules/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-20061222.034118-1.jar delete mode 100644 archiva-modules/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-20061227.112101-2.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-default-layout/1.0.1/get-default-layout-1.0.1.pom delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070821.102030-1.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.111741-5.jar delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied2/org/apache/maven/test/get-snapshot-popular/2.0-SNAPSHOT/get-snapshot-popular-2.0-20070823.212711-6.jar delete mode 100644 archiva-modules/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-20061222.034118-1.jar delete mode 100644 archiva-modules/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-20070101.000103-2.jar create mode 100644 archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/OverridingRepositoryProxyHandler.java rename archiva-modules/{archiva-base/archiva-proxy => plugins/maven2-repository}/src/test/java/org/apache/archiva/metadata/repository/MockRepositoryArchivaTaskScheduler.java (100%) rename archiva-modules/{archiva-base/archiva-proxy => plugins/maven2-repository}/src/test/resources/META-INF/spring-context.xml (99%) copy archiva-modules/{archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml => plugins/maven2-repository/src/test/resources/spring-context-storage.xml} (61%)