Return-Path: 
 <scm-return-28301-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 22526 invoked from network); 19 May 2008 17:34:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 May 2008 17:34:22 -0000
Received: (qmail 44365 invoked by uid 500); 19 May 2008 17:34:23 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 44317 invoked by uid 500); 19 May 2008 17:34:23 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 44306 invoked by uid 99); 19 May 2008 17:34:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 May 2008 10:34:23 -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.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 May 2008 17:33:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EF520238898E; Mon, 19 May 2008 10:34:00 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r657877 - in /geronimo/samples/branches/2.1:
 geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
 samples/pom.xml
Date: Mon, 19 May 2008 17:34:00 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080519173400.EF520238898E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbohn
Date: Mon May 19 10:34:00 2008
New Revision: 657877

URL: http://svn.apache.org/viewvc?rev=657877&view=rev
Log:
changes to make archetype work for plugins

Modified:
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
    geronimo/samples/branches/2.1/samples/pom.xml

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml?rev=657877&r1=657876&r2=657877&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml Mon May 19 10:34:00 2008
@@ -26,8 +26,8 @@
     <resources>
         <resource>pom.xml</resource>
         <resource>sample-ear/pom.xml</resource>
-        <resource>sample-ejb/pom.xml</resource>
         <resource>sample-ear/src/main/resources/META-INF/geronimo-application.xml</resource>
+        <resource>sample-ejb/pom.xml</resource>
         <resource>sample-ejb/src/main/java/org/apache/geronimo/samples/ejb/SampleBean.java</resource>
         <resource>sample-ejb/src/main/java/org/apache/geronimo/samples/ejb/SampleBeanLocal.java</resource>
         <resource>sample-ejb/src/main/java/org/apache/geronimo/samples/ejb/SampleBeanRemote.java</resource>
@@ -38,12 +38,8 @@
         <resource>sample-war/src/main/webapp/sample-docu.jsp</resource>
         <resource>sample-war/src/main/webapp/WEB-INF/web.xml</resource>
         <resource>sample-jetty/pom.xml</resource>
-        <resource>sample-jetty/LICENSE.txt</resource>
-        <resource>sample-jetty/NOTICE.txt</resource>
         <resource>sample-jetty/src/main/plan/plan.xml</resource>
         <resource>sample-tomcat/pom.xml</resource>
-        <resource>sample-tomcat/LICENSE.txt</resource>
-        <resource>sample-tomcat/NOTICE.txt</resource>
         <resource>sample-tomcat/src/main/plan/plan.xml</resource>
     </resources>
 </archetype>

Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=657877&r1=657876&r2=657877&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Mon May 19 10:34:00 2008
@@ -305,6 +305,8 @@
                                         <move file="${sampleName}/sample-ear" tofile="${sampleName}/${sampleName}-ear"/>
                                         <move file="${sampleName}/sample-ejb" tofile="${sampleName}/${sampleName}-ejb"/>
                                         <move file="${sampleName}/sample-war" tofile="${sampleName}/${sampleName}-war"/>
+                                        <move file="${sampleName}/sample-jetty" tofile="${sampleName}/${sampleName}-jetty"/>
+                                        <move file="${sampleName}/sample-tomcat" tofile="${sampleName}/${sampleName}-tomcat"/>
                                     </tasks>
                                 </configuration>
                                 <goals>