You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/01/25 16:28:16 UTC
svn commit: r372242 - in /incubator/servicemix/trunk/servicemix-assembly:
maven.xml project.xml
Author: gnodet
Date: Wed Jan 25 07:28:12 2006
New Revision: 372242
URL: http://svn.apache.org/viewcvs?rev=372242&view=rev
Log:
Fix SM-276 : Bundle servicemix jbi components in distribution
Modified:
incubator/servicemix/trunk/servicemix-assembly/maven.xml
incubator/servicemix/trunk/servicemix-assembly/project.xml
Modified: incubator/servicemix/trunk/servicemix-assembly/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/maven.xml?rev=372242&r1=372241&r2=372242&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/maven.xml Wed Jan 25 07:28:12 2006
@@ -125,39 +125,31 @@
<ant:copy todir="${maven.dist.bin.assembly.dir}" file="${maven.repo.local}/${pom.groupId}/jars/${pom.artifactId}-${pom.currentVersion}.jar"/>
<!-- Copy the runtime dependencies into lib and create a classpath for the server.jar file -->
+ <j:set var="compDir" value="${maven.dist.bin.assembly.dir}/components"/>
<j:set var="libDir" value="${maven.dist.bin.assembly.dir}/lib"/>
<j:set var="optionalDir" value="${maven.dist.bin.assembly.dir}/lib/optional"/>
<ant:mkdir dir="${libDir}"/>
<ant:mkdir dir="${optionalDir}"/>
+ <ant:mkdir dir="${compDir}"/>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
<j:if test="${dependency.getProperty('lib') == 'true'}">
<ant:copy todir="${libDir}" file="${artifact.path}"/>
- <j:set var="classpath" value="${classpath} ../lib/${artifact.name}"/>
</j:if>
</j:forEach>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
- <echo>${artifact.path} ${dependency.getProperty('optional') == 'true'}</echo>
+ <j:if test="${dependency.getProperty('component') == 'true'}">
+ <ant:copy todir="${compDir}" file="${artifact.path}"/>
+ </j:if>
</j:forEach>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
- <echo>${artifact.path}</echo>
<j:if test="${dependency.getProperty('optional') == 'true'}">
<ant:copy todir="${optionalDir}" file="${artifact.path}"/>
- <j:if test="${dependency.extension == 'jar'}">
- <j:set var="classpath" value="${classpath} ../lib/optional/${artifact.name}"/>
- </j:if>
- <j:if test="${dependency.extension == 'rar'}">
- <ant:unzip src="${artifact.path}" dest="${optionalDir}">
- <ant:patternset>
- <include name="${dependency.artifactId}*.jar"/>
- </ant:patternset>
- </ant:unzip>
- </j:if>
</j:if>
</j:forEach>
Modified: incubator/servicemix/trunk/servicemix-assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/project.xml?rev=372242&r1=372241&r2=372242&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/project.xml Wed Jan 25 07:28:12 2006
@@ -66,35 +66,52 @@
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>servicemix-common</artifactId>
+ <artifactId>servicemix-jms</artifactId>
<version>${pom.currentVersion}</version>
+ <type>zip</type>
<properties>
- <servicemix.module>true</servicemix.module>
<eclipse.dependency>true</eclipse.dependency>
+ <component>true</component>
</properties>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>servicemix-jms</artifactId>
+ <artifactId>servicemix-http</artifactId>
+ <type>zip</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ <component>true</component>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>servicemix-lwcontainer</artifactId>
<version>${pom.currentVersion}</version>
+ <type>zip</type>
<properties>
<eclipse.dependency>true</eclipse.dependency>
+ <component>true</component>
</properties>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>servicemix-jsr181</artifactId>
<version>${pom.currentVersion}</version>
+ <type>zip</type>
<properties>
<eclipse.dependency>true</eclipse.dependency>
+ <component>true</component>
</properties>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>servicemix-wsn2005</artifactId>
<version>${pom.currentVersion}</version>
+ <type>zip</type>
<properties>
<eclipse.dependency>true</eclipse.dependency>
+ <component>true</component>
</properties>
</dependency>