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 2008/05/16 02:01:01 UTC
svn commit: r656895 - in /geronimo/server/trunk/assemblies:
geronimo-framework/pom.xml geronimo-jetty6-javaee5/pom.xml
geronimo-jetty6-minimal/pom.xml geronimo-tomcat6-javaee5/pom.xml
geronimo-tomcat6-minimal/pom.xml
Author: jdillon
Date: Thu May 15 17:01:01 2008
New Revision: 656895
URL: http://svn.apache.org/viewvc?rev=656895&view=rev
Log:
Simplify things a wee bit more
Modified:
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
Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=656895&r1=656894&r2=656895&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Thu May 15 17:01:01 2008
@@ -41,7 +41,6 @@
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-boilerplate-minimal</artifactId>
<version>${version}</version>
- <type>jar</type>
</dependency>
<dependency>
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=656895&r1=656894&r2=656895&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Thu May 15 17:01:01 2008
@@ -559,7 +559,6 @@
<type>car</type>
</dependency>
- <!-- Monitoring plugins -->
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>agent</artifactId>
@@ -596,7 +595,7 @@
<classifier>bin</classifier>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/unpack</outputDirectory>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -613,11 +612,9 @@
</goals>
<configuration>
<tasks>
- <!-- remove geronimo-framework-${version} prefix -->
<mkdir dir="${project.build.directory}/assembly"/>
<copy todir="${project.build.directory}/assembly">
- <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
- </fileset>
+ <fileset dir="${project.build.directory}/geronimo-framework-${version}"/>
</copy>
</tasks>
</configuration>
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=656895&r1=656894&r2=656895&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Thu May 15 17:01:01 2008
@@ -250,7 +250,7 @@
<classifier>bin</classifier>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/unpack</outputDirectory>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -267,11 +267,9 @@
</goals>
<configuration>
<tasks>
- <!-- remove geronimo-framework-${version} prefix -->
<mkdir dir="${project.build.directory}/assembly"/>
<copy todir="${project.build.directory}/assembly">
- <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
- </fileset>
+ <fileset dir="${project.build.directory}/geronimo-framework-${version}"/>
</copy>
</tasks>
</configuration>
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=656895&r1=656894&r2=656895&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Thu May 15 17:01:01 2008
@@ -531,7 +531,6 @@
<type>car</type>
</dependency>
- <!-- Monitoring plugins -->
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>agent</artifactId>
@@ -568,7 +567,7 @@
<classifier>bin</classifier>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/unpack</outputDirectory>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -585,11 +584,9 @@
</goals>
<configuration>
<tasks>
- <!-- remove geronimo-framework-${version} prefix -->
<mkdir dir="${project.build.directory}/assembly"/>
<copy todir="${project.build.directory}/assembly">
- <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
- </fileset>
+ <fileset dir="${project.build.directory}/geronimo-framework-${version}"/>
</copy>
</tasks>
</configuration>
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=656895&r1=656894&r2=656895&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Thu May 15 17:01:01 2008
@@ -250,7 +250,7 @@
<classifier>bin</classifier>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/unpack</outputDirectory>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -267,11 +267,9 @@
</goals>
<configuration>
<tasks>
- <!-- remove geronimo-framework-${version} prefix -->
<mkdir dir="${project.build.directory}/assembly"/>
<copy todir="${project.build.directory}/assembly">
- <fileset dir="${project.build.directory}/unpack/geronimo-framework-${version}">
- </fileset>
+ <fileset dir="${project.build.directory}/geronimo-framework-${version}"/>
</copy>
</tasks>
</configuration>