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 2007/09/13 08:21:46 UTC
svn commit: r575184 - in
/geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5: pom.xml
src/main/assembly/ src/main/assembly/boilerplate.xml
src/main/resources/var/ src/main/underlay/ src/main/underlay/var/
Author: jdillon
Date: Wed Sep 12 23:21:44 2007
New Revision: 575184
URL: http://svn.apache.org/viewvc?rev=575184&view=rev
Log:
Update the javaee5 assembly to use the assembly plugin for the heavy lifting
Added:
geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/
geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml (with props)
geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/underlay/
geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/underlay/var/
- copied from r575180, geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/resources/var/
Removed:
geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/resources/var/
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml?rev=575184&r1=575183&r2=575184&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/pom.xml Wed Sep 12 23:21:44 2007
@@ -39,16 +39,56 @@
Provides boilerplate files for all Geronimo JavaEE server assemblies.
</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-boilerplate-javaee5</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-transformer</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/resources</directory>
+ <directory>${pom.basedir}/src/main/underlay</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-boilerplate</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-boilerplate-minimal</artifactId>
+ <version>${version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>car-maven-plugin</artifactId>
<executions>
@@ -63,7 +103,7 @@
<goal>install-artifacts</goal>
</goals>
<configuration>
- <repositoryDirectory>${project.build.outputDirectory}/repository</repositoryDirectory>
+ <repositoryDirectory>${project.build.directory}/repository</repositoryDirectory>
<artifacts>
<artifact>
<groupId>org.apache.geronimo.modules</groupId>
@@ -119,63 +159,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>unpack-boilerplate</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-boilerplate-minimal</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
- </configuration>
- </execution>
-
- <execution>
- <id>install-lib-endorsed</id>
- <phase>compile</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-rmi-spec</artifactId>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/classes/lib/endorsed</outputDirectory>
- </configuration>
- </execution>
-
- <execution>
- <id>install-lib</id>
+ <id>boilerplate</id>
<phase>compile</phase>
<goals>
- <goal>copy</goal>
+ <goal>directory-inline</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transformer</artifactId>
- <version>${version}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>${pom.basedir}/src/main/assembly/boilerplate.xml</descriptor>
+ </descriptors>
</configuration>
</execution>
</executions>
@@ -186,17 +183,17 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>extend-boilerplate</id>
- <phase>generate-resources</phase>
+ <id>install-underlay</id>
+ <phase>process-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
+ <mkdir dir="${project.build.directory}/classes"/>
<copy todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/boilerplate">
+ <fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
<include name="**"/>
- <exclude name="META-INF/**"/>
</fileset>
</copy>
</tasks>
Added: geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml?rev=575184&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml Wed Sep 12 23:21:44 2007
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<assembly>
+ <id>boilerplate</id>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/boilerplate</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/repository</directory>
+ <outputDirectory>/repository</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.geronimo.modules:geronimo-transformer</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/assemblies/geronimo-boilerplate-javaee5/src/main/assembly/boilerplate.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml