diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
deleted file mode 100644
index 5f332f09c..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
- org.apache.maven.wagon.Wagon
- test
- org.apache.maven.archiva.proxy.WagonDelegate
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.archiva.proxy.common.WagonFactory
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- repositoryContentFactory
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
- metadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- urlFailureCache
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
deleted file mode 100644
index b624eaf52..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
- org.apache.maven.wagon.Wagon
- test
- org.apache.maven.archiva.proxy.WagonDelegate
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.archiva.proxy.common.WagonFactory
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- urlFailureCache
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml
deleted file mode 100644
index 997eb03cd..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
- org.apache.maven.wagon.Wagon
- test
- org.apache.maven.archiva.proxy.WagonDelegate
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.archiva.proxy.common.WagonFactory
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.DownloadErrorPolicy
- downloadErrorPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- default
- urlFailureCache
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml
deleted file mode 100644
index 78705b6b2..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- urlFailureCache
-
-
- org.apache.archiva.proxy.common.WagonFactory
- default
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
deleted file mode 100644
index b624eaf52..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
- org.apache.maven.wagon.Wagon
- test
- org.apache.maven.archiva.proxy.WagonDelegate
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.archiva.proxy.common.WagonFactory
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- urlFailureCache
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
deleted file mode 100644
index b624eaf52..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
- org.apache.maven.wagon.Wagon
- test
- org.apache.maven.archiva.proxy.WagonDelegate
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.archiva.proxy.common.WagonFactory
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- urlFailureCache
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
deleted file mode 100644
index c51bd9e09..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
- org.apache.maven.wagon.Wagon
- test
- org.apache.maven.archiva.proxy.WagonDelegate
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
- org.apache.maven.archiva.repository.metadata.MetadataTools
- MetadataTools
-
-
- org.apache.maven.archiva.configuration.FileTypes
- filetypes
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- configuration
-
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.archiva.proxy.common.WagonFactory
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- urlFailureCache
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
deleted file mode 100644
index b624eaf52..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
- org.apache.maven.wagon.Wagon
- test
- org.apache.maven.archiva.proxy.WagonDelegate
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.archiva.proxy.common.WagonFactory
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- urlFailureCache
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
deleted file mode 100644
index b624eaf52..000000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
- org.apache.maven.wagon.Wagon
- test
- org.apache.maven.archiva.proxy.WagonDelegate
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- org.apache.maven.archiva.proxy.MockConfiguration
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
- org.apache.maven.archiva.repository.RepositoryContentFactory
- RepositoryContentRequest
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
-
-
- org.apache.maven.archiva.proxy.RepositoryProxyConnectors
- default
- org.apache.maven.archiva.proxy.DefaultRepositoryProxyConnectors
- DefaultRepositoryProxyConnectors
-
-
- org.apache.maven.archiva.configuration.ArchivaConfiguration
- mock
- archivaConfiguration
-
-
- org.apache.archiva.proxy.common.WagonFactory
-
-
- org.apache.maven.archiva.repository.RepositoryContentFactory
- mocked
-
-
- org.apache.maven.archiva.repository.metadata.MetadataTools
-
-
- org.apache.maven.archiva.policies.PreDownloadPolicy
- preDownloadPolicies
-
-
- org.apache.maven.archiva.policies.PostDownloadPolicy
- postDownloadPolicies
-
-
- org.apache.maven.archiva.policies.urlcache.UrlFailureCache
- urlFailureCache
-
-
- org.apache.archiva.scheduler.ArchivaTaskScheduler
- repository
- scheduler
-
-
-
-
-
- org.codehaus.plexus.cache.Cache
- url-failures-cache
- org.codehaus.plexus.cache.ehcache.EhcacheCache
- URL Failure Cache
-
- 600
- false
- ${java.io.tmpdir}/archiva/urlcache
- false
- 1000
- LRU
- url-failures-cache
- false
-
- 2700
-
- 1800
-
-
-
-
- org.apache.archiva.metadata.repository.MetadataRepository
- org.apache.archiva.metadata.repository.TestMetadataRepository
-
-
-