You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/18 00:44:05 UTC
svn commit: r638137 - in /geronimo/server/trunk:
assemblies/geronimo-boilerplate-minimal/
assemblies/geronimo-boilerplate-minimal/src/main/assembly/
assemblies/geronimo-boilerplate-minimal/src/main/underlay/deploy/
assemblies/geronimo-framework/ assemb...
Author: djencks
Date: Mon Mar 17 16:44:03 2008
New Revision: 638137
URL: http://svn.apache.org/viewvc?rev=638137&view=rev
Log:
GERONIMO-3924 Make car-maven-plugin have a server-assembly packaging with lifecycle that avoids need for tools-maven-plugin
Removed:
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/deploy/
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Mon Mar 17 16:44:03 2008
@@ -327,8 +327,8 @@
</goals>
<configuration>
<tasks>
- <mkdir dir="${project.build.directory}/classes/schema"/>
- <copy todir="${project.build.directory}/classes/schema">
+ <mkdir dir="${project.build.directory}/classes/contents/schema"/>
+ <copy todir="${project.build.directory}/classes/contents/schema">
<fileset dir="${project.build.directory}/schema">
<include name="**/*.xsd"/>
<include name="**/*.dtd"/>
@@ -380,7 +380,7 @@
<module-id>
<type>jar</type>
</module-id>
- <copy-file relative-to="geronimo" dest-dir=""></copy-file>
+ <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml Mon Mar 17 16:44:03 2008
@@ -24,13 +24,13 @@
<fileSets>
<fileSet>
<directory>src/main/underlay</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>contents</outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
- <outputDirectory>lib/gshell</outputDirectory>
+ <outputDirectory>contents/lib/gshell</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.geronimo.framework:geronimo-commands</include>
@@ -38,7 +38,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>lib/boot</outputDirectory>
+ <outputDirectory>contents/lib/boot</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.codehaus.plexus:plexus-classworlds</include>
@@ -46,7 +46,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>lib/boot</outputDirectory>
+ <outputDirectory>contents/lib/boot</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<!-- Strip off the version number to keep platform scripts simpler. -->
<outputFileNameMapping>gshell-bootstrap.jar</outputFileNameMapping>
@@ -56,7 +56,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>contents/lib</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>asm:asm</include>
@@ -77,7 +77,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>contents/lib</outputDirectory>
<outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
@@ -86,7 +86,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>contents/bin</outputDirectory>
<outputFileNameMapping>client.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
@@ -95,7 +95,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>contents/bin</outputDirectory>
<outputFileNameMapping>server.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
@@ -104,7 +104,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>contents/bin</outputDirectory>
<outputFileNameMapping>shutdown.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
@@ -113,7 +113,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>contents/bin</outputDirectory>
<outputFileNameMapping>jpa.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
@@ -122,7 +122,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>contents/bin</outputDirectory>
<outputFileNameMapping>deployer.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
@@ -131,7 +131,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>lib/endorsed</outputDirectory>
+ <outputDirectory>contents/lib/endorsed</outputDirectory>
<includes>
<include>org.apache.yoko:yoko-spec-corba</include>
<include>org.apache.yoko:yoko-rmi-spec</include>
Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Mon Mar 17 16:44:03 2008
@@ -30,7 +30,7 @@
<artifactId>geronimo-framework</artifactId>
<name>Geronimo Assemblies :: Framework</name>
- <packaging>application-assembly</packaging>
+ <packaging>server-assembly</packaging>
<description>
A minimal Geronimo server (Little-G) framework assembly.
@@ -204,31 +204,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install</id>
- <phase>compile</phase>
- <goals>
- <goal>install-modules</goal>
- </goals>
- </execution>
- <execution>
- <id>archive</id>
- <phase>package</phase>
- <goals>
- <goal>archive</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Mon Mar 17 16:44:03 2008
@@ -31,7 +31,7 @@
<artifactId>geronimo-jetty6-javaee5</artifactId>
<name>Geronimo Assemblies :: JavaEE 5 + Jetty6</name>
- <packaging>application-assembly</packaging>
+ <packaging>server-assembly</packaging>
<description>
An assembly of Geronimo into a JavaEE 5 Server using Jetty as the web container.
@@ -611,7 +611,7 @@
<execution>
<id>unpack-schemas</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -651,8 +651,8 @@
</configuration>
</execution>
<execution>
- <id>pre-assembly</id>
- <phase>package</phase>
+ <id>copy-schemas</id>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
@@ -668,32 +668,6 @@
<mapper type="flatten"/>
</copy>
</tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install</id>
- <phase>compile</phase>
- <goals>
- <goal>install-modules</goal>
- </goals>
- </execution>
- <execution>
- <id>archive</id>
- <phase>package</phase>
- <goals>
- <goal>archive</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
</configuration>
</execution>
</executions>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Mon Mar 17 16:44:03 2008
@@ -30,7 +30,7 @@
<artifactId>geronimo-jetty6-minimal</artifactId>
<name>Geronimo Assemblies :: Minimal + Jetty6</name>
- <packaging>application-assembly</packaging>
+ <packaging>server-assembly</packaging>
<description>
A minimal Geronimo server (Little-G) assembly using the Jetty web-container.
@@ -264,7 +264,7 @@
<execution>
<id>unpack-schemas</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -304,8 +304,8 @@
</configuration>
</execution>
<execution>
- <id>pre-assembly</id>
- <phase>package</phase>
+ <id>copy-schemas</id>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
@@ -326,26 +326,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install</id>
- <phase>compile</phase>
- <goals>
- <goal>install-modules</goal>
- </goals>
- </execution>
- <execution>
- <id>archive</id>
- <phase>package</phase>
- <goals>
- <goal>archive</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Mon Mar 17 16:44:03 2008
@@ -31,7 +31,7 @@
<artifactId>geronimo-tomcat6-javaee5</artifactId>
<name>Geronimo Assemblies :: JavaEE 5 + Tomcat</name>
- <packaging>application-assembly</packaging>
+ <packaging>server-assembly</packaging>
<description>
An assembly of Geronimo into a JavaEE 5 Server using Tomcat as the web container.
@@ -584,7 +584,7 @@
<execution>
<id>unpack-schemas</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -624,8 +624,8 @@
</configuration>
</execution>
<execution>
- <id>pre-assembly</id>
- <phase>package</phase>
+ <id>copy-schemas</id>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
@@ -641,32 +641,6 @@
<mapper type="flatten"/>
</copy>
</tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install</id>
- <phase>compile</phase>
- <goals>
- <goal>install-modules</goal>
- </goals>
- </execution>
- <execution>
- <id>archive</id>
- <phase>package</phase>
- <goals>
- <goal>archive</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
</configuration>
</execution>
</executions>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Mon Mar 17 16:44:03 2008
@@ -31,7 +31,7 @@
<artifactId>geronimo-tomcat6-minimal</artifactId>
<name>Geronimo Assemblies :: Minimal + Tomcat</name>
- <packaging>application-assembly</packaging>
+ <packaging>server-assembly</packaging>
<description>
A minimal Geronimo server (Little-G) assembly using the Tomcat web-container.
@@ -265,7 +265,7 @@
<execution>
<id>unpack-schemas</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -305,8 +305,8 @@
</configuration>
</execution>
<execution>
- <id>pre-assembly</id>
- <phase>package</phase>
+ <id>copy-schemas</id>
+ <phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
@@ -323,27 +323,6 @@
</copy>
</tasks>
</configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install</id>
- <phase>compile</phase>
- <goals>
- <goal>install-modules</goal>
- </goals>
- </execution>
- <execution>
- <id>archive</id>
- <phase>package</phase>
- <goals>
- <goal>archive</goal>
- </goals>
</execution>
</executions>
</plugin>
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveMojo.java Mon Mar 17 16:44:03 2008
@@ -80,7 +80,21 @@
*/
private String[] excludes;
+ /**
+ * The target file to set as the project's artifact.
+ *
+ * @parameter expression="${project.file}"
+ * @required
+ */
+ private File targetFile;
+
protected void doExecute() throws Exception {
+ //this installs the pom using the default artifact handler configured in components.xml
+ log.info("Setting artifact file: " + targetFile);
+
+ org.apache.maven.artifact.Artifact artifact = project.getArtifact();
+ artifact.setFile(targetFile);
+ //now pack up the server.
ServerInfo serverInfo = new BasicServerInfo(targetServerDirectory.getAbsolutePath(), false);
ArchiverGBean archiver = new ArchiverGBean(serverInfo);
if (excludes != null) {
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml Mon Mar 17 16:44:03 2008
@@ -108,6 +108,44 @@
</component>
-->
+ <!--
+ Custom packaging for server assembly modules.
+ -->
+ <component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>server-assembly</role-hint>
+ <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+ <configuration>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <phases>
+ <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+ <compile>org.apache.geronimo.buildsupport:car-maven-plugin:install-modules</compile>
+ <package>org.apache.geronimo.buildsupport:car-maven-plugin:archive</package>
+ <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+ <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+ </phases>
+ </lifecycle>
+ </lifecycles>
+ </configuration>
+ </component>
+
+ <!--
+ Install server-assembly artifact files as .pom xml files
+ -->
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>application-assembly</role-hint>
+ <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>application-assembly</type>
+ <extension>pom</extension>
+ <packaging>application-assembly</packaging>
+ <addedToClasspath>false</addedToClasspath>
+ <language>xml</language>
+ </configuration>
+ </component>
</components>
</component-set>
Modified: geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=638137&r1=638136&r2=638137&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml Mon Mar 17 16:44:03 2008
@@ -4,7 +4,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
- <packaging>application-assembly</packaging>
+ <packaging>server-assembly</packaging>
<properties>
<!-- This property is required by the car:package mojo -->
@@ -37,13 +37,6 @@
<version>${geronimoVersion}</version>
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- <version>1.3</version>
- <extensions>true</extensions>
- </plugin>
-
</plugins>
</pluginManagement>
<!-- uncomment if you have more content to stuff in here (not recommended - use a plugin with copy-files) -->
@@ -61,9 +54,6 @@
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
- <!-- Tools includes custom packagings, install as extension to pick them up -->
- <extensions>true</extensions>
-
<!--
<executions>
<execution>
@@ -99,22 +89,6 @@
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install</id>
- <phase>compile</phase>
- <goals>
- <goal>install-modules</goal>
- </goals>
- </execution>
- <execution>
- <id>archive</id>
- <phase>package</phase>
- <goals>
- <goal>archive</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<servers>
<serverInstance>