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/archety

2008-03-29 Thread 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( 18L );
+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.g

svn commit: r642628 - in /maven/archetype/trunk: archetype-common/src/main/java/org/apache/maven/archetype/downloader/ archetype-common/src/main/java/org/apache/maven/archetype/generator/ archetype-co

2008-03-29 Thread rafale 
Author: rafale
Date: Sat Mar 29 15:24:49 2008
New Revision: 642628

URL: http://svn.apache.org/viewvc?rev=642628&view=rev
Log:
Fix for ARCHETYPE-150, ARCHETYPE-149, ARCHETYPE-144, ARCHETYPE-137

Modified:

maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java

maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java

maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java

maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java

maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java

maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java

Modified: 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java?rev=642628&r1=642627&r2=642628&view=diff
==
--- 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/DefaultDownloader.java
 Sat Mar 29 15:24:49 2008
@@ -77,28 +77,28 @@
 
 return artifact.getFile();
 }
-//public File downloadOld( String groupId,
-//  String artifactId,
-//  String version,
-//  ArtifactRepository archetypeRepository,
-//  ArtifactRepository localRepository,
-// List remoteRepositories )
-//throws DownloadException, DownloadNotFoundException
-//   {
-//Artifact artifact = artifactFactory.createArtifact( groupId, 
artifactId, version, Artifact.SCOPE_RUNTIME, "jar" );
-//try
-//{
-//artifactResolver.resolveAlways( artifact, remoteRepositories, 
localRepository );
-//}
-//catch ( ArtifactResolutionException e )
-//{
-//throw new DownloadException( "Error downloading.", e );
-//}
-//catch ( ArtifactNotFoundException e )
-//{
-//throw new DownloadNotFoundException( "Requested download does 
not exist.", e );
-//}
-//
-//return artifact.getFile();
-//}
+public File downloadOld( String groupId,
+  String artifactId,
+  String version,
+  ArtifactRepository archetypeRepository,
+  ArtifactRepository localRepository,
+ List remoteRepositories )
+throws DownloadException, DownloadNotFoundException
+   {
+Artifact artifact = artifactFactory.createArtifact( groupId, 
artifactId, version, Artifact.SCOPE_RUNTIME, "jar" );
+try
+{
+artifactResolver.resolveAlways( artifact, remoteRepositories, 
localRepository );
+}
+catch ( ArtifactResolutionException e )
+{
+throw new DownloadException( "Error downloading.", e );
+}
+catch ( ArtifactNotFoundException e )
+{
+throw new DownloadNotFoundException( "Requested download does not 
exist.", e );
+}
+
+return artifact.getFile();
+}
 }

Modified: 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java?rev=642628&r1=642627&r2=642628&view=diff
==
--- 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/downloader/Downloader.java
 Sat Mar 29 15:24:49 2008
@@ -20,11 +20,11 @@
   List remoteRepositories )
 throws DownloadException, DownloadNotFoundException;
 
-//public File downloadOld( String groupId,
-//  String artifactId,
-//  String version,
-//  ArtifactRepository archetypeRepository,
-//  ArtifactRepository localRepository,
-//  List remoteRepositories )
-//throws DownloadException, DownloadNotFoundException;
+public File downloadOld( String groupId,
+  String artifactId,
+  String version,