Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 59851 invoked from network); 8 Apr 2010 20:32:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Apr 2010 20:32:22 -0000 Received: (qmail 63139 invoked by uid 500); 8 Apr 2010 20:32:22 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 63086 invoked by uid 500); 8 Apr 2010 20:32:22 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 63079 invoked by uid 99); 8 Apr 2010 20:32:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 20:32:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 20:32:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BB39323889B9; Thu, 8 Apr 2010 20:31:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r932093 - in /maven/archetype/trunk/archetype-common/src: main/resources/ test/java/org/apache/maven/archetype/source/ Date: Thu, 08 Apr 2010 20:31:58 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100408203158.BB39323889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ de.akquinet.jbosscc jbosscc-seam-archetype RELEASE - Maven Archetype to generate a Seam Application + Maven Archetype to generate a Seam Application- Documentation org.apache.maven.archetypes @@ -275,19 +275,19 @@ org.apache.cocoon cocoon-22-archetype-block-plain RELEASE - [http://cocoon.apache.org/2.2/maven-plugins/] + http://cocoon.apache.org/2.2/maven-plugins/ org.apache.cocoon cocoon-22-archetype-block RELEASE - [http://cocoon.apache.org/2.2/maven-plugins/] + http://cocoon.apache.org/2.2/maven-plugins/ org.apache.cocoon cocoon-22-archetype-webapp RELEASE - [http://cocoon.apache.org/2.2/maven-plugins/] + http://cocoon.apache.org/2.2/maven-plugins/ org.apache.myfaces.buildtools 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() ); } }