[servicemix-scm] [1043] trunk: Split the servicemix-gbean module into servicemix-gplan module to allow building a car file for Geronimo.

Wed, 07 Dec 2005 07:15:25 -0800

Title: [1043] trunk: Split the servicemix-gbean module into servicemix-gplan module to allow building a car file for Geronimo.
Revision
1043
Author
gnt
Date
2005-12-07 10:07:45 -0500 (Wed, 07 Dec 2005)

Log Message

Split the servicemix-gbean module into servicemix-gplan module to allow building a car file for Geronimo.
Update gbeans and plan to work with the upcoming geronimo 1.0.


Modified Paths




Added Paths




Removed Paths

Diff

Modified: trunk/servicemix-gbean/src/main/java/org/servicemix/gbean/ServiceMixGBean.java (1042 => 1043)

--- trunk/servicemix-gbean/src/main/java/org/servicemix/gbean/ServiceMixGBean.java	2005-12-07 14:53:27 UTC (rev 1042)
+++ trunk/servicemix-gbean/src/main/java/org/servicemix/gbean/ServiceMixGBean.java	2005-12-07 15:07:45 UTC (rev 1043)
@@ -10,6 +10,7 @@
 import org.servicemix.jbi.container.JBIContainer;
 
 import javax.jbi.JBIException;
+import javax.resource.spi.work.WorkManager;
 import javax.transaction.TransactionManager;
 
 public class ServiceMixGBean implements GBeanLifecycle, ServiceMixContainer {
@@ -20,6 +21,7 @@
     private String name;
     private String directory;
     private TransactionContextManager transactionContextManager;
+    private WorkManager workManager;
 
     public static final GBeanInfo GBEAN_INFO;
 
@@ -29,8 +31,9 @@
         infoFactory.addAttribute("name", String.class, true);
         infoFactory.addAttribute("directory", String.class, true);
         infoFactory.addReference("transactionContextManager", TransactionContextManager.class);
+        infoFactory.addReference("workManager", WorkManager.class);
         infoFactory.setConstructor(new String[]{"name", "directory"});
-        infoFactory.setConstructor(new String[]{"name", "directory", "transactionContextManager"});
+        infoFactory.setConstructor(new String[]{"name", "directory", "transactionContextManager", "workManager"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 
@@ -39,13 +42,14 @@
     }
 
     public ServiceMixGBean(String name, String directory) {
-        this(name, directory, null);
+        this(name, directory, null, null);
     }
 
-    public ServiceMixGBean(String name, String directory, TransactionContextManager transactionContextManager) {
+    public ServiceMixGBean(String name, String directory, TransactionContextManager transactionContextManager, WorkManager workManager) {
         this.name = name;
         this.directory = directory;
         this.transactionContextManager = transactionContextManager;
+        this.workManager = workManager;
     }
     
     /**
@@ -102,7 +106,8 @@
         container.setRootDir(directory);
         container.setTransactionManager(getTransactionManager());
         container.setMonitorInstallationDirectory(false);
-        container.setWorkManager(null);
+        container.setMonitorDeploymentDirectory(false);
+        container.setWorkManager(workManager);
         return container;
     }

Deleted: trunk/servicemix-gbean/src/main/resources/plan.xml (1042 => 1043)

--- trunk/servicemix-gbean/src/main/resources/plan.xml	2005-12-07 14:53:27 UTC (rev 1042)
+++ trunk/servicemix-gbean/src/main/resources/plan.xml	2005-12-07 15:07:45 UTC (rev 1043)
@@ -1,51 +0,0 @@
-<configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment"
-    configId="org/servicemix/JBIContainer"
-    parentId="org/apache/geronimo/Server"
-    >
-    <dependency>
-        <uri>servicemix/jars/servicemix-gbean-2.1-SNAPSHOT.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>servicemix/jars/servicemix-2.1-SNAPSHOT.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>backport-util-concurrent/jars/backport-util-concurrent-2.0_01_pd.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>activemq/jars/activemq-core-3.2.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>jencks/jars/jencks-1.1.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>springframework/jars/spring-1.2.5.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>commons-beanutils/jars/commons-beanutils-1.7.0.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-deployment-1.0-SNAPSHOT.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>xbean/jars/xbean-spring-2.0.jar</uri>
-    </dependency>
-
-    <gbean name="ServiceMixJBIContainer" class="org.servicemix.gbean.ServiceMixGBean">
-        <attribute name="name">ServiceMix</attribute>
-        <attribute name="directory">var/servicemix</attribute>
-        <reference name="transactionContextManager">
-        	<module>org/apache/geronimo/Server</module>
-        	<type>TransactionContextManager</type>
-        	<name>TransactionContextManager</name>
-        </reference>
-    </gbean>
-    
-    <gbean name="ServiceMixConfigBuilder" class="org.servicemix.gbean.ServiceMixConfigBuilder">
-        <attribute name="defaultParentId">org/servicemix/JBIContainer</attribute>
-        <reference name="servicemix">
-          <type>JBIContainer</type>
-          <name>ServiceMixJBIContainer</name>
-        </reference>
-    </gbean>
-</configuration>

Added: trunk/servicemix-gplan/maven.xml (1042 => 1043)

--- trunk/servicemix-gplan/maven.xml	2005-12-07 14:53:27 UTC (rev 1042)
+++ trunk/servicemix-gplan/maven.xml	2005-12-07 15:07:45 UTC (rev 1043)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project default="default">
+
+  <goal name="default" prereqs="car:install"/>
+
+  <goal name="nightly" prereqs="clean, car:install, car:deploy"/>
+    
+</project>

Added: trunk/servicemix-gplan/project.properties (1042 => 1043)

--- trunk/servicemix-gplan/project.properties	2005-12-07 14:53:27 UTC (rev 1042)
+++ trunk/servicemix-gplan/project.properties	2005-12-07 15:07:45 UTC (rev 1043)
@@ -0,0 +1,5 @@
+maven.multiproject.type=car
+
+# just use basic GBean deployer
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
+

Added: trunk/servicemix-gplan/project.xml (1042 => 1043)

--- trunk/servicemix-gplan/project.xml	2005-12-07 14:53:27 UTC (rev 1042)
+++ trunk/servicemix-gplan/project.xml	2005-12-07 15:07:45 UTC (rev 1043)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project>
+<project>
+	<pomVersion>3</pomVersion>
+	<extend>${basedir}/../etc/project.xml</extend>
+
+	<name>ServiceMix :: GPlan</name>
+	<id>servicemix-gplan</id>
+	<shortDescription>Geronimo Configuration</shortDescription>
+	<description>
+		ServiceMix Configuration plan for Apache Geronimo
+	</description>
+
+	<!-- ============ -->
+	<!-- Dependencies -->
+	<!-- ============ -->
+	<dependencies>
+
+		<!-- dependency on deployer -->
+		<dependency>
+			<groupId>geronimo</groupId>
+			<artifactId>geronimo-packaging-plugin</artifactId>
+			<version>${geronimo_version}</version>
+			<type>plugin</type>
+		</dependency>
+		<dependency>
+			<groupId>geronimo</groupId>
+			<artifactId>geronimo-gbean-deployer</artifactId>
+			<version>${geronimo_version}</version>
+			<type>car</type>
+		</dependency>
+		<dependency>
+			<groupId>geronimo</groupId>
+			<artifactId>j2ee-deployer</artifactId>
+			<version>${geronimo_version}</version>
+			<type>car</type>
+		</dependency>
+		<dependency>
+			<groupId>geronimo</groupId>
+			<artifactId>jetty-deployer</artifactId>
+			<version>${geronimo_version}</version>
+			<type>car</type>
+		</dependency>
+		<!-- parent config -->
+		<dependency>
+			<groupId>geronimo</groupId>
+			<artifactId>j2ee-server</artifactId>
+			<version>${geronimo_version}</version>
+			<type>car</type>
+			<properties>
+				<geronimo.import>true</geronimo.import>
+			</properties>
+		</dependency>
+
+		<dependency>
+			<groupId>xmlbeans</groupId>
+			<artifactId>xbean</artifactId>
+			<version>${xmlbeans_version}</version>
+			<properties>
+				<geronimo.dependency>true</geronimo.dependency>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>geronimo</groupId>
+			<artifactId>geronimo-deployment</artifactId>
+			<version>${geronimo_version}</version>
+			<properties>
+				<geronimo.dependency>true</geronimo.dependency>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>geronimo</groupId>
+			<artifactId>geronimo-connector</artifactId>
+			<version>${geronimo_version}</version>
+			<properties>
+				<geronimo.dependency>true</geronimo.dependency>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>geronimo</groupId>
+			<artifactId>geronimo-transaction</artifactId>
+			<version>${geronimo_version}</version>
+			<properties>
+				<geronimo.dependency>true</geronimo.dependency>
+			</properties>
+		</dependency>
+
+		<dependency>
+			<groupId>servicemix</groupId>
+			<artifactId>servicemix-jbi</artifactId>
+			<version>${pom.currentVersion}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>servicemix</groupId>
+			<artifactId>servicemix-core</artifactId>
+			<version>${pom.currentVersion}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>servicemix</groupId>
+			<artifactId>servicemix-gbean</artifactId>
+			<version>${pom.currentVersion}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>springframework</groupId>
+			<artifactId>spring</artifactId>
+			<version>${spring_version}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>org.xbean</groupId>
+			<artifactId>xbean-spring</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>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>${commons_beanutils_version}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>jencks</groupId>
+			<artifactId>jencks</artifactId>
+			<version>${jencks_version}</version>
+			<properties>
+				<geronimo.include>true</geronimo.include>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>concurrent</groupId>
+			<artifactId>concurrent</artifactId>
+			<version>${concurrent_version}</version>
+			<properties>
+				<geronimo.dependency>true</geronimo.dependency>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>activemq</groupId>
+			<artifactId>activemq-core</artifactId>
+			<version>${activemq_version}</version>
+			<properties>
+				<geronimo.dependency>true</geronimo.dependency>
+			</properties>
+		</dependency>
+
+	</dependencies>
+</project>

Added: trunk/servicemix-gplan/src/plan/plan.xml (1042 => 1043)

--- trunk/servicemix-gplan/src/plan/plan.xml	2005-12-07 14:53:27 UTC (rev 1042)
+++ trunk/servicemix-gplan/src/plan/plan.xml	2005-12-07 15:07:45 UTC (rev 1043)
@@ -0,0 +1,38 @@
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
+    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
+
+    <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>
+        </reference>
+    </gbean>
+
+    <gbean name="ServiceMixJBIContainer" class="org.servicemix.gbean.ServiceMixGBean">
+        <attribute name="name">servicemix</attribute>
+        <attribute name="directory">var</attribute>
+        <reference name="transactionContextManager">
+        	<module>geronimo/j2ee-server/${geronimo_version}/car</module>
+        	<type>TransactionContextManager</type>
+        	<name>TransactionContextManager</name>
+        </reference>
+        <reference name="workManager">
+            <type>JCAWorkManager</type>
+        	<name>WorkManager</name>
+        </reference>
+    </gbean>
+    
+    <gbean name="ServiceMixConfigBuilder" class="org.servicemix.gbean.ServiceMixConfigBuilder">
+        <attribute name="defaultParentId">org/servicemix/JBIContainer</attribute>
+        <reference name="servicemix">
+          <type>JBIContainer</type>
+          <name>ServiceMixJBIContainer</name>
+        </reference>
+    </gbean>
+
+</configuration>

Reply via email to