You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/09/29 05:55:26 UTC
svn commit: r451109 - in /geronimo/server/trunk/assemblies:
geronimo-framework/pom.xml geronimo-jetty-j2ee/pom.xml
geronimo-jetty-minimal/pom.xml geronimo-tomcat-j2ee/pom.xml
geronimo-tomcat-minimal/pom.xml
Author: jdillon
Date: Thu Sep 28 20:55:24 2006
New Revision: 451109
URL: http://svn.apache.org/viewvc?view=rev&rev=451109
Log:
Using application-assembly packaging for assembly modules
Modified:
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=diff&rev=451109&r1=451108&r2=451109
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Thu Sep 28 20:55:24 2006
@@ -30,13 +30,7 @@
<artifactId>geronimo-framework</artifactId>
<name>Geronimo Assemblies :: Minimal Framework</name>
- <!--
-
- HACK: See build/resources below...
-
- <packaging>pom</packaging>
- -->
- <packaging>jar</packaging>
+ <packaging>application-assembly</packaging>
<description>
A minimal Geronimo server (Little-G) framework assembly.
@@ -139,12 +133,6 @@
<build>
<resources>
- <!--
- HACK: Because this is a pom packaging and assembly files/file is broke
- we need to filter with the resources plugin... and must be a jar packaging
- because for some %^&#ing reason maven-resources-plugin can not
- be attached!!!!
- -->
<resource>
<directory>${pom.basedir}/src/main/var/config</directory>
<includes>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml?view=diff&rev=451109&r1=451108&r2=451109
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml Thu Sep 28 20:55:24 2006
@@ -30,11 +30,7 @@
<artifactId>geronimo-jetty-j2ee</artifactId>
<name>Geronimo Assemblies :: J2EE + Jetty</name>
- <!--
- HACK: See build/resources below...
- <packaging>pom</packaging>
- -->
- <packaging>jar</packaging>
+ <packaging>application-assembly</packaging>
<description>
An assembly of Geronimo into a J2EE Server using Jetty as the web container.
@@ -284,12 +280,6 @@
<build>
<resources>
- <!--
- HACK: Because this is a pom packaging and assembly files/file is broke
- we need to filter with the resources plugin... and must be a jar packaging
- because for some %^&#ing reason maven-resources-plugin can not
- be attached!!!!
- -->
<resource>
<directory>${pom.basedir}/src/main/var/config</directory>
<includes>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml?view=diff&rev=451109&r1=451108&r2=451109
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml Thu Sep 28 20:55:24 2006
@@ -30,13 +30,7 @@
<artifactId>geronimo-jetty-minimal</artifactId>
<name>Geronimo Assemblies :: Minimal + Jetty</name>
- <!--
-
- HACK: See build/resources below...
-
- <packaging>pom</packaging>
- -->
- <packaging>jar</packaging>
+ <packaging>application-assembly</packaging>
<description>
A minimal Geronimo server (Little-G) assembly using the Jetty web-container.
@@ -160,12 +154,6 @@
<build>
<resources>
- <!--
- HACK: Because this is a pom packaging and assembly files/file is broke
- we need to filter with the resources plugin... and must be a jar packaging
- because for some %^&#ing reason maven-resources-plugin can not
- be attached!!!!
- -->
<resource>
<directory>${pom.basedir}/src/main/var/config</directory>
<includes>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml?view=diff&rev=451109&r1=451108&r2=451109
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml Thu Sep 28 20:55:24 2006
@@ -30,13 +30,7 @@
<artifactId>geronimo-tomcat-j2ee</artifactId>
<name>Geronimo Assemblies :: J2EE + Tomcat</name>
- <!--
-
- HACK: See build/resources below...
-
- <packaging>pom</packaging>
- -->
- <packaging>jar</packaging>
+ <packaging>application-assembly</packaging>
<description>
An assembly of Geronimo into a J2EE Server using Tomcat as the web container.
@@ -272,12 +266,6 @@
<build>
<resources>
- <!--
- HACK: Because this is a pom packaging and assembly files/file is broke
- we need to filter with the resources plugin... and must be a jar packaging
- because for some %^&#ing reason maven-resources-plugin can not
- be attached!!!!
- -->
<resource>
<directory>${pom.basedir}/src/main/var/config</directory>
<includes>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml?view=diff&rev=451109&r1=451108&r2=451109
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml Thu Sep 28 20:55:24 2006
@@ -30,13 +30,7 @@
<artifactId>geronimo-tomcat-minimal</artifactId>
<name>Geronimo Assemblies :: Minimal + Tomcat</name>
- <!--
-
- HACK: See build/resources below...
-
- <packaging>pom</packaging>
- -->
- <packaging>jar</packaging>
+ <packaging>application-assembly</packaging>
<description>
A minimal Geronimo server (Little-G) assembly using the Tomcat web-container.
@@ -160,12 +154,6 @@
<build>
<resources>
- <!--
- HACK: Because this is a pom packaging and assembly files/file is broke
- we need to filter with the resources plugin... and must be a jar packaging
- because for some %^&#ing reason maven-resources-plugin can not
- be attached!!!!
- -->
<resource>
<directory>${pom.basedir}/src/main/var/config</directory>
<includes>