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/08/11 09:35:29 UTC
svn commit: r430712 - in /geronimo/trunk/m2-assemblies:
geronimo-boilerplate-j2ee/src/main/resources/var/
geronimo-boilerplate-minimal/ geronimo-jetty-j2ee/
geronimo-jetty-j2ee/src/main/assembly/ geronimo-jetty-minimal/
geronimo-jetty-minimal/src/main/...
Author: jdillon
Date: Fri Aug 11 00:35:28 2006
New Revision: 430712
URL: http://svn.apache.org/viewvc?rev=430712&view=rev
Log:
Moved common lib, lib/endorsed setup to geronimo-boilerplate-minimal
Removed uneeded jar deps from all assemblies
Moved commons schema extraction to geronimo-boilerplate-minimal, only jetty or tomcat schema extraction done in assemblies
Added hot deployer dep to minimal assemblies so they can boot properly
Removed:
geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/
Modified:
geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml
geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml
geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml
geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
Modified: geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml Fri Aug 11 00:35:28 2006
@@ -36,10 +36,6 @@
Provides boilerplate files for all Geronimo minimal server (Little-G) assemblies.
</description>
- <!--
- TODO: Move schema inclusion here, since most of it is common
- -->
-
<build>
<resources>
<resource>
@@ -55,6 +51,220 @@
<directory>${pom.basedir}/src/main/resources</directory>
</resource>
</resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-lib</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-qname_1.1_spec</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>install-lib-endorsed</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/classes/lib/endorsed</outputDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>unpack-schemas</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-axis-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-client-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-web-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>flatten-schemas</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.directory}/classes/schema"/>
+ <copy todir="${project.build.directory}/classes/schema">
+ <fileset dir="${project.build.directory}/scratch/schema">
+ <include name="**/*.xsd"/>
+ <include name="**/*.dtd"/>
+ </fileset>
+ <mapper type="flatten"/>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml Fri Aug 11 00:35:28 2006
@@ -31,9 +31,7 @@
<artifactId>geronimo-jetty-j2ee</artifactId>
<name>Geronimo Assemblies :: J2EE + Jetty</name>
<!--
-
- HACK: See build/resources below...
-
+ HACK: See build/resources below...
<packaging>pom</packaging>
-->
<packaging>jar</packaging>
@@ -269,285 +267,11 @@
<type>car</type>
</dependency>
- <!-- lib dependencies -->
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
-
- <!-- endorsed -->
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-directory</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jmx-remoting</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-mail</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-timer</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
- </dependency>
</dependencies>
<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
@@ -580,7 +304,6 @@
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-boilerplate-j2ee</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -604,7 +327,6 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-scripts</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scripts</outputDirectory>
@@ -621,63 +343,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty-builder</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml Fri Aug 11 00:35:28 2006
@@ -35,39 +35,13 @@
<includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>backport-util-concurrent:backport-util-concurrent</include>
- <include>cglib:cglib-nodep</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-logging:commons-logging</include>
- <include>concurrent:concurrent</include>
- <include>org.apache.geronimo.modules:geronimo-common</include>
- <include>org.apache.geronimo.modules:geronimo-deploy-jsr88</include>
- <include>org.apache.geronimo.modules:geronimo-deploy-tool</include>
- <include>org.apache.geronimo.modules:geronimo-deployment</include>
- <include>org.apache.geronimo.modules:geronimo-kernel</include>
- <include>org.apache.geronimo.modules:geronimo-system</include>
- <include>org.apache.geronimo.modules:geronimo-util</include>
- <include>org.apache.geronimo.specs:geronimo-qname_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-deployment_1.1_spec</include>
- <include>log4j:log4j</include>
- <include>mx4j:mx4j</include>
- <include>mx4j:mx4j-remote</include>
- <include>xpp3:xpp3</include>
- <include>xstream:xstream</include>
- <include>jline:jline</include>
- </includes>
- </dependencySet>
+ <!--
+ NOTE: lib/ is picked up from boilerplate.
+ -->
- <dependencySet>
- <outputDirectory>lib/endorsed</outputDirectory>
- <includes>
- <include>xerces:xercesImpl</include>
- <include>xerces:xmlParserAPIs</include>
- </includes>
- </dependencySet>
+ <!--
+ NOTE: lib/endorsed/ is picked up from boilerplate.
+ -->
<dependencySet>
<outputDirectory>bin</outputDirectory>
Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml Fri Aug 11 00:35:28 2006
@@ -142,293 +142,18 @@
<type>car</type>
</dependency>
- <!-- unpack -->
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-scripts</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- lib dependencies -->
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
-
- <!-- endorsed -->
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-directory</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>hot-deployer</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jmx-remoting</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-mail</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-timer</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
- </dependency>
</dependencies>
<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
@@ -461,7 +186,6 @@
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-boilerplate-minimal</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -485,7 +209,6 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-scripts</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scripts</outputDirectory>
@@ -502,63 +225,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty-builder</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/assembly/bin.xml Fri Aug 11 00:35:28 2006
@@ -35,39 +35,13 @@
<includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>backport-util-concurrent:backport-util-concurrent</include>
- <include>cglib:cglib-nodep</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-logging:commons-logging</include>
- <include>concurrent:concurrent</include>
- <include>org.apache.geronimo.modules:geronimo-common</include>
- <include>org.apache.geronimo.modules:geronimo-deploy-jsr88</include>
- <include>org.apache.geronimo.modules:geronimo-deploy-tool</include>
- <include>org.apache.geronimo.modules:geronimo-deployment</include>
- <include>org.apache.geronimo.modules:geronimo-kernel</include>
- <include>org.apache.geronimo.modules:geronimo-system</include>
- <include>org.apache.geronimo.modules:geronimo-util</include>
- <include>org.apache.geronimo.specs:geronimo-qname_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-deployment_1.1_spec</include>
- <include>log4j:log4j</include>
- <include>mx4j:mx4j</include>
- <include>mx4j:mx4j-remote</include>
- <include>xpp3:xpp3</include>
- <include>xstream:xstream</include>
- <include>jline:jline</include>
- </includes>
- </dependencySet>
+ <!--
+ NOTE: lib/ is picked up from boilerplate.
+ -->
- <dependencySet>
- <outputDirectory>lib/endorsed</outputDirectory>
- <includes>
- <include>xerces:xercesImpl</include>
- <include>xerces:xmlParserAPIs</include>
- </includes>
- </dependencySet>
+ <!--
+ NOTE: lib/endorsed/ is picked up from boilerplate.
+ -->
<dependencySet>
<outputDirectory>bin</outputDirectory>
Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml Fri Aug 11 00:35:28 2006
@@ -268,294 +268,11 @@
<type>car</type>
</dependency>
- <!-- unpack -->
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-scripts</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- lib dependencies -->
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
-
- <!-- endorsed -->
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-directory</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jmx-remoting</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-mail</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-timer</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
</dependencies>
<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
@@ -588,7 +305,6 @@
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-boilerplate-j2ee</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -612,7 +328,6 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-scripts</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scripts</outputDirectory>
@@ -629,63 +344,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat-builder</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml Fri Aug 11 00:35:28 2006
@@ -35,39 +35,13 @@
<includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>backport-util-concurrent:backport-util-concurrent</include>
- <include>cglib:cglib-nodep</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-logging:commons-logging</include>
- <include>concurrent:concurrent</include>
- <include>org.apache.geronimo.modules:geronimo-common</include>
- <include>org.apache.geronimo.modules:geronimo-deploy-jsr88</include>
- <include>org.apache.geronimo.modules:geronimo-deploy-tool</include>
- <include>org.apache.geronimo.modules:geronimo-deployment</include>
- <include>org.apache.geronimo.modules:geronimo-kernel</include>
- <include>org.apache.geronimo.modules:geronimo-system</include>
- <include>org.apache.geronimo.modules:geronimo-util</include>
- <include>org.apache.geronimo.specs:geronimo-qname_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-deployment_1.1_spec</include>
- <include>log4j:log4j</include>
- <include>mx4j:mx4j</include>
- <include>mx4j:mx4j-remote</include>
- <include>xpp3:xpp3</include>
- <include>xstream:xstream</include>
- <include>jline:jline</include>
- </includes>
- </dependencySet>
+ <!--
+ NOTE: lib/ is picked up from boilerplate.
+ -->
- <dependencySet>
- <outputDirectory>lib/endorsed</outputDirectory>
- <includes>
- <include>xerces:xercesImpl</include>
- <include>xerces:xmlParserAPIs</include>
- </includes>
- </dependencySet>
+ <!--
+ NOTE: lib/endorsed/ is picked up from boilerplate.
+ -->
<dependencySet>
<outputDirectory>bin</outputDirectory>
Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml Fri Aug 11 00:35:28 2006
@@ -142,293 +142,18 @@
<type>car</type>
</dependency>
- <!-- unpack -->
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-scripts</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- lib dependencies -->
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
-
- <!-- endorsed -->
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-directory</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>hot-deployer</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jmx-remoting</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-mail</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-timer</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
- </dependency>
</dependencies>
<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
@@ -461,7 +186,6 @@
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-boilerplate-minimal</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -485,7 +209,6 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-scripts</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scripts</outputDirectory>
@@ -502,63 +225,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat-builder</artifactId>
<version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- <type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml?rev=430712&r1=430711&r2=430712&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/assembly/bin.xml Fri Aug 11 00:35:28 2006
@@ -35,39 +35,13 @@
<includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>backport-util-concurrent:backport-util-concurrent</include>
- <include>cglib:cglib-nodep</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-logging:commons-logging</include>
- <include>concurrent:concurrent</include>
- <include>org.apache.geronimo.modules:geronimo-common</include>
- <include>org.apache.geronimo.modules:geronimo-deploy-jsr88</include>
- <include>org.apache.geronimo.modules:geronimo-deploy-tool</include>
- <include>org.apache.geronimo.modules:geronimo-deployment</include>
- <include>org.apache.geronimo.modules:geronimo-kernel</include>
- <include>org.apache.geronimo.modules:geronimo-system</include>
- <include>org.apache.geronimo.modules:geronimo-util</include>
- <include>org.apache.geronimo.specs:geronimo-qname_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-deployment_1.1_spec</include>
- <include>log4j:log4j</include>
- <include>mx4j:mx4j</include>
- <include>mx4j:mx4j-remote</include>
- <include>xpp3:xpp3</include>
- <include>xstream:xstream</include>
- <include>jline:jline</include>
- </includes>
- </dependencySet>
+ <!--
+ NOTE: lib/ is picked up from boilerplate.
+ -->
- <dependencySet>
- <outputDirectory>lib/endorsed</outputDirectory>
- <includes>
- <include>xerces:xercesImpl</include>
- <include>xerces:xmlParserAPIs</include>
- </includes>
- </dependencySet>
+ <!--
+ NOTE: lib/endorsed/ is picked up from boilerplate.
+ -->
<dependencySet>
<outputDirectory>bin</outputDirectory>
Re: svn commit: r430712 - in /geronimo/trunk/m2-assemblies: geronimo-boilerplate-j2ee/src/main/resources/var/ geronimo-boilerplate-minimal/ geronimo-jetty-j2ee/ geronimo-jetty-j2ee/src/main/assembly/ geronimo-jetty-minimal/ geronimo-jetty-minimal/src/main/...
Posted by Jason Dillon <ja...@planet57.com>.
FYI, this centralizes the def of what does into lib/* into the
geronimo-boilerplate-minimal module... as well as other common bits.
--jason
On Aug 11, 2006, at 12:35 AM, jdillon@apache.org wrote:
> Author: jdillon
> Date: Fri Aug 11 00:35:28 2006
> New Revision: 430712
>
> URL: http://svn.apache.org/viewvc?rev=430712&view=rev
> Log:
> Moved common lib, lib/endorsed setup to geronimo-boilerplate-minimal
> Removed uneeded jar deps from all assemblies
> Moved commons schema extraction to geronimo-boilerplate-minimal,
> only jetty or tomcat schema extraction done in assemblies
> Added hot deployer dep to minimal assemblies so they can boot properly
>
> Removed:
> geronimo/trunk/m2-assemblies/geronimo-boilerplate-j2ee/src/main/
> resources/var/
> Modified:
> geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/pom.xml
> geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml
> geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/
> assembly/bin.xml
> geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml
> geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/
> assembly/bin.xml
> geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
> geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/
> assembly/bin.xml
> geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml
> geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/
> assembly/bin.xml
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-boilerplate-minimal/pom.xml?
> rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/
> pom.xml (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/
> pom.xml Fri Aug 11 00:35:28 2006
> @@ -36,10 +36,6 @@
> Provides boilerplate files for all Geronimo minimal server
> (Little-G) assemblies.
> </description>
>
> - <!--
> - TODO: Move schema inclusion here, since most of it is common
> - -->
> -
> <build>
> <resources>
> <resource>
> @@ -55,6 +51,220 @@
> <directory>${pom.basedir}/src/main/resources</
> directory>
> </resource>
> </resources>
> +
> + <plugins>
> + <plugin>
> + <groupId>org.codehaus.mojo</groupId>
> + <artifactId>dependency-maven-plugin</artifactId>
> + <executions>
> + <execution>
> + <id>install-lib</id>
> + <phase>compile</phase>
> + <goals>
> + <goal>copy</goal>
> + </goals>
> + <configuration>
> + <artifactItems>
> + <artifactItem>
> + <groupId>backport-util-
> concurrent</groupId>
> + <artifactId>backport-util-
> concurrent</artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>concurrent</groupId>
> + <artifactId>concurrent</
> artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>cglib</groupId>
> + <artifactId>cglib-nodep</
> artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>commons-cli</groupId>
> + <artifactId>commons-cli</
> artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>commons-logging</
> groupId>
> + <artifactId>commons-logging</
> artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>log4j</groupId>
> + <artifactId>log4j</artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>mx4j</groupId>
> + <artifactId>mx4j</artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>mx4j</groupId>
> + <artifactId>mx4j-remote</
> artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>xpp3</groupId>
> + <artifactId>xpp3</artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>xstream</groupId>
> + <artifactId>xstream</artifactId>
> + </artifactItem>
> + <artifactItem>
> + <groupId>jline</groupId>
> + <artifactId>jline</artifactId>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-
> qname_1.1_spec</artifactId>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-j2ee-
> deployment_1.1_spec</artifactId>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-common</
> artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-deploy-
> jsr88</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-deploy-
> tool</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-
> deployment</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-kernel</
> artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-util</
> artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-system</
> artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + </artifactItems>
> + <outputDirectory>$
> {project.build.directory}/classes/lib</outputDirectory>
> + </configuration>
> + </execution>
> +
> + <execution>
> + <id>install-lib-endorsed</id>
> + <phase>compile</phase>
> + <goals>
> + <goal>copy</goal>
> + </goals>
> + <configuration>
> + <artifactItems>
> + <artifactItem>
> + <groupId>xerces</groupId>
> + <artifactId>xercesImpl</
> artifactId>
> + </artifactItem>
> +
> + <artifactItem>
> + <groupId>xerces</groupId>
> + <artifactId>xmlParserAPIs</
> artifactId>
> + </artifactItem>
> + </artifactItems>
> + <outputDirectory>$
> {project.build.directory}/classes/lib/endorsed</outputDirectory>
> + </configuration>
> + </execution>
> +
> + <execution>
> + <id>unpack-schemas</id>
> + <phase>compile</phase>
> + <goals>
> + <goal>unpack</goal>
> + </goals>
> + <configuration>
> + <artifactItems>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-axis-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-client-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-connector-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-j2ee-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-naming-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-security-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-service-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-web-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + <artifactItem>
> +
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-j2ee-
> builder</artifactId>
> + <version>${pom.version}</version>
> + </artifactItem>
> + </artifactItems>
> + <outputDirectory>$
> {project.build.directory}/scratch/schema</outputDirectory>
> + </configuration>
> + </execution>
> + </executions>
> + </plugin>
> +
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-antrun-plugin</artifactId>
> + <executions>
> + <execution>
> + <id>flatten-schemas</id>
> + <phase>compile</phase>
> + <goals>
> + <goal>run</goal>
> + </goals>
> + <configuration>
> + <tasks>
> + <mkdir dir="$
> {project.build.directory}/classes/schema"/>
> + <copy todir="$
> {project.build.directory}/classes/schema">
> + <fileset dir="$
> {project.build.directory}/scratch/schema">
> + <include name="**/*.xsd"/>
> + <include name="**/*.dtd"/>
> + </fileset>
> + <mapper type="flatten"/>
> + </copy>
> + </tasks>
> + </configuration>
> + </execution>
> + </executions>
> + </plugin>
> + </plugins>
> </build>
>
> </project>
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-jetty-j2ee/pom.xml?rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml
> (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/pom.xml Fri
> Aug 11 00:35:28 2006
> @@ -31,9 +31,7 @@
> <artifactId>geronimo-jetty-j2ee</artifactId>
> <name>Geronimo Assemblies :: J2EE + Jetty</name>
> <!--
> -
> - HACK: See build/resources below...
> -
> + HACK: See build/resources below...
> <packaging>pom</packaging>
> -->
> <packaging>jar</packaging>
> @@ -269,285 +267,11 @@
> <type>car</type>
> </dependency>
>
> - <!-- lib dependencies -->
> -
> - <dependency>
> - <groupId>cglib</groupId>
> - <artifactId>cglib-nodep</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-cli</groupId>
> - <artifactId>commons-cli</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-logging</groupId>
> - <artifactId>commons-logging</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-common</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deploy-tool</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deployment</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-kernel</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-system</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-qname_1.1_spec</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>log4j</groupId>
> - <artifactId>log4j</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>mx4j</groupId>
> - <artifactId>mx4j</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>mx4j</groupId>
> - <artifactId>mx4j-remote</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xpp3</groupId>
> - <artifactId>xpp3</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xstream</groupId>
> - <artifactId>xstream</artifactId>
> - </dependency>
> -
> - <!-- endorsed -->
> -
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xercesImpl</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xmlParserAPIs</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-j2ee-deployment_1.1_spec</
> artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deploy-jsr88</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-util</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-activation</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-core</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-derby</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-directory</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-schema</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-jetty</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-jetty-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-jmx-remoting</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-mail</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-management</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-service-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-timer</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-tomcat</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-transaction</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-webservices</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> </dependencies>
>
> <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
> @@ -580,7 +304,6 @@
>
> <groupId>org.apache.geronimo.assemblies</groupId>
> <artifactId>geronimo-
> boilerplate-j2ee</artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/boilerplate</outputDirectory>
> @@ -604,7 +327,6 @@
>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-scripts</
> artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/scripts</outputDirectory>
> @@ -621,63 +343,8 @@
> <artifactItems>
> <artifactItem>
>
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-service-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-jetty-
> builder</artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/scratch/schema</outputDirectory>
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/
> assembly/bin.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-jetty-j2ee/src/main/assembly/bin.xml?
> rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/
> assembly/bin.xml (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/
> assembly/bin.xml Fri Aug 11 00:35:28 2006
> @@ -35,39 +35,13 @@
> <includeBaseDirectory>true</includeBaseDirectory>
>
> <dependencySets>
> - <dependencySet>
> - <outputDirectory>lib</outputDirectory>
> - <includes>
> - <include>backport-util-concurrent:backport-util-
> concurrent</include>
> - <include>cglib:cglib-nodep</include>
> - <include>commons-cli:commons-cli</include>
> - <include>commons-logging:commons-logging</include>
> - <include>concurrent:concurrent</include>
> - <include>org.apache.geronimo.modules:geronimo-
> common</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deploy-jsr88</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deploy-tool</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deployment</include>
> - <include>org.apache.geronimo.modules:geronimo-
> kernel</include>
> - <include>org.apache.geronimo.modules:geronimo-
> system</include>
> - <include>org.apache.geronimo.modules:geronimo-
> util</include>
> - <include>org.apache.geronimo.specs:geronimo-
> qname_1.1_spec</include>
> - <include>org.apache.geronimo.specs:geronimo-j2ee-
> deployment_1.1_spec</include>
> - <include>log4j:log4j</include>
> - <include>mx4j:mx4j</include>
> - <include>mx4j:mx4j-remote</include>
> - <include>xpp3:xpp3</include>
> - <include>xstream:xstream</include>
> - <include>jline:jline</include>
> - </includes>
> - </dependencySet>
> + <!--
> + NOTE: lib/ is picked up from boilerplate.
> + -->
>
> - <dependencySet>
> - <outputDirectory>lib/endorsed</outputDirectory>
> - <includes>
> - <include>xerces:xercesImpl</include>
> - <include>xerces:xmlParserAPIs</include>
> - </includes>
> - </dependencySet>
> + <!--
> + NOTE: lib/endorsed/ is picked up from boilerplate.
> + -->
>
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-jetty-minimal/pom.xml?
> rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml
> (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/pom.xml Fri
> Aug 11 00:35:28 2006
> @@ -142,293 +142,18 @@
> <type>car</type>
> </dependency>
>
> - <!-- unpack -->
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-scripts</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <!-- lib dependencies -->
> -
> - <dependency>
> - <groupId>cglib</groupId>
> - <artifactId>cglib-nodep</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-cli</groupId>
> - <artifactId>commons-cli</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-logging</groupId>
> - <artifactId>commons-logging</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-common</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deploy-tool</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deployment</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-kernel</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-system</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-qname_1.1_spec</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>log4j</groupId>
> - <artifactId>log4j</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>mx4j</groupId>
> - <artifactId>mx4j</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>mx4j</groupId>
> - <artifactId>mx4j-remote</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xpp3</groupId>
> - <artifactId>xpp3</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xstream</groupId>
> - <artifactId>xstream</artifactId>
> - </dependency>
> -
> - <!-- endorsed -->
> -
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xercesImpl</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xmlParserAPIs</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-j2ee-deployment_1.1_spec</
> artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deploy-jsr88</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-util</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-activation</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-core</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-derby</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-directory</artifactId>
> + <groupId>org.apache.geronimo.configs</groupId>
> + <artifactId>hot-deployer</artifactId>
> <version>${pom.version}</version>
> + <type>car</type>
> </dependency>
>
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-schema</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-jetty</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-jetty-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-jmx-remoting</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-mail</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-management</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-service-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-timer</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-tomcat</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-transaction</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-webservices</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> </dependencies>
>
> <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
> @@ -461,7 +186,6 @@
>
> <groupId>org.apache.geronimo.assemblies</groupId>
> <artifactId>geronimo-
> boilerplate-minimal</artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/boilerplate</outputDirectory>
> @@ -485,7 +209,6 @@
>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-scripts</
> artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/scripts</outputDirectory>
> @@ -502,63 +225,8 @@
> <artifactItems>
> <artifactItem>
>
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-service-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-jetty-
> builder</artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/scratch/schema</outputDirectory>
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/
> main/assembly/bin.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-jetty-minimal/src/main/assembly/bin.xml?
> rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/
> assembly/bin.xml (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/
> assembly/bin.xml Fri Aug 11 00:35:28 2006
> @@ -35,39 +35,13 @@
> <includeBaseDirectory>true</includeBaseDirectory>
>
> <dependencySets>
> - <dependencySet>
> - <outputDirectory>lib</outputDirectory>
> - <includes>
> - <include>backport-util-concurrent:backport-util-
> concurrent</include>
> - <include>cglib:cglib-nodep</include>
> - <include>commons-cli:commons-cli</include>
> - <include>commons-logging:commons-logging</include>
> - <include>concurrent:concurrent</include>
> - <include>org.apache.geronimo.modules:geronimo-
> common</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deploy-jsr88</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deploy-tool</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deployment</include>
> - <include>org.apache.geronimo.modules:geronimo-
> kernel</include>
> - <include>org.apache.geronimo.modules:geronimo-
> system</include>
> - <include>org.apache.geronimo.modules:geronimo-
> util</include>
> - <include>org.apache.geronimo.specs:geronimo-
> qname_1.1_spec</include>
> - <include>org.apache.geronimo.specs:geronimo-j2ee-
> deployment_1.1_spec</include>
> - <include>log4j:log4j</include>
> - <include>mx4j:mx4j</include>
> - <include>mx4j:mx4j-remote</include>
> - <include>xpp3:xpp3</include>
> - <include>xstream:xstream</include>
> - <include>jline:jline</include>
> - </includes>
> - </dependencySet>
> + <!--
> + NOTE: lib/ is picked up from boilerplate.
> + -->
>
> - <dependencySet>
> - <outputDirectory>lib/endorsed</outputDirectory>
> - <includes>
> - <include>xerces:xercesImpl</include>
> - <include>xerces:xmlParserAPIs</include>
> - </includes>
> - </dependencySet>
> + <!--
> + NOTE: lib/endorsed/ is picked up from boilerplate.
> + -->
>
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-tomcat-j2ee/pom.xml?rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
> (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/pom.xml Fri
> Aug 11 00:35:28 2006
> @@ -268,294 +268,11 @@
> <type>car</type>
> </dependency>
>
> - <!-- unpack -->
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-scripts</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <!-- lib dependencies -->
> -
> - <dependency>
> - <groupId>cglib</groupId>
> - <artifactId>cglib-nodep</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-cli</groupId>
> - <artifactId>commons-cli</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-logging</groupId>
> - <artifactId>commons-logging</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-common</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deploy-tool</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deployment</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-kernel</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-system</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-qname_1.1_spec</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>log4j</groupId>
> - <artifactId>log4j</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>mx4j</groupId>
> - <artifactId>mx4j</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>mx4j</groupId>
> - <artifactId>mx4j-remote</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xpp3</groupId>
> - <artifactId>xpp3</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xstream</groupId>
> - <artifactId>xstream</artifactId>
> - </dependency>
> -
> - <!-- endorsed -->
> -
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xercesImpl</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xmlParserAPIs</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-j2ee-deployment_1.1_spec</
> artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deploy-jsr88</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-util</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-activation</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-core</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-derby</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-directory</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-schema</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-tomcat</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-tomcat-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-jmx-remoting</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-mail</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-management</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-service-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-timer</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-tomcat</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-transaction</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-webservices</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> </dependencies>
>
> <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
> @@ -588,7 +305,6 @@
>
> <groupId>org.apache.geronimo.assemblies</groupId>
> <artifactId>geronimo-
> boilerplate-j2ee</artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/boilerplate</outputDirectory>
> @@ -612,7 +328,6 @@
>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-scripts</
> artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/scripts</outputDirectory>
> @@ -629,63 +344,8 @@
> <artifactItems>
> <artifactItem>
>
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-service-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-tomcat-
> builder</artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/scratch/schema</outputDirectory>
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/
> main/assembly/bin.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-tomcat-j2ee/src/main/assembly/bin.xml?
> rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/
> assembly/bin.xml (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/
> assembly/bin.xml Fri Aug 11 00:35:28 2006
> @@ -35,39 +35,13 @@
> <includeBaseDirectory>true</includeBaseDirectory>
>
> <dependencySets>
> - <dependencySet>
> - <outputDirectory>lib</outputDirectory>
> - <includes>
> - <include>backport-util-concurrent:backport-util-
> concurrent</include>
> - <include>cglib:cglib-nodep</include>
> - <include>commons-cli:commons-cli</include>
> - <include>commons-logging:commons-logging</include>
> - <include>concurrent:concurrent</include>
> - <include>org.apache.geronimo.modules:geronimo-
> common</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deploy-jsr88</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deploy-tool</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deployment</include>
> - <include>org.apache.geronimo.modules:geronimo-
> kernel</include>
> - <include>org.apache.geronimo.modules:geronimo-
> system</include>
> - <include>org.apache.geronimo.modules:geronimo-
> util</include>
> - <include>org.apache.geronimo.specs:geronimo-
> qname_1.1_spec</include>
> - <include>org.apache.geronimo.specs:geronimo-j2ee-
> deployment_1.1_spec</include>
> - <include>log4j:log4j</include>
> - <include>mx4j:mx4j</include>
> - <include>mx4j:mx4j-remote</include>
> - <include>xpp3:xpp3</include>
> - <include>xstream:xstream</include>
> - <include>jline:jline</include>
> - </includes>
> - </dependencySet>
> + <!--
> + NOTE: lib/ is picked up from boilerplate.
> + -->
>
> - <dependencySet>
> - <outputDirectory>lib/endorsed</outputDirectory>
> - <includes>
> - <include>xerces:xercesImpl</include>
> - <include>xerces:xmlParserAPIs</include>
> - </includes>
> - </dependencySet>
> + <!--
> + NOTE: lib/endorsed/ is picked up from boilerplate.
> + -->
>
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-tomcat-minimal/pom.xml?
> rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml
> (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/pom.xml
> Fri Aug 11 00:35:28 2006
> @@ -142,293 +142,18 @@
> <type>car</type>
> </dependency>
>
> - <!-- unpack -->
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-scripts</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <!-- lib dependencies -->
> -
> - <dependency>
> - <groupId>cglib</groupId>
> - <artifactId>cglib-nodep</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-cli</groupId>
> - <artifactId>commons-cli</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-logging</groupId>
> - <artifactId>commons-logging</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-common</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deploy-tool</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deployment</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-kernel</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-system</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-qname_1.1_spec</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>log4j</groupId>
> - <artifactId>log4j</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>mx4j</groupId>
> - <artifactId>mx4j</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>mx4j</groupId>
> - <artifactId>mx4j-remote</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xpp3</groupId>
> - <artifactId>xpp3</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xstream</groupId>
> - <artifactId>xstream</artifactId>
> - </dependency>
> -
> - <!-- endorsed -->
> -
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xercesImpl</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xmlParserAPIs</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-j2ee-deployment_1.1_spec</
> artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-deploy-jsr88</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-util</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-activation</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-core</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-derby</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-directory</artifactId>
> + <groupId>org.apache.geronimo.configs</groupId>
> + <artifactId>hot-deployer</artifactId>
> <version>${pom.version}</version>
> + <type>car</type>
> </dependency>
>
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-schema</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-tomcat</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-tomcat-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-jmx-remoting</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-mail</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-management</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-service-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-timer</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-tomcat</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-transaction</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web-builder</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-webservices</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> </dependencies>
>
> <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
> @@ -461,7 +186,6 @@
>
> <groupId>org.apache.geronimo.assemblies</groupId>
> <artifactId>geronimo-
> boilerplate-minimal</artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/boilerplate</outputDirectory>
> @@ -485,7 +209,6 @@
>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-scripts</
> artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/scripts</outputDirectory>
> @@ -502,63 +225,8 @@
> <artifactItems>
> <artifactItem>
>
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-client-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-connector-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-naming-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-security-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-service-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-tomcat-
> builder</artifactId>
> <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> - </artifactItem>
> - <artifactItem>
> -
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-j2ee-
> builder</artifactId>
> - <version>${pom.version}</version>
> - <type>jar</type>
> </artifactItem>
> </artifactItems>
> <outputDirectory>$
> {project.build.directory}/scratch/schema</outputDirectory>
>
> Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/
> main/assembly/bin.xml
> URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/
> geronimo-tomcat-minimal/src/main/assembly/bin.xml?
> rev=430712&r1=430711&r2=430712&view=diff
> ======================================================================
> ========
> --- geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/
> assembly/bin.xml (original)
> +++ geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/
> assembly/bin.xml Fri Aug 11 00:35:28 2006
> @@ -35,39 +35,13 @@
> <includeBaseDirectory>true</includeBaseDirectory>
>
> <dependencySets>
> - <dependencySet>
> - <outputDirectory>lib</outputDirectory>
> - <includes>
> - <include>backport-util-concurrent:backport-util-
> concurrent</include>
> - <include>cglib:cglib-nodep</include>
> - <include>commons-cli:commons-cli</include>
> - <include>commons-logging:commons-logging</include>
> - <include>concurrent:concurrent</include>
> - <include>org.apache.geronimo.modules:geronimo-
> common</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deploy-jsr88</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deploy-tool</include>
> - <include>org.apache.geronimo.modules:geronimo-
> deployment</include>
> - <include>org.apache.geronimo.modules:geronimo-
> kernel</include>
> - <include>org.apache.geronimo.modules:geronimo-
> system</include>
> - <include>org.apache.geronimo.modules:geronimo-
> util</include>
> - <include>org.apache.geronimo.specs:geronimo-
> qname_1.1_spec</include>
> - <include>org.apache.geronimo.specs:geronimo-j2ee-
> deployment_1.1_spec</include>
> - <include>log4j:log4j</include>
> - <include>mx4j:mx4j</include>
> - <include>mx4j:mx4j-remote</include>
> - <include>xpp3:xpp3</include>
> - <include>xstream:xstream</include>
> - <include>jline:jline</include>
> - </includes>
> - </dependencySet>
> + <!--
> + NOTE: lib/ is picked up from boilerplate.
> + -->
>
> - <dependencySet>
> - <outputDirectory>lib/endorsed</outputDirectory>
> - <includes>
> - <include>xerces:xercesImpl</include>
> - <include>xerces:xmlParserAPIs</include>
> - </includes>
> - </dependencySet>
> + <!--
> + NOTE: lib/endorsed/ is picked up from boilerplate.
> + -->
>
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
>
>