Author: bentmann
Date: Fri Mar 12 01:05:06 2010
New Revision: 922093
URL: http://svn.apache.org/viewvc?rev=922093&view=rev
Log:
[MNG-4428] Permament move (error 301) not handled properly by Maven
o Renamed IT to match bug id
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
- copied, changed from r922091,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4448FollowHttpRedirectTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4428/
- copied from r922091,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4448/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4448FollowHttpRedirectTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4448/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4428/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=922093&r1=922092&r2=922093&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Fri Mar 12 01:05:06 2010
@@ -111,11 +111,11 @@ public class IntegrationTestSuite
suite.addTestSuite(
MavenITmng4459InMemorySettingsKeptEncryptedTest.class );
suite.addTestSuite(
MavenITmng4453PluginVersionFromLifecycleMappingTest.class );
suite.addTestSuite(
MavenITmng4450StubModelForMissingDependencyPomTest.class );
- suite.addTestSuite( MavenITmng4448FollowHttpRedirectTest.class );
suite.addTestSuite( MavenITmng4436SingletonComponentLookupTest.class );
suite.addTestSuite( MavenITmng4433ForceParentSnapshotUpdateTest.class
);
suite.addTestSuite(
MavenITmng4430DistributionManagementStatusTest.class );
suite.addTestSuite(
MavenITmng4429CompRequirementOnNonDefaultImplTest.class );
+ suite.addTestSuite( MavenITmng4428FollowHttpRedirectTest.class );
suite.addTestSuite(
MavenITmng4423SessionDataFromPluginParameterExpressionTest.class );
suite.addTestSuite(
MavenITmng4422PluginExecutionPhaseInterpolationTest.class );
suite.addTestSuite(
MavenITmng4421DeprecatedPomInterpolationExpressionsTest.class );
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
(from r922091,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4448FollowHttpRedirectTest.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4448FollowHttpRedirectTest.java&r1=922091&r2=922093&rev=922093&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4448FollowHttpRedirectTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
Fri Mar 12 01:05:06 2010
@@ -39,16 +39,16 @@ import org.mortbay.jetty.handler.Abstrac
import org.mortbay.jetty.security.SslSocketConnector;
/**
- * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-4448";>MNG-4448</a>.
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-4428";>MNG-4428</a>.
*
* @author Benjamin Bentmann
* @version $Id$
*/
-public class MavenITmng4448FollowHttpRedirectTest
+public class MavenITmng4428FollowHttpRedirectTest
extends AbstractMavenIntegrationTestCase
{
- public MavenITmng4448FollowHttpRedirectTest()
+ public MavenITmng4428FollowHttpRedirectTest()
{
super( "[2.0.3,3.0-alpha-1),(3.0-alpha-1,)" );
}
@@ -96,7 +96,7 @@ public class MavenITmng4448FollowHttpRed
private void testit( boolean fromHttp, boolean toHttp )
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-4448" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-4428" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
@@ -116,7 +116,7 @@ public class MavenITmng4448FollowHttpRed
try
{
verifier.setAutoclean( false );
- verifier.deleteArtifacts( "org.apache.maven.its.mng4448" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4428" );
verifier.deleteDirectory( "target" );
Properties filterProps = verifier.newDefaultFilterProperties();
filterProps.setProperty( "@protocol@", fromHttp ? "http" : "https"
);
@@ -189,7 +189,7 @@ public class MavenITmng4448FollowHttpRed
{
writer.println( "<project>" );
writer.println( " <modelVersion>4.0.0</modelVersion>" );
- writer.println( "
<groupId>org.apache.maven.its.mng4448</groupId>" );
+ writer.println( "
<groupId>org.apache.maven.its.mng4428</groupId>" );
writer.println( " <artifactId>dep</artifactId>" );
writer.println( " <version>0.1</version>" );
writer.println( "</project>" );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4428/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4428/pom.xml?rev=922093&r1=922091&r2=922093&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4428/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4428/pom.xml
Fri Mar 12 01:05:06 2010
@@ -22,18 +22,18 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.mng4448</groupId>
+ <groupId>org.apache.maven.its.mng4428</groupId>
<artifactId>test</artifactId>
<version>0.1-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-4448</name>
+ <name>Maven Integration Test :: MNG-4428</name>
<description>
Verify that HTTP redirects are getting followed.
</description>
<dependencies>
<dependency>
- <groupId>org.apache.maven.its.mng4448</groupId>
+ <groupId>org.apache.maven.its.mng4428</groupId>
<artifactId>dep</artifactId>
<version>0.1</version>
</dependency>
