Return-Path: 
 <scm-return-27907-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 40257 invoked from network); 23 Apr 2008 14:28:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Apr 2008 14:28:43 -0000
Received: (qmail 93080 invoked by uid 500); 23 Apr 2008 14:28:41 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 93044 invoked by uid 500); 23 Apr 2008 14:28:41 -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 93026 invoked by uid 99); 23 Apr 2008 14:28:41 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 07:28:41 -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; Wed, 23 Apr 2008 14:28:05 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 094F61A9838; Wed, 23 Apr 2008 07:28:19 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r650889 - in /geronimo/server/trunk/assemblies:
 geronimo-boilerplate-minimal/pom.xml geronimo-framework/pom.xml
 geronimo-jetty6-javaee5/pom.xml geronimo-jetty6-minimal/pom.xml
 geronimo-tomcat6-javaee5/pom.xml
Date: Wed, 23 Apr 2008 14:28:15 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080423142819.094F61A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Wed Apr 23 07:28:12 2008
New Revision: 650889

URL: http://svn.apache.org/viewvc?rev=650889&view=rev
Log:
Use jar instead of resource-bundle
Tidy up poms

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=650889&r1=650888&r2=650889&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Wed Apr 23 07:28:12 2008
@@ -33,8 +33,6 @@
     <groupId>org.apache.geronimo.assemblies</groupId>
     <artifactId>geronimo-boilerplate-minimal</artifactId>
     <name>Geronimo Assemblies :: Boilerplate Minimal</name>
-    <packaging>resource-bundle</packaging>
-    <!--<packaging>jar</packaging>-->
 
     <description>
         Provides boilerplate files for all Geronimo minimal server (Little-G) assemblies.
@@ -403,7 +401,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-1</version>
                 <executions>
                     <execution>
                         <id>boilerplate</id>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=650889&r1=650888&r2=650889&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Wed Apr 23 07:28:12 2008
@@ -152,7 +152,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
-
                     <execution>
                         <id>unpack-schemas</id>
                         <phase>generate-resources</phase>
@@ -203,7 +202,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
     

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=650889&r1=650888&r2=650889&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Wed Apr 23 07:28:12 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-jetty6-javaee5</artifactId>
@@ -650,6 +649,7 @@
                             </tasks>
                         </configuration>
                     </execution>
+                    
                     <execution>
                         <id>copy-schemas</id>
                         <phase>process-resources</phase>
@@ -672,7 +672,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?rev=650889&r1=650888&r2=650889&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Wed Apr 23 07:28:12 2008
@@ -303,6 +303,7 @@
                             </tasks>
                         </configuration>
                     </execution>
+                    
                     <execution>
                         <id>copy-schemas</id>
                         <phase>process-resources</phase>
@@ -325,7 +326,6 @@
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=650889&r1=650888&r2=650889&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Wed Apr 23 07:28:12 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-tomcat6-javaee5</artifactId>