You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ra...@apache.org on 2008/02/26 22:02:34 UTC

svn commit: r631378 - /maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java

Author: rafale
Date: Tue Feb 26 13:02:32 2008
New Revision: 631378

URL: http://svn.apache.org/viewvc?rev=631378&view=rev
Log:
renamed container to jettyContainer to no longer hide the plexus container

Modified:
    maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java

Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java?rev=631378&r1=631377&r2=631378&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java Tue Feb 26 13:02:32 2008
@@ -58,7 +58,7 @@
 public class ArchetyperRoundtripWithProxyTest
     extends PlexusTestCase
 {
-    Jetty6xEmbeddedLocalContainer container;
+    Jetty6xEmbeddedLocalContainer jettyContainer;
 
     public void testArchetyper()
         throws Exception
@@ -204,18 +204,18 @@
 
         System.setProperty( "org.apache.maven.archetype.reporitory.directory",
             getTestPath( "target/test-classes/repositories/central" ) );
-        container = new Jetty6xEmbeddedLocalContainer( configuration );
-        container.setTimeout( 180000L );
-        container.start();
+        jettyContainer = new Jetty6xEmbeddedLocalContainer( configuration );
+        jettyContainer.setTimeout( 180000L );
+        jettyContainer.start();
 
         DeployableFactory factory = new DefaultDeployableFactory();
-        WAR war = (WAR) factory.createDeployable( container.getId(),
+        WAR war = (WAR) factory.createDeployable( jettyContainer.getId(),
             "target/wars/archetype-proxy.war",
             DeployableType.WAR );
 
         war.setContext( "/" );
 
-        Deployer deployer = new Jetty6xEmbeddedLocalDeployer( container );
+        Deployer deployer = new Jetty6xEmbeddedLocalDeployer( jettyContainer  );
         deployer.deploy( war,
             new URLDeployableMonitor( new URL( "http://localhost:18882/dummy" ) ) );
         deployer.start( war );
@@ -228,6 +228,6 @@
         super.tearDown();
         //        Stop Cargo
 
-        container.stop();
+        jettyContainer.stop();
     }
 }