You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/07/06 16:24:38 UTC
svn commit: r1143432 -
/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
Author: olamy
Date: Wed Jul 6 14:24:37 2011
New Revision: 1143432
URL: http://svn.apache.org/viewvc?rev=1143432&view=rev
Log:
[ARCHETYPE-376] start work on not use harcoded port for jetty
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java?rev=1143432&r1=1143431&r2=1143432&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java Wed Jul 6 14:24:37 2011
@@ -36,6 +36,8 @@ import org.codehaus.cargo.container.prop
import org.codehaus.cargo.generic.deployable.DefaultDeployableFactory;
import org.codehaus.cargo.generic.deployable.DeployableFactory;
import org.codehaus.plexus.PlexusTestCase;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.webapp.WebAppContext;
/**
*
@@ -50,13 +52,13 @@ public class ArchetypeCatalogsTest
ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.class.getName() );
- ArchetypeCatalog result = archetype.getRemoteCatalog( "http://localhost:18881/repo/" );
+ ArchetypeCatalog result = archetype.getRemoteCatalog( "http://localhost:"+ port + "/repo/" );
assertEquals( 1, result.getArchetypes().size() );
assertEquals( "groupId", ( (Archetype) result.getArchetypes().get( 0 ) ).getGroupId() );
assertEquals( "artifactId", ( (Archetype) result.getArchetypes().get( 0 ) ).getArtifactId() );
assertEquals( "1", ( (Archetype) result.getArchetypes().get( 0 ) ).getVersion() );
- assertEquals( "http://localhost:18881/repo/", ( (Archetype) result.getArchetypes().get( 0 ) ).getRepository() );
+ assertEquals( "http://localhost:"+ port + "/repo/", ( (Archetype) result.getArchetypes().get( 0 ) ).getRepository() );
}
public void testLocalCatalog()
@@ -72,10 +74,14 @@ public class ArchetypeCatalogsTest
assertEquals( "groupId", ( (Archetype) result.getArchetypes().get( 0 ) ).getGroupId() );
assertEquals( "artifactId", ( (Archetype) result.getArchetypes().get( 0 ) ).getArtifactId() );
assertEquals( "1", ( (Archetype) result.getArchetypes().get( 0 ) ).getVersion() );
- assertEquals( "http://localhost:18881/repo/", ( (Archetype) result.getArchetypes().get( 0 ) ).getRepository() );
+ assertEquals( "http://localhost:"+ port + "/repo/", ( (Archetype) result.getArchetypes().get( 0 ) ).getRepository() );
}
- private Jetty6xEmbeddedLocalContainer cargo;
+ //private Jetty6xEmbeddedLocalContainer cargo;
+
+ private Server server;
+
+ int port;
protected void setUp()
throws Exception
@@ -83,6 +89,22 @@ public class ArchetypeCatalogsTest
super.setUp();
// Start Cargo
+ System.setProperty( "org.apache.maven.archetype.repository.directory",
+ getTestPath( "target/test-classes/repositories/test-catalog" ) );
+
+ server = new Server( 0 );
+
+
+ WebAppContext webapp = new WebAppContext();
+ webapp.setContextPath("/repo");
+ webapp.setWar("target/wars/archetype-repository.war");
+ server.setHandler(webapp);
+
+ server.start();
+
+ port = server.getConnectors()[0].getLocalPort();
+
+
File catalogDirectory = getTestFile( "target/test-classes/repositories/test-catalog" );
catalogDirectory.mkdirs();
@@ -93,7 +115,7 @@ public class ArchetypeCatalogsTest
generatedArchetype.setGroupId( "groupId" );
generatedArchetype.setArtifactId( "artifactId" );
generatedArchetype.setVersion( "1" );
- generatedArchetype.setRepository( "http://localhost:18881/repo/" );
+ generatedArchetype.setRepository( "http://localhost:"+ port + "/repo/" );
catalog.addArchetype( generatedArchetype );
File catalogFile = new File( catalogDirectory, "archetype-catalog.xml" );
@@ -103,18 +125,16 @@ public class ArchetypeCatalogsTest
IOUtils.closeQuietly( writer );
- Jetty6xEmbeddedStandaloneLocalConfiguration configuration =
- new Jetty6xEmbeddedStandaloneLocalConfiguration( "target/repository-webapp" );
- configuration.setProperty( ServletPropertySet.PORT, "18881" );
- System.setProperty( "org.apache.maven.archetype.repository.directory",
- getTestPath( "target/test-classes/repositories/test-catalog" ) );
- cargo = new Jetty6xEmbeddedLocalContainer( configuration );
- cargo.setTimeout( 180000L );
- cargo.start();
+
+
+
+ /*
+
+
DeployableFactory factory = new DefaultDeployableFactory();
- WAR war = (WAR) factory.createDeployable( cargo.getId(),
+ WAR war = (WAR) factory.createDeployable( Jetty6xEmbeddedLocalContainer.ID,
"target/wars/archetype-repository.war",
DeployableType.WAR );
@@ -122,8 +142,10 @@ public class ArchetypeCatalogsTest
Deployer deployer = new Jetty6xEmbeddedLocalDeployer( cargo );
deployer.deploy( war,
- new URLDeployableMonitor( new URL( "http://localhost:18881/repo/dummy" ) ) );
+ new URLDeployableMonitor( new URL( "http://localhost:" + port + "/repo/dummy" ) ) );
deployer.start( war );
+
+ */
}
protected void tearDown()
@@ -131,7 +153,7 @@ public class ArchetypeCatalogsTest
{
super.tearDown();
// Stop Cargo
-
- cargo.stop();
+ server.stop();
+ //cargo.stop();
}
}