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

[hboutemy]

Author: hboutemy
Date: Wed Mar 24 22:37:38 2010
New Revision: 927210

URL: http://svn.apache.org/viewvc?rev=927210&view=rev
Log:
[ARCHETYPE-249] added Apache Camel WAR archetype to internal catalog
Submitted by: Jonathan Anstey

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=927210&r1=927209&r2=927210&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 
Wed Mar 24 22:37:38 2010
@@ -140,6 +140,12 @@
       <description>Creates a new Camel project with added Spring DSL 
support</description>
     </archetype>
     <archetype>
+      <groupId>org.apache.camel.archetypes</groupId>
+      <artifactId>camel-archetype-war</artifactId>
+      <version>RELEASE</version>
+      <description>Creates a new Camel project that deploys the Camel Web 
Console, REST API, and your routes as a WAR</description>
+    </archetype>
+    <archetype>
       <groupId>org.jini.maven-jini-plugin</groupId>
       <artifactId>jini-service-archetype</artifactId>
       <version>2.0</version>

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=927210&r1=927209&r2=927210&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
 Wed Mar 24 22:37:38 2010
@@ -86,6 +86,6 @@ public class CatalogArchetypeDataSinkTes
 
         int catalogSize = catalog.getArchetypes().size();
 
-        assertEquals( 46, catalogSize );
+        assertEquals( 47, 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=927210&r1=927209&r2=927210&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 Mar 24 22:37:38 2010
@@ -17,11 +17,11 @@ public class WikiArchetypeDataSourceTest
         ArchetypeDataSource ads = new InternalCatalogArchetypeDataSource();
         List archetypes = ads.getArchetypeCatalog( p ).getArchetypes();
 
-        assertEquals( 46, archetypes.size() );
+        assertEquals( 47, archetypes.size() );
 
         Archetype a = (Archetype) lookup(Archetype.class.getName());
         archetypes=a.getInternalCatalog().getArchetypes();
 
-        assertEquals( 46, archetypes.size() );
+        assertEquals( 47, archetypes.size() );
     }
 }