svn commit: r642570 - in /maven/archetype/trunk: archetype-common/src/test/java/org/apache/maven/archetype/test/ archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/pr...

[rafale]

Author: rafale
Date: Sat Mar 29 11:10:27 2008
New Revision: 642570

URL: http://svn.apache.org/viewvc?rev=642570&view=rev
Log:
Try to fix the windows build issue

Modified:
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
    
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
    
maven/archetype/trunk/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.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=642570&r1=642569&r2=642570&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
 Sat Mar 29 11:10:27 2008
@@ -59,6 +59,7 @@
     extends PlexusTestCase
 {
     Jetty6xEmbeddedLocalContainer jettyContainer;
+    Jetty6xEmbeddedLocalContainer jettyContainer2;
 
     public void testArchetyper()
         throws Exception
@@ -219,6 +220,29 @@
         deployer.deploy( war,
             new URLDeployableMonitor( new URL( "http://localhost:18882/dummy"; 
) ) );
         deployer.start( war );
+        
+        
+        Jetty6xEmbeddedStandaloneLocalConfiguration configuration2 =
+            new Jetty6xEmbeddedStandaloneLocalConfiguration( 
"target/repository-webapp" );
+        configuration2.setProperty( ServletPropertySet.PORT, "18881" );
+
+        System.setProperty( "org.apache.maven.archetype.reporitory.directory",
+            getTestPath( "target/test-classes/repositories/central" ) );
+        jettyContainer2 = new Jetty6xEmbeddedLocalContainer( configuration2 );
+        jettyContainer2.setTimeout( 180000L );
+        jettyContainer2.start();
+
+        DeployableFactory factory2 = new DefaultDeployableFactory();
+        WAR war2 = (WAR) factory2.createDeployable( jettyContainer2.getId(),
+            "target/wars/archetype-repository.war",
+            DeployableType.WAR );
+
+        war2.setContext( "/" );
+
+        Deployer deployer2 = new Jetty6xEmbeddedLocalDeployer( jettyContainer2 
);
+        deployer2.deploy( war2,
+            new URLDeployableMonitor( new URL( 
"http://localhost:18881/repo/dummy"; ) ) );
+        deployer2.start( war );
 
     }
 
@@ -229,5 +253,6 @@
         //        Stop Cargo
 
         jettyContainer.stop();
+        jettyContainer2.stop();
     }
 }

Modified: 
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java?rev=642570&r1=642569&r2=642570&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
 (original)
+++ 
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
 Sat Mar 29 11:10:27 2008
@@ -106,9 +106,6 @@
                 ad.getArtifactId() + "-repo" );
             repositories.add( archetypeRepository );
         }
-//        System.err.println("repositories"+repositories);
-//        System.err.println("archetypeRepository"+archetypeRepository);
-//        System.err.println("A 
request.getArchetypeRepository()"+request.getArchetypeRepository());
         if ( !archetypeArtifactManager.exists( ad.getGroupId(), 
ad.getArtifactId(),
             ad.getVersion(), archetypeRepository, localRepository, 
repositories ) )
         {

Modified: 
maven/archetype/trunk/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java?rev=642570&r1=642569&r2=642570&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
 (original)
+++ 
maven/archetype/trunk/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
 Sat Mar 29 11:10:27 2008
@@ -123,7 +123,7 @@
         response.setHeader( "Server", null );
 
 
-        log( "Requested file = " + request.getRequestURI(  ) );
+        log( "Proxy Requested file = " + request.getRequestURI(  ) );
         String filePath =
             System.getProperty( 
"org.apache.maven.archetype.reporitory.directory" ).trim(  ) + "/" +
             request.getRequestURI(  );