svn commit: r612587 - in /maven/archetype/trunk: ./ archetype-common/src/test/java/org/apache/maven/archetype/ archetype-common/src/test/java/org/apache/maven/archetype/source/ archetype-common/src/test/java/org/apache/maven/archetype/test/

[rafale]

Author: rafale
Date: Wed Jan 16 14:11:24 2008
New Revision: 612587

URL: http://svn.apache.org/viewvc?rev=612587&view=rev
Log:
Fixed the profile 2.0 without tests.
by using the stable plexus-container-default for that profile and 
fixing the lookup in tests cases

Modified:
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
    maven/archetype/trunk/pom.xml

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=612587&r1=612586&r2=612587&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 Jan 16 14:11:24 2008
@@ -48,7 +48,7 @@
         throws Exception
     {
 
-        Archetype archetype = (Archetype) lookup( Archetype.class );
+        Archetype archetype = (Archetype) lookup( Archetype.class.getName() );
 
         ArchetypeCatalog result = archetype.getRemoteCatalog( 
"http://localhost:18881/repo/"; );
 
@@ -67,7 +67,7 @@
         throws Exception
     {
 
-        Archetype archetype = (Archetype) lookup( Archetype.class );
+        Archetype archetype = (Archetype) lookup( Archetype.class.getName() );
 
         ArchetypeCatalog result = archetype.getLocalCatalog( getTestFile( 
"target/test-classes/repositories/test-catalog" ).
             getAbsolutePath() );

Modified: 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java?rev=612587&r1=612586&r2=612587&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
 Wed Jan 16 14:11:24 2008
@@ -20,7 +20,7 @@
 
         assertEquals( 36, archetypes.size() );
 
-        Archetype a = (Archetype) lookup(Archetype.class);
+        Archetype a = (Archetype) lookup(Archetype.class.getName());
         archetypes=a.getInternalCatalog().getArchetypes();
 
         assertEquals( 36, archetypes.size() );

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=612587&r1=612586&r2=612587&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
 Wed Jan 16 14:11:24 2008
@@ -172,7 +172,7 @@
             "target/test-classes/projects/roundtrip-2-recreatedproject" 
).getAbsolutePath();
         FileUtils.forceDelete(outputDirectory);
 
-        WagonManager manager = (WagonManager) lookup(WagonManager.class);
+        WagonManager manager = (WagonManager) 
lookup(WagonManager.class.getName());
         manager.addProxy("http", "localhost", 18882, null, null, null);
 
         ArchetypeGenerationRequest agr =

Modified: 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java?rev=612587&r1=612586&r2=612587&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
 Wed Jan 16 14:11:24 2008
@@ -51,7 +51,7 @@
         File outputDirectory = new File(getBasedir(), 
"target/internal-archetypes-projects");
         outputDirectory.mkdirs();
         
-        Archetype archetype = (Archetype) lookup ( Archetype.class );
+        Archetype archetype = (Archetype) lookup ( Archetype.class.getName() );
 
         ArchetypeCatalog result = archetype.getInternalCatalog ();
 

Modified: maven/archetype/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=612587&r1=612586&r2=612587&view=diff
==============================================================================
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Wed Jan 16 14:11:24 2008
@@ -262,7 +262,7 @@
             </activation>
             <properties>
                 <mavenVersion>2.0.8</mavenVersion>
-                <maven.test.skip>true</maven.test.skip>
+                <!--maven.test.skip>true</maven.test.skip-->
             </properties>
             <dependencyManagement>
                 <dependencies>
@@ -326,7 +326,7 @@
                     <dependency>
                         <groupId>org.codehaus.plexus</groupId>
                         <artifactId>plexus-container-default</artifactId>
-                        <version>1.0-alpha-40</version>
+                        <version>1.0-alpha-9-stable-1</version>
                     </dependency>
                     <dependency>
                         <groupId>org.codehaus.plexus</groupId>