Return-Path: 
 <commits-return-17049-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: (qmail 26746 invoked from network); 18 Mar 2008 20:35:16 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 Mar 2008 20:35:16 -0000
Received: (qmail 43739 invoked by uid 500); 18 Mar 2008 20:35:13 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 43690 invoked by uid 500); 18 Mar 2008 20:35:13 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 43673 invoked by uid 99); 18 Mar 2008 20:35:13 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2008 13:35:13 -0700
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.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2008 20:34:33 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6439B1A9832; Tue, 18 Mar 2008 13:34:44 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r638556 -
 /maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml
Date: Tue, 18 Mar 2008 20:34:43 -0000
To: commits@maven.apache.org
From: rafale@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080318203444.6439B1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rafale
Date: Tue Mar 18 13:34:41 2008
New Revision: 638556

URL: http://svn.apache.org/viewvc?rev=638556&view=rev
Log:
Updated the internal catalog

Modified:
    maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml

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=638556&r1=638555&r2=638556&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 Tue Mar 18 13:34:41 2008
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-catalog>
+<?xml version="1.0" encoding="UTF-8"?><archetype-catalog>
   <archetypes>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-basic-jsf</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a web application with Hibernate, Spring and JSF</description>
     </archetype>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-basic-spring</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a web application with Hibernate, Spring and Spring MVC</description>
     </archetype>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-basic-struts</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a web application with Hibernate, Spring and Struts 2</description>
     </archetype>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-basic-tapestry</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a web application with Hibernate, Spring and Tapestry 4</description>
     </archetype>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-core</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a jar application with Hibernate and Spring and XFire</description>
     </archetype>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-modular-jsf</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a modular application with Hibernate, Spring and JSF</description>
     </archetype>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-modular-spring</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a modular application with Hibernate, Spring and Spring MVC</description>
     </archetype>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-modular-struts</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a modular application with Hibernate, Spring and Struts 2</description>
     </archetype>
     <archetype>
       <groupId>org.appfuse.archetypes</groupId>
       <artifactId>appfuse-modular-tapestry</artifactId>
       <version>2.0</version>
-      <repository>http://static.appfuse.org/releases</repository>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>AppFuse archetype for creating a modular application with Hibernate, Spring and Tapestry 4</description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-j2ee-simple</artifactId>
-      <version>1.0</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description>A simple J2EE Java application</description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-marmalade-mojo</artifactId>
-      <version>1.0-alpha-3</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description>A Maven plugin development project using marmalade</description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-mojo</artifactId>
-      <version>1.0</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description>A Maven Java plugin development project</description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-portlet</artifactId>
-      <version>1.0.1</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description>A simple portlet application</description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-profiles</artifactId>
-      <version>1.0-alpha-4</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description></description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-quickstart</artifactId>
-      <version>1.0</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description></description>
     </archetype>
@@ -118,21 +117,21 @@
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-site-simple</artifactId>
-      <version>1.0</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description>A simple site generation project</description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-site</artifactId>
-      <version>1.0</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description>A more complex site project</description>
     </archetype>
     <archetype>
       <groupId>org.apache.maven.archetypes</groupId>
       <artifactId>maven-archetype-webapp</artifactId>
-      <version>1.0</version>
+      <version>RELEASE</version>
       <repository>http://repo1.maven.org/maven2</repository>
       <description>A simple Java web application</description>
     </archetype>
@@ -230,18 +229,25 @@
     <archetype>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-bundle-archetype</artifactId>
-      <version>1.0-m3-SNAPSHOT</version>
-      <repository>http://static.springframework.org/maven2-snapshots</repository>
+      <version>1.0</version>
+      <repository>http://repo1.maven.org/maven2</repository>
       <description>Spring-OSGi archetype</description>
     </archetype>
     <archetype>
       <groupId>com.atlassian.maven.archetypes</groupId>
       <artifactId>confluence-plugin-archetype</artifactId>
-      <version>RELEASE</version>
-      <repository>http://repository.atlassian.com/maven2</repository>
+      <version>4</version>
+      <repository>https://maven.atlassian.com/public</repository>
       <description>Atlassian Confluence plugin archetype</description>
     </archetype>
     <archetype>
+      <groupId>com.atlassian.maven.archetypes</groupId>
+      <artifactId>jira-plugin-archetype</artifactId>
+      <version>5</version>
+      <repository>https://maven.atlassian.com/public</repository>
+      <description>Atlassian JIRA plugin archetype</description>
+    </archetype>
+    <archetype>
       <groupId>net.sf.maven-har</groupId>
       <artifactId>maven-archetype-har</artifactId>
       <version>0.9</version>
@@ -262,6 +268,54 @@
       <repository>http://repo1.maven.org/maven2</repository>
       <description>A simple Apache Wicket project</description>
     </archetype>
+    <archetype>
+      <groupId>org.apache.tapestry</groupId>
+      <artifactId>quickstart</artifactId>
+      <version>LATEST</version>
+      <repository>http://tapestry.formos.com/maven-snapshot-repository/</repository>
+      <description>A simple Apache Tapestry 5 Project</description>
+    </archetype>
+    <archetype>
+      <groupId>org.scala-tools.archetypes</groupId>
+      <artifactId>scala-archetype-simple</artifactId>
+      <version>1.1</version>
+      <repository>http://scala-tools.org/repo-releases</repository>
+      <description>A simple scala project</description>
+    </archetype>
+    <archetype>
+      <groupId>net.liftweb</groupId>
+      <artifactId>lift-archetype-blank</artifactId>
+      <version>0.6</version>
+      <repository>http://scala-tools.org/repo-releases</repository>
+      <description>A blank/empty liftweb project</description>
+    </archetype>
+    <archetype>
+      <groupId>net.liftweb</groupId>
+      <artifactId>lift-archetype-basic</artifactId>
+      <version>0.6</version>
+      <repository>http://scala-tools.org/repo-releases</repository>
+      <description>The basic (liftweb) project</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-22-archetype-block-plain</artifactId>
+      <version>1.0.0-RC2</version>
+      <repository>http://repo1.maven.org/maven2</repository>
+      <description>[http://cocoon.apache.org/2.2/maven-plugins/]</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-22-archetype-block</artifactId>
+      <version>1.0.0-RC2</version>
+      <repository>http://repo1.maven.org/maven2</repository>
+      <description>[http://cocoon.apache.org/2.2/maven-plugins/]</description>
+    </archetype>
+    <archetype>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-22-archetype-webapp</artifactId>
+      <version>1.0.0-RC2</version>
+      <repository>http://repo1.maven.org/maven2</repository>
+      <description>[http://cocoon.apache.org/2.2/maven-plugins/]</description>
+    </archetype>
   </archetypes>
-</archetype-catalog>
-
+</archetype-catalog>
\ No newline at end of file