diff options
author | Olivier Lamy <olamy@apache.org> | 2015-02-12 23:00:22 +1100 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2015-02-12 23:00:22 +1100 |
commit | 642ceb3f9ea2b0509aca757327c5b34f6a8a3aec (patch) | |
tree | 80e2951008c64a48b73bcee580c10998ae070027 /archiva-modules/archiva-web/archiva-webdav | |
parent | edbc2b762e27cee9f22a34eb25803f46dff77ab1 (diff) | |
download | archiva-642ceb3f9ea2b0509aca757327c5b34f6a8a3aec.tar.gz archiva-642ceb3f9ea2b0509aca757327c5b34f6a8a3aec.zip |
[MRM-1359] remove maven1 code
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webdav')
2 files changed, 4 insertions, 6 deletions
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index 31e2b881f..93547c0d9 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -62,7 +62,6 @@ import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; import org.apache.archiva.repository.RepositoryException; import org.apache.archiva.repository.RepositoryNotFoundException; -import org.apache.archiva.repository.content.legacy.LegacyPathParser; import org.apache.archiva.repository.content.maven2.RepositoryRequest; import org.apache.archiva.repository.events.AuditListener; import org.apache.archiva.repository.layout.LayoutException; @@ -201,7 +200,7 @@ public class ArchivaDavResourceFactory this.digestSha1 = plexusSisuBridge.lookup( Digester.class, "sha1" ); // TODO remove this hard dependency on maven !! - repositoryRequest = new RepositoryRequest( new LegacyPathParser( archivaConfiguration ) ); + repositoryRequest = new RepositoryRequest( ); } @PostConstruct diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java index edb8ab3d4..7b3870d23 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java @@ -36,7 +36,6 @@ import org.apache.archiva.proxy.DefaultRepositoryProxyConnectors; import org.apache.archiva.proxy.model.ProxyFetchResult; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; -import org.apache.archiva.repository.content.legacy.LegacyPathParser; import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent; import org.apache.archiva.repository.content.maven2.RepositoryRequest; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; @@ -460,7 +459,7 @@ public class ArchivaDavResourceFactoryTest ManagedRepositoryContent internalRepo = createManagedRepositoryContent( INTERNAL_REPO ); // use actual object (this performs the isMetadata, isDefault and isSupportFile check!) - RepositoryRequest repoRequest = new RepositoryRequest( new LegacyPathParser( this.archivaConfiguration ) ); + RepositoryRequest repoRequest = new RepositoryRequest( ); resourceFactory.setRepositoryRequest( repoRequest ); try @@ -521,7 +520,7 @@ public class ArchivaDavResourceFactoryTest ManagedRepositoryContent internalRepo = createManagedRepositoryContent( INTERNAL_REPO ); // use actual object (this performs the isMetadata, isDefault and isSupportFile check!) - RepositoryRequest repoRequest = new RepositoryRequest( new LegacyPathParser( this.archivaConfiguration ) ); + RepositoryRequest repoRequest = new RepositoryRequest( ); resourceFactory.setRepositoryRequest( repoRequest ); try @@ -572,7 +571,7 @@ public class ArchivaDavResourceFactoryTest ManagedRepositoryContent legacyRepo = createManagedRepositoryContent( LEGACY_REPO ); // use actual object (this performs the isMetadata, isDefault and isSupportFile check!) - RepositoryRequest repoRequest = new RepositoryRequest( new LegacyPathParser( this.archivaConfiguration ) ); + RepositoryRequest repoRequest = new RepositoryRequest( ); resourceFactory.setRepositoryRequest( repoRequest ); try |