svn commit: r932093 - in /maven/archetype/trunk/archetype-common/src: main/resources/ test/java/org/apache/maven/archetype/source/

[hboutemy]

Author: hboutemy
Date: Thu Apr  8 20:31:58 2010
New Revision: 932093

URL: http://svn.apache.org/viewvc?rev=932093&view=rev
Log:
updated internal catalog after parsing fixes

Modified:
    
maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java

Modified: 
maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml?rev=932093&r1=932092&r2=932093&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml 
(original)
+++ 
maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml 
Thu Apr  8 20:31:58 2010
@@ -169,7 +169,7 @@
       <groupId>de.akquinet.jbosscc</groupId>
       <artifactId>jbosscc-seam-archetype</artifactId>
       <version>RELEASE</version>
-      <description>Maven Archetype to generate a Seam Application</description>
+      <description>Maven Archetype to generate a Seam Application- 
Documentation</description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
@@ -275,19 +275,19 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-22-archetype-block-plain</artifactId>
       <version>RELEASE</version>
-      <description>[http://cocoon.apache.org/2.2/maven-plugins/]</description>
+      <description>http://cocoon.apache.org/2.2/maven-plugins/</description>
     </archetype>
     <archetype>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-22-archetype-block</artifactId>
       <version>RELEASE</version>
-      <description>[http://cocoon.apache.org/2.2/maven-plugins/]</description>
+      <description>http://cocoon.apache.org/2.2/maven-plugins/</description>
     </archetype>
     <archetype>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-22-archetype-webapp</artifactId>
       <version>RELEASE</version>
-      <description>[http://cocoon.apache.org/2.2/maven-plugins/]</description>
+      <description>http://cocoon.apache.org/2.2/maven-plugins/</description>
     </archetype>
     <archetype>
       <groupId>org.apache.myfaces.buildtools</groupId>

Modified: 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java?rev=932093&r1=932092&r2=932093&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
 Thu Apr  8 20:31:58 2010
@@ -86,6 +86,6 @@ public class CatalogArchetypeDataSinkTes
 
         int catalogSize = catalog.getArchetypes().size();
 
-        assertEquals( 56, catalogSize );
+        assertEquals( WikiArchetypeDataSourceTest.ARCHETYPES_COUNT, 
catalogSize );
     }
 }

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=932093&r1=932092&r2=932093&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
 Thu Apr  8 20:31:58 2010
@@ -10,6 +10,8 @@ import org.apache.maven.archetype.Archet
 public class WikiArchetypeDataSourceTest
     extends PlexusTestCase
 {
+    static final int ARCHETYPES_COUNT = 58;
+
     public void testWikiArchetypeDataSource()
         throws Exception
     {
@@ -17,11 +19,11 @@ public class WikiArchetypeDataSourceTest
         ArchetypeDataSource ads = new InternalCatalogArchetypeDataSource();
         List archetypes = ads.getArchetypeCatalog( p ).getArchetypes();
 
-        assertEquals( 56, archetypes.size() );
+        assertEquals( ARCHETYPES_COUNT, archetypes.size() );
 
         ArchetypeManager a = (ArchetypeManager) lookup( 
ArchetypeManager.class.getName() );
         archetypes = a.getInternalCatalog().getArchetypes();
 
-        assertEquals( 56, archetypes.size() );
+        assertEquals( ARCHETYPES_COUNT, archetypes.size() );
     }
 }