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 2005/11/30 02:12:22 UTC
svn commit: r349857 - in /geronimo/trunk: assemblies/j2ee-installer/
assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/
plugins/geronimo-assembly-plugin/
Author: djencks
Date: Tue Nov 29 17:12:17 2005
New Revision: 349857
URL: http://svn.apache.org/viewcvs?rev=349857&view=rev
Log:
make multiproject:install work in assemblies
Modified:
geronimo/trunk/assemblies/j2ee-installer/project.properties
geronimo/trunk/assemblies/j2ee-installer/project.xml
geronimo/trunk/assemblies/j2ee-jetty-server/project.properties
geronimo/trunk/assemblies/j2ee-tomcat-server/project.properties
geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
Modified: geronimo/trunk/assemblies/j2ee-installer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.properties?rev=349857&r1=349856&r2=349857&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.properties (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.properties Tue Nov 29 17:12:17 2005
@@ -19,7 +19,7 @@
## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
##
-maven.multiproject.type=assembly
+maven.multiproject.type=assemble
PlanServerHostname=0.0.0.0
PlanNamingPort=1099
Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=349857&r1=349856&r2=349857&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Tue Nov 29 17:12:17 2005
@@ -20,9 +20,9 @@
<project>
<pomVersion>3</pomVersion>
<extend>../../etc/project.xml</extend>
- <id>geronimo-jetty-j2ee</id>
- <name>Geronimo Assembly for a J2EE Server running Jetty</name>
- <description>An assembly of Geronimo into a J2EE Server using Jetty as the web container</description>
+ <id>geronimo-installer</id>
+ <name>Geronimo Assembly for an IZPack Installer</name>
+ <description>An assembly of Geronimo for the IZPack installer</description>
<dependencies>
<!-- plugin we use -->
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.properties?rev=349857&r1=349856&r2=349857&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.properties (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.properties Tue Nov 29 17:12:17 2005
@@ -19,7 +19,7 @@
## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
##
-maven.multiproject.type=assembly
+maven.multiproject.type=assemble
PlanServerHostname=0.0.0.0
PlanNamingPort=1099
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.properties?rev=349857&r1=349856&r2=349857&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.properties (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.properties Tue Nov 29 17:12:17 2005
@@ -19,7 +19,7 @@
## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
##
-maven.multiproject.type=assembly
+maven.multiproject.type=assemble
PlanServerHostname=0.0.0.0
PlanNamingPort=1099
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=349857&r1=349856&r2=349857&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Tue Nov 29 17:12:17 2005
@@ -95,7 +95,8 @@
<ant:fileset dir="${maven.repo.local}">
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
- <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository' || dependency.getProperty('geronimo.assemble') == 'install' || dependency.getProperty('geronimo.assemble') == 'library' || dependency.getProperty('geronimo.assemble') == 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
+ <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository' || dependency.getProperty('geronimo.assemble') == 'install' || dependency.getProperty('geronimo.assemble') == 'library' || dependency.getProperty('geronimo.assem
+ble') == 'endorsed' || dependency.getProperty('geronimo.assemble') == 'extension'}">
<ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
</j:if>
</j:forEach>
@@ -201,7 +202,7 @@
</goal>
<!-- Maven artifict tags are broken so we must copy by hand -->
- <goal name="assemble:install-assembly" description="Deploy a binary distribution" prereqs="assemble:package-assembly">
+ <goal name="assemble:install" description="Deploy a binary distribution" prereqs="assemble:package-assembly">
<j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
<ant:mkdir dir="${maven.repo.local}/${pom.groupId}/distributions"/>
<ant:copy file="${maven.build.dir}/${maven.final.name}.tar.gz"