servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r389813 - in /incubator/servicemix/trunk/servicemix-gplan: project.xml src/plan/plan.xml
Date Wed, 29 Mar 2006 15:29:54 GMT
Author: gnodet
Date: Wed Mar 29 07:29:53 2006
New Revision: 389813

URL: http://svn.apache.org/viewcvs?rev=389813&view=rev
Log:
Update geronimo deployment plan

Modified:
    incubator/servicemix/trunk/servicemix-gplan/project.xml
    incubator/servicemix/trunk/servicemix-gplan/src/plan/plan.xml

Modified: incubator/servicemix/trunk/servicemix-gplan/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gplan/project.xml?rev=389813&r1=389812&r2=389813&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gplan/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-gplan/project.xml Wed Mar 29 07:29:53 2006
@@ -44,7 +44,7 @@
 		<!-- parent config -->
 		<dependency>
 			<groupId>geronimo</groupId>
-			<artifactId>j2ee-server</artifactId>
+			<artifactId>j2ee-deployer</artifactId>
 			<version>${geronimo_version}</version>
 			<type>car</type>
 			<properties>
@@ -65,7 +65,7 @@
 			<artifactId>geronimo-deployment</artifactId>
 			<version>${geronimo_version}</version>
 			<properties>
-				<geronimo.dependency>true</geronimo.dependency>
+				<!--geronimo.dependency>true</geronimo.dependency-->
 			</properties>
 		</dependency>
 		<dependency>
@@ -73,7 +73,7 @@
 			<artifactId>geronimo-connector</artifactId>
 			<version>${geronimo_version}</version>
 			<properties>
-				<geronimo.dependency>true</geronimo.dependency>
+				<!--geronimo.dependency>true</geronimo.dependency-->
 			</properties>
 		</dependency>
 		<dependency>
@@ -81,7 +81,7 @@
 			<artifactId>geronimo-transaction</artifactId>
 			<version>${geronimo_version}</version>
 			<properties>
-				<geronimo.dependency>true</geronimo.dependency>
+				<!--geronimo.dependency>true</geronimo.dependency-->
 			</properties>
 		</dependency>
 
@@ -174,6 +174,30 @@
 			</properties>
 		</dependency>
 		<dependency>
+			<groupId>xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<version>${xstream_version}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>wsdl4j</groupId>
+			<artifactId>wsdl4j</artifactId>
+			<version>${wsdl4j_version}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>woodstox</groupId>
+			<artifactId>wstx-asl</artifactId>
+			<version>${woodstox_version}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
 			<groupId>concurrent</groupId>
 			<artifactId>concurrent</artifactId>
 			<version>${concurrent_version}</version>
@@ -186,7 +210,7 @@
 			<artifactId>activemq-core</artifactId>
 			<version>${activemq_version}</version>
 			<properties>
-				<geronimo.dependency>true</geronimo.dependency>
+				<geronimo.include>true</geronimo.include>
 			</properties>
 		</dependency>
 		

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=389813&r1=389812&r2=389813&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gplan/src/plan/plan.xml (original)
+++ incubator/servicemix/trunk/servicemix-gplan/src/plan/plan.xml Wed Mar 29 07:29:53 2006
@@ -1,15 +1,18 @@
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
+    configId="servicemix/${pom.currentVersion}/car"
+    domain="geronimo.maven"
+    server="geronimo">
 
     <gbean name="WorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
         <attribute name="syncMaximumPoolSize">30</attribute>
         <attribute name="startMaximumPoolSize">30</attribute>
         <attribute name="scheduledMaximumPoolSize">30</attribute>
         <reference name="TransactionContextManager">
-        	<module>geronimo/j2ee-server/${geronimo_version}/car</module>
-        	<type>TransactionContextManager</type>
-        	<name>TransactionContextManager</name>
+          <domain>geronimo.server</domain>
+          <module>geronimo/j2ee-server/${geronimo_version}/car</module>
+          <type>TransactionContextManager</type>
+          <name>TransactionContextManager</name>
         </reference>
     </gbean>
 
@@ -17,18 +20,19 @@
         <attribute name="name">defaultJBI</attribute>
         <attribute name="directory">var/servicemix</attribute>
         <reference name="transactionContextManager">
-        	<module>geronimo/j2ee-server/${geronimo_version}/car</module>
-        	<type>TransactionContextManager</type>
-        	<name>TransactionContextManager</name>
+          <domain>geronimo.server</domain>
+          <module>geronimo/j2ee-server/${geronimo_version}/car</module>
+          <type>TransactionContextManager</type>
+          <name>TransactionContextManager</name>
         </reference>
         <reference name="workManager">
-            <type>JCAWorkManager</type>
-        	<name>WorkManager</name>
+          <type>JCAWorkManager</type>
+          <name>WorkManager</name>
         </reference>
     </gbean>
-    
+
     <gbean name="ServiceMixConfigBuilder" class="org.apache.servicemix.gbean.ServiceMixConfigBuilder">
-        <attribute name="defaultParentId">org/apache/servicemix/JBIContainer</attribute>
+        <attribute name="defaultParentId">servicemix/${pom.currentVersion}/car</attribute>
         <reference name="servicemix">
           <type>JBIContainer</type>
           <name>ServiceMixJBIContainer</name>



Mime
View raw message