You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/02/13 23:37:08 UTC
[05/10] archiva git commit: [MRM-1359] remove maven1 code
[MRM-1359] remove maven1 code
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/073f69fb
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/073f69fb
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/073f69fb
Branch: refs/heads/master
Commit: 073f69fb90b6b8977a740d104e1b22938f1d8534
Parents: 5b97adf
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Feb 12 23:31:10 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Feb 12 23:31:10 2015 +1100
----------------------------------------------------------------------
.../AbstractRepositoryServletTestCase.java | 42 -----------
.../webdav/RepositoryServletNoProxyTest.java | 77 +++++++++-----------
.../archiva/webdav/RepositoryServletTest.java | 4 +-
3 files changed, 36 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/073f69fb/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
index 86d291d..a9beb52 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
@@ -86,8 +86,6 @@ public abstract class AbstractRepositoryServletTestCase
{
protected static final String REPOID_INTERNAL = "internal";
- protected static final String REPOID_LEGACY = "legacy";
-
protected File repoRootInternal;
protected File repoRootLegacy;
@@ -140,9 +138,6 @@ public abstract class AbstractRepositoryServletTestCase
managedRepositoryAdmin.createIndexContext( managedRepositoryAdmin.getManagedRepository( REPOID_INTERNAL ) );
- config.addManagedRepository(
- createManagedRepository( REPOID_LEGACY, "Legacy Format Test Repo", repoRootLegacy, "legacy", true ) );
-
config.getProxyConnectors().clear();
config.getRemoteRepositories().clear();
@@ -447,19 +442,7 @@ public abstract class AbstractRepositoryServletTestCase
throws Exception
{
return unauthenticatedRepositoryServlet;
- /*
- Container[] childs = context.findChildren();
- for ( Container container : childs )
- {
- if ( StringUtils.equals( container.getName(), name ) )
- {
- Tomcat.ExistingStandardWrapper esw = Tomcat.ExistingStandardWrapper.class.cast( container );
- Servlet servlet = esw.loadServlet();
- return servlet;
- }
- }
- return null;*/
}
protected String getSpringConfigLocation()
@@ -468,31 +451,6 @@ public abstract class AbstractRepositoryServletTestCase
}
-
-
- /*
- protected ServletUnitClient getServletUnitClient()
- throws Exception
- {
- if ( servletUnitClient != null )
- {
- return servletUnitClient;
- }
- servletRunner = new ServletRunner( new File( "src/test/resources/WEB-INF/web.xml" ) );
-
- servletRunner.registerServlet( "/repository/*", UnauthenticatedRepositoryServlet.class.getName() );
-
- servletUnitClient = servletRunner.newClient();
-
- return servletUnitClient;
- }*/
-
- /*
- protected <P extends Page> P page(final String path) throws IOException {
- return newClient().getPage(base.toExternalForm() + "repository/" + path);
- }
- */
-
protected static WebClient newClient()
{
final WebClient webClient = new WebClient();
http://git-wip-us.apache.org/repos/asf/archiva/blob/073f69fb/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
index e183c07..a30ec8c 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletNoProxyTest.java
@@ -33,8 +33,6 @@ import java.util.ArrayList;
/**
* RepositoryServletTest
- *
- *
*/
public class RepositoryServletNoProxyTest
extends AbstractRepositoryServletTestCase
@@ -59,7 +57,7 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootInternal, commonsLangSha1 );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + commonsLangSha1 );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangSha1 );
@@ -75,7 +73,7 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootInternal, commonsLangSha1 );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
//WebRequest request = new WebRequest( "http://machine.com/repository/internal/" + commonsLangSha1 );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangSha1 );
@@ -93,14 +91,13 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootInternal, commonsLangSha1 );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest(
// "http://machine.com/repository/internal/" + "commons-lang/jars/commons-lang-2.1.jar.sha1" );
- WebResponse response = getWebResponse( "/repository/internal/" + "commons-lang/jars/commons-lang-2.1.jar.sha1" );
- assertResponseOK( response );
-
- assertEquals( "Expected file contents", "dummy-checksum", response.getContentAsString() );
+ WebResponse response =
+ getWebResponse( "/repository/internal/" + "commons-lang/jars/commons-lang-2.1.jar.sha1" );
+ assertResponseNotFound( response );
}
@Test
@@ -113,7 +110,7 @@ public class RepositoryServletNoProxyTest
File metadataFile = new File( repoRootInternal, commonsLangMetadata );
metadataFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + commonsLangMetadata );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangMetadata );
@@ -132,7 +129,7 @@ public class RepositoryServletNoProxyTest
File metadataFile = new File( repoRootInternal, commonsLangMetadata );
metadataFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + commonsLangMetadata );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangMetadata );
@@ -151,7 +148,7 @@ public class RepositoryServletNoProxyTest
File metadataFile = new File( repoRootInternal, commonsLangMetadata );
metadataFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + commonsLangMetadata );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangMetadata );
@@ -170,7 +167,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootInternal, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + commonsLangJar );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangJar );
@@ -189,14 +186,13 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootInternal, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest(
// "http://machine.com/repository/internal/" + "commons-lang/jars/commons-lang-2.1.jar" );
WebResponse response = getWebResponse( "/repository/internal/" + "commons-lang/jars/commons-lang-2.1.jar" );
- assertResponseOK( response );
+ assertResponseNotFound( response );
- assertEquals( "Expected file contents", expectedArtifactContents, response.getContentAsString() );
}
@Test
@@ -209,7 +205,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootInternal, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + commonsLangJar );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangJar );
@@ -228,7 +224,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootInternal, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest(
// "http://machine.com/repository/internal/" + "commons-lang/jars/commons-lang-2.1-SNAPSHOT.jar" );
@@ -248,7 +244,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootInternal, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
//WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + commonsLangJar );
WebResponse response = getWebResponse( "/repository/internal/" + commonsLangJar );
@@ -267,14 +263,12 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootInternal, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest(
"http://machine.com/repository/internal/" + "commons-lang/jars/commons-lang-2.1-20050821.023400-1.jar" );
WebResponse response = getServletUnitClient().getResponse( request );
- assertResponseOK( response );
-
- assertEquals( "Expected file contents", expectedArtifactContents, response.getContentAsString() );
+ assertResponseNotFound( response );
}
/**
@@ -290,7 +284,7 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootInternal, dualExtensionPath );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, expectedContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, expectedContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/internal/" + dualExtensionPath );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -309,14 +303,13 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootInternal, dualExtensionPath );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, expectedContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, expectedContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest(
"http://machine.com/repository/internal/" + "org.project/distributions/example-presentation-3.2.zip" );
WebResponse response = getServletUnitClient().getResponse( request );
- assertResponseOK( response );
+ assertResponseNotFound( response );
- assertEquals( "Expected file contents", expectedContents, response.getContentAsString() );
}
@Test
@@ -328,7 +321,7 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootLegacy, "commons-lang/jars/commons-lang-2.1.jar.sha1" );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangSha1 );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -345,7 +338,7 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootLegacy, commonsLangSha1 );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, "dummy-checksum", Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangSha1 );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -365,7 +358,7 @@ public class RepositoryServletNoProxyTest
File metadataFile = new File( repoRootLegacy, commonsLangMetadata );
metadataFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangMetadata );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -385,7 +378,7 @@ public class RepositoryServletNoProxyTest
File metadataFile = new File( repoRootLegacy, commonsLangMetadata );
metadataFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangMetadata );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -404,7 +397,7 @@ public class RepositoryServletNoProxyTest
File metadataFile = new File( repoRootLegacy, commonsLangMetadata );
metadataFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( metadataFile, expectedMetadataContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangMetadata );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -423,7 +416,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootLegacy, "commons-lang/jars/commons-lang-2.1.jar" );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangJar );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -442,7 +435,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootLegacy, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangJar );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -461,7 +454,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootLegacy, "commons-lang/jars/commons-lang-2.1-SNAPSHOT.jar" );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangJar );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -480,13 +473,11 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootLegacy, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangJar );
WebResponse response = getServletUnitClient().getResponse( request );
- assertResponseOK( response );
-
- assertEquals( "Expected file contents", expectedArtifactContents, response.getContentAsString() );
+ assertResponseNotFound( response );
}
@Test
@@ -500,7 +491,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootLegacy, "commons-lang/jars/" + filename );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangJar );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -519,7 +510,7 @@ public class RepositoryServletNoProxyTest
File artifactFile = new File( repoRootLegacy, commonsLangJar );
artifactFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( artifactFile, expectedArtifactContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + commonsLangJar );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -541,7 +532,7 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootLegacy, "org.project/distributions/example-presentation-3.2.xml.zip" );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, expectedContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, expectedContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + dualExtensionPath );
WebResponse response = getServletUnitClient().getResponse( request );
@@ -560,7 +551,7 @@ public class RepositoryServletNoProxyTest
File checksumFile = new File( repoRootLegacy, dualExtensionPath );
checksumFile.getParentFile().mkdirs();
- FileUtils.writeStringToFile( checksumFile, expectedContents, Charset.defaultCharset() );
+ FileUtils.writeStringToFile( checksumFile, expectedContents, Charset.defaultCharset() );
WebRequest request = new GetMethodWebRequest( "http://machine.com/repository/legacy/" + dualExtensionPath );
WebResponse response = getServletUnitClient().getResponse( request );
http://git-wip-us.apache.org/repos/asf/archiva/blob/073f69fb/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
index df35cdb..a1954a5 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
@@ -134,7 +134,7 @@ public class RepositoryServletTest
WebRequest request = new GetMethodWebRequest( path );
WebResponse response = getServletUnitClient().getResponse( request );
assertResponseNotFound( response );
- assertThat( response.getContentAsString() ).contains(
- "Invalid path to Artifact: legacy paths should have an expected type ending in [s] in the second part of the path." );
+ assertThat( response.getContentAsString() ) //
+ .contains( "Legacy Maven1 repository not supported anymore." );
}
}