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/03/10 15:01:59 UTC
svn commit: r384794 - in /incubator/servicemix/trunk/servicemix-gplan:
maven.xml project.properties project.xml src/plan/plan.xml
Author: gnodet
Date: Fri Mar 10 06:01:57 2006
New Revision: 384794
URL: http://svn.apache.org/viewcvs?rev=384794&view=rev
Log:
Fix geronimo deployment plan.
There are still some missing jars for components to run ...
Modified:
incubator/servicemix/trunk/servicemix-gplan/maven.xml
incubator/servicemix/trunk/servicemix-gplan/project.properties
incubator/servicemix/trunk/servicemix-gplan/project.xml
incubator/servicemix/trunk/servicemix-gplan/src/plan/plan.xml
Modified: incubator/servicemix/trunk/servicemix-gplan/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gplan/maven.xml?rev=384794&r1=384793&r2=384794&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gplan/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-gplan/maven.xml Fri Mar 10 06:01:57 2006
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project default="default">
+<project default="default"
+ xmlns:j="jelly:core">
<goal name="default" prereqs="car:install"/>
@@ -8,6 +9,24 @@
<goal name="distribute">
<attainGoal name="car:distribute"/>
+ </goal>
+
+ <goal name="deploy">
+ <j:if test="${geronimo.home == null}">
+ <echo>Set the geronimo.home property</echo>
+ </j:if>
+ <j:if test="${geronimo.home != null}">
+ <j:forEach var="artifact" items="${pom.artifacts}">
+ <j:set var="dependency" value="${artifact.dependency}"/>
+ <j:if test="${dependency.getProperty('geronimo.include') == 'true'}">
+ <copy todir="${geronimo.home}/repository/${dependency.groupId}/jars" file="${artifact.path}"/>
+ </j:if>
+ </j:forEach>
+ <java jar="${geronimo.home}/bin/deployer.jar" fork="true">
+ <arg value="deploy"/>
+ <arg value="${basedir}/target/plan/plan.xml"/>
+ </java>
+ </j:if>
</goal>
</project>
Modified: incubator/servicemix/trunk/servicemix-gplan/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gplan/project.properties?rev=384794&r1=384793&r2=384794&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gplan/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-gplan/project.properties Fri Mar 10 06:01:57 2006
@@ -23,3 +23,4 @@
# just use basic GBean deployer
geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
+geronimo_packaging_plugin_version=1.0.1
Modified: incubator/servicemix/trunk/servicemix-gplan/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gplan/project.xml?rev=384794&r1=384793&r2=384794&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gplan/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-gplan/project.xml Fri Mar 10 06:01:57 2006
@@ -20,7 +20,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
- <version>${geronimo_version}</version>
+ <version>${geronimo_packaging_plugin_version}</version>
<type>plugin</type>
</dependency>
<dependency>
@@ -31,13 +31,13 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <artifactId>rmi-naming</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jetty-deployer</artifactId>
+ <artifactId>j2ee-system</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
</dependency>
@@ -51,7 +51,7 @@
<geronimo.import>true</geronimo.import>
</properties>
</dependency>
-
+
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
@@ -86,7 +86,7 @@
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>incubator-servicemix</groupId>
<artifactId>servicemix-jbi</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -94,7 +94,7 @@
</properties>
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>incubator-servicemix</groupId>
<artifactId>servicemix-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -102,7 +102,7 @@
</properties>
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>incubator-servicemix</groupId>
<artifactId>servicemix-gbean</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -110,6 +110,14 @@
</properties>
</dependency>
<dependency>
+ <groupId>incubator-servicemix</groupId>
+ <artifactId>servicemix-components</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.include>true</geronimo.include>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring_version}</version>
@@ -126,6 +134,22 @@
</properties>
</dependency>
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-server</artifactId>
+ <version>${xbean_version}</version>
+ <properties>
+ <geronimo.include>true</geronimo.include>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-kernel</artifactId>
+ <version>${xbean_version}</version>
+ <properties>
+ <geronimo.include>true</geronimo.include>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>${backport_util_concurrent_version}</version>
@@ -165,6 +189,6 @@
<geronimo.dependency>true</geronimo.dependency>
</properties>
</dependency>
-
+
</dependencies>
</project>
Modified: incubator/servicemix/trunk/servicemix-gplan/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gplan/src/plan/plan.xml?rev=384794&r1=384793&r2=384794&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gplan/src/plan/plan.xml (original)
+++ incubator/servicemix/trunk/servicemix-gplan/src/plan/plan.xml Fri Mar 10 06:01:57 2006
@@ -13,9 +13,9 @@
</reference>
</gbean>
- <gbean name="ServiceMixJBIContainer" class="org.servicemix.gbean.ServiceMixGBean">
+ <gbean name="ServiceMixJBIContainer" class="org.apache.servicemix.gbean.ServiceMixGBean">
<attribute name="name">defaultJBI</attribute>
- <attribute name="directory">var/sevicemix</attribute>
+ <attribute name="directory">var/servicemix</attribute>
<reference name="transactionContextManager">
<module>geronimo/j2ee-server/${geronimo_version}/car</module>
<type>TransactionContextManager</type>
@@ -27,8 +27,8 @@
</reference>
</gbean>
- <gbean name="ServiceMixConfigBuilder" class="org.servicemix.gbean.ServiceMixConfigBuilder">
- <attribute name="defaultParentId">org/servicemix/JBIContainer</attribute>
+ <gbean name="ServiceMixConfigBuilder" class="org.apache.servicemix.gbean.ServiceMixConfigBuilder">
+ <attribute name="defaultParentId">org/apache/servicemix/JBIContainer</attribute>
<reference name="servicemix">
<type>JBIContainer</type>
<name>ServiceMixJBIContainer</name>