[jbpm-commits] JBoss JBPM SVN: r6734 - in jbpm3/branches/jbpm-3.2-soa/enterprise-jee5: src/main/etc and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Oct 4 12:13:54 EDT 2010


Author: bradsdavis
Date: 2010-10-04 12:13:54 -0400 (Mon, 04 Oct 2010)
New Revision: 6734

Added:
   jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa4x-aop.xml
   jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa5x-aop.xml
Removed:
   jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml
Modified:
   jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml
   jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/etc/jbpm.cfg.xml
Log:
Added 4x and 5x configurations for pools.  4x is activated, in the profile, by default.

Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml	2010-10-04 15:58:52 UTC (rev 6733)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml	2010-10-04 16:13:54 UTC (rev 6734)
@@ -1,83 +1,116 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <name>jBPM3 - JEE5 Enterprise Beans</name>
-  <groupId>org.jbpm.jbpm3</groupId>
-  <artifactId>jbpm-enterprise-jee5</artifactId>
-  <packaging>ejb</packaging>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<name>jBPM3 - JEE5 Enterprise Beans</name>
+	<groupId>org.jbpm.jbpm3</groupId>
+	<artifactId>jbpm-enterprise-jee5</artifactId>
+	<packaging>ejb</packaging>
 
-  <parent>
-    <groupId>org.jbpm.jbpm3</groupId>
-    <artifactId>jbpm</artifactId>
-    <version>3.2.10-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+	<parent>
+		<groupId>org.jbpm.jbpm3</groupId>
+		<artifactId>jbpm</artifactId>
+		<version>3.2.10-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
 
-      <plugin>
-      	<artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-        </configuration>
-      </plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+				</configuration>
+			</plugin>
 
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>assembly-config</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>scripts/assembly-config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jbpm.jbpm3</groupId>
-      <artifactId>jbpm-jpdl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.jms</groupId>
-      <artifactId>jms</artifactId>
-      <version>1.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.ejb</groupId>
-      <artifactId>ejb-api</artifactId>
-      <version>3.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-    	<groupId>commons-lang</groupId>
-    	<artifactId>commons-lang</artifactId>
-    	<scope>provided</scope>
-    </dependency>
-  </dependencies>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>assembly-config</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>scripts/assembly-config.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>soa4x</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<resources>
+					<resource>
+						<directory>src/main/resources</directory>
+						<excludes>
+							<exclude>*soa5x*</exclude>
+						</excludes>
+					</resource>
+				</resources>
+			</build>
+		</profile>
+		<profile>
+			<id>soa5x</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<resources>
+					<resource>
+						<directory>src/main/resources</directory>
+						<excludes>
+							<exclude>*soa5x*</exclude>
+						</excludes>
+					</resource>
+				</resources>
+			</build>
+		</profile>
+	</profiles>
+	<dependencies>
+		<dependency>
+			<groupId>org.jbpm.jbpm3</groupId>
+			<artifactId>jbpm-jpdl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>jms</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.ejb</groupId>
+			<artifactId>ejb-api</artifactId>
+			<version>3.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>jsr250-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 </project>

Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/etc/jbpm.cfg.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/etc/jbpm.cfg.xml	2010-10-04 15:58:52 UTC (rev 6733)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/etc/jbpm.cfg.xml	2010-10-04 16:13:54 UTC (rev 6734)
@@ -2,27 +2,36 @@
 
   <jbpm-context>
     <service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
-    <service name="message">
-      <factory>
-        <ref bean="jbpm.jms.connector.service" />
-      </factory>
-    </service>
-    <service name="scheduler">
-      <factory>
-        <ref bean="jbpm.jms.connector.service" />
-      </factory>
-    </service>
+    	<service name="message">
+		<factory>
+			<ref bean="jbpm.jms.connector.command.service" />
+		</factory>
+		</service>
+		<service name="scheduler">
+		<factory>
+			<ref bean="jbpm.jms.connector.job.service" />
+		</factory>
+	</service>
     <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
     <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
     <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
   </jbpm-context>
 
-  <bean name="jbpm.jms.connector.service" class="org.jbpm.jms.JmsConnectorServiceFactory"
-    singleton="true">
-    <field name="jbpmConfiguration">
+  <bean name="jbpm.jms.connector.command.service" class="org.jbpm.jms.JmsConnectorServiceFactory">
+  	<field name="jbpmConfiguration">
       <ref bean="jbpm.configuration" />
     </field>
+	<property name="connectionFactoryJndiName"><string value="java:JmsXA"/></property>
+	<property name="destinationJndiName"><string value="queue/JbpmJobQueue"/></property>
   </bean>
+  
+  <bean name="jbpm.jms.connector.job.service" class="org.jbpm.jms.JmsConnectorServiceFactory">
+  	<field name="jbpmConfiguration">
+      <ref bean="jbpm.configuration" />
+    </field>
+	<property name="connectionFactoryJndiName"><string value="java:JmsXA"/></property>
+	<property name="destinationJndiName"><string value="queue/JbpmJobQueue"/></property>
+  </bean>
 
   <!-- employ the context class loader -->
   <string name="jbpm.class.loader" value="context" />

Deleted: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml	2010-10-04 15:58:52 UTC (rev 6733)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml	2010-10-04 16:13:54 UTC (rev 6734)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
-
-   <domain name="jBPM Stateless" extends="Stateless Bean" inheritBindings="true">
-      <annotation expr="class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=200, timeout=10000)
-      </annotation>
-   </domain>
-
-   <domain name="jBPM MDB" extends="Message Driven Bean" inheritBindings="true">
-      <annotation expr="class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=200, timeout=10000)
-      </annotation>
-   </domain>
-</aop>
-

Added: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa4x-aop.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa4x-aop.xml	                        (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa4x-aop.xml	2010-10-04 16:13:54 UTC (rev 6734)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+   <domain name="jBPM Stateless" extends="Stateless Bean" inheritBindings="true">
+      <annotation expr="class(@org.jboss.annotation.ejb.PoolClass)">
+         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=200, timeout=10000)
+      </annotation>
+   </domain>
+
+   <domain name="jBPM MDB" extends="Message Driven Bean" inheritBindings="true">
+      <annotation expr="class(@org.jboss.annotation.ejb.PoolClass)">
+         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=200, timeout=10000)
+      </annotation>
+   </domain>
+</aop>
+


Property changes on: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa4x-aop.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa5x-aop.xml (from rev 6733, jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa5x-aop.xml	                        (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa5x-aop.xml	2010-10-04 16:13:54 UTC (rev 6734)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+   <domain name="jBPM Stateless" extends="Stateless Bean" inheritBindings="true">
+      <annotation expr="class(@org.jboss.ejb3.annotation.Pool)">
+         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=200, timeout=10000)
+      </annotation>
+   </domain>
+
+   <domain name="jBPM MDB" extends="Message Driven Bean" inheritBindings="true">
+      <annotation expr="class(@org.jboss.ejb3.annotation.Pool)">
+         @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=200, timeout=10000)
+      </annotation>
+   </domain>
+</aop>
+


Property changes on: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa5x-aop.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain



More information about the jbpm-commits mailing list