JBoss JBPM SVN: r6739 - jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-10-04 21:43:06 -0400 (Mon, 04 Oct 2010)
New Revision: 6739
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml
Log:
JBPM-2945 fix namespace in jboss.xml; supply messaging-type in ejb-jar.xml
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2010-10-05 01:11:29 UTC (rev 6738)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2010-10-05 01:43:06 UTC (rev 6739)
@@ -81,6 +81,7 @@
<display-name>jBPM Job Listener</display-name>
<ejb-name>JobListenerBean</ejb-name>
<ejb-class>org.jbpm.ejb.JobListenerBean</ejb-class>
+ <messaging-type>javax.jms.MessageListener</messaging-type>
<activation-config>
<activation-config-property>
<activation-config-property-name>maxSession</activation-config-property-name>
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml 2010-10-05 01:11:29 UTC (rev 6738)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml 2010-10-05 01:43:06 UTC (rev 6739)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss xmlns="http://www.jboss.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/j2ee/schema http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
version="5.0">
<enterprise-beans>
<message-driven>
13 years, 7 months
JBoss JBPM SVN: r6738 - in jbpm4/trunk/modules/pvm/src/main: resources and 1 other directory.
by do-not-reply＠jboss.org
Author: rebody
Date: 2010-10-04 21:11:29 -0400 (Mon, 04 Oct 2010)
New Revision: 6738
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/JbpmElFactoryImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/JbpmFunctionMapper.java
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml
Log:
?\230?\148?\175?\230?\140?\129?\228?\184?\186el?\230?\183?\187?\229?\138?\160?\232?\135?\170?\229?\174?\154?\228?\185?\137function
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/JbpmElFactoryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/JbpmElFactoryImpl.java 2010-10-04 16:45:09 UTC (rev 6737)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/JbpmElFactoryImpl.java 2010-10-05 01:11:29 UTC (rev 6738)
@@ -21,6 +21,8 @@
*/
package org.jbpm.pvm.internal.el;
+import java.util.HashMap;
+import java.util.Map;
import javax.el.ArrayELResolver;
import javax.el.BeanELResolver;
import javax.el.CompositeELResolver;
@@ -41,13 +43,18 @@
/**
* @author Tom Baeyens
+ * @author Huisheng Xu
*/
public class JbpmElFactoryImpl extends JbpmElFactory {
private static Log log = Log.getLog(JbpmElFactoryImpl.class.getName());
- Class<?> functionClass = JstlFunction.class;
+ protected Map<String, Class<?>> functionClassMap = new HashMap<String, Class<?>>();
+ public Map<String, Class<?>> getFunctionClassMap() {
+ return functionClassMap;
+ }
+
/** create ElContext used during parsing time */
public ELContext createElContext() {
return createCompositeResolver(null);
@@ -129,7 +136,7 @@
}
protected FunctionMapper createFunctionMapper() {
- return new JbpmFunctionMapper(functionClass);
+ return new JbpmFunctionMapper(functionClassMap);
}
protected JbpmElContext createElContext(CompositeELResolver compositeELResolver, FunctionMapper functionMapper) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/JbpmFunctionMapper.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/JbpmFunctionMapper.java 2010-10-04 16:45:09 UTC (rev 6737)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/JbpmFunctionMapper.java 2010-10-05 01:11:29 UTC (rev 6738)
@@ -22,22 +22,40 @@
package org.jbpm.pvm.internal.el;
import java.lang.reflect.Method;
-
+import java.util.Map;
import javax.el.FunctionMapper;
+import org.jbpm.internal.log.Log;
+
/**
* @author Tom Baeyens
+ * @author Huisheng Xu
*/
public class JbpmFunctionMapper extends FunctionMapper {
-
- Class<?> functionClass;
-
- public JbpmFunctionMapper(Class< ? > funtionClass) {
- this.functionClass = funtionClass;
+
+ private static Log log = Log.getLog(JbpmFunctionMapper.class.getName());
+
+ protected Map<String, Class<?>> functionClassMap;
+
+ public JbpmFunctionMapper(Map<String, Class<?>> functionClassMap) {
+ this.functionClassMap = functionClassMap;
}
public Method resolveFunction(String prefix, String localName) {
+ if (functionClassMap == null) {
+ if (log.isInfoEnabled()) {
+ log.info("configure function class has not been configured yet.");
+ }
+ return null;
+ }
+ Class<?> functionClass = functionClassMap.get(prefix);
+ if (functionClass == null) {
+ if (log.isInfoEnabled()) {
+ log.info("cannot find functionClass for prefix : " + prefix);
+ }
+ return null;
+ }
for (Method method: functionClass.getMethods()) {
if (method.getName().equals(localName)) {
return method;
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2010-10-04 16:45:09 UTC (rev 6737)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2010-10-05 01:11:29 UTC (rev 6738)
@@ -22,7 +22,20 @@
<object class="org.jbpm.pvm.internal.id.DatabaseIdComposer" init="eager" />
- <object class="org.jbpm.pvm.internal.el.JbpmElFactoryImpl" />
+ <object class="org.jbpm.pvm.internal.el.JbpmElFactoryImpl">
+ <field name="functionClassMap">
+ <map>
+ <entry>
+ <key>
+ <string value=""/>
+ </key>
+ <value>
+ <class class-name="org.jbpm.pvm.internal.el.JstlFunction"/>
+ </value>
+ </entry>
+ </map>
+ </field>
+ </object>
<types resource="jbpm.variable.types.xml" />
13 years, 7 months
JBoss JBPM SVN: r6737 - jbpm3/branches/jbpm-3.2-soa/enterprise-jee5.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2010-10-04 12:45:09 -0400 (Mon, 04 Oct 2010)
New Revision: 6737
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml
Log:
Referenced the correct artifactId property.
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2010-10-04 16:41:23 UTC (rev 6736)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2010-10-04 16:45:09 UTC (rev 6737)
@@ -57,7 +57,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<build>
- <finalName>${project.name}-${project.version}-soa4x.jar</finalName>
+ <finalName>${project.artifactId}-${project.version}-soa4x.jar</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -74,7 +74,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<build>
- <finalName>${project.name}-${project.version}-soa5x.jar</finalName>
+ <finalName>${project.artifactId}-${project.version}-soa5x.jar</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
13 years, 7 months
JBoss JBPM SVN: r6736 - jbpm3/branches/jbpm-3.2-soa/enterprise-jee5.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2010-10-04 12:41:23 -0400 (Mon, 04 Oct 2010)
New Revision: 6736
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml
Log:
Changed output name for the SOA4 and SOA5 enterprise JARs.
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2010-10-04 16:16:25 UTC (rev 6735)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2010-10-04 16:41:23 UTC (rev 6736)
@@ -52,10 +52,12 @@
<profiles>
<profile>
<id>soa4x</id>
+
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
+ <finalName>${project.name}-${project.version}-soa4x.jar</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -72,6 +74,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<build>
+ <finalName>${project.name}-${project.version}-soa5x.jar</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
13 years, 7 months
JBoss JBPM SVN: r6735 - jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2010-10-04 12:16:25 -0400 (Mon, 04 Oct 2010)
New Revision: 6735
Modified:
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
Log:
Added annotation comments.
Modified: 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 2010-10-04 16:13:54 UTC (rev 6734)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa4x-aop.xml 2010-10-04 16:16:25 UTC (rev 6735)
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<aop xmlns="urn:jboss:aop-beans:1.0">
-
+ <!-- Override the default pooling. Should be high for jBPM. -->
<domain name="jBPM Stateless" extends="Stateless Bean" inheritBindings="true">
<annotation expr="class((a)org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=200, timeout=10000)
</annotation>
</domain>
-
+
+ <!-- Override the default pooling. Should be high for jBPM. -->
<domain name="jBPM MDB" extends="Message Driven Bean" inheritBindings="true">
<annotation expr="class((a)org.jboss.annotation.ejb.PoolClass)">
@org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=200, timeout=10000)
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa5x-aop.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa5x-aop.xml 2010-10-04 16:13:54 UTC (rev 6734)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-soa5x-aop.xml 2010-10-04 16:16:25 UTC (rev 6735)
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<aop xmlns="urn:jboss:aop-beans:1.0">
+ <!-- Override the default pooling. Should be high for jBPM. -->
<domain name="jBPM Stateless" extends="Stateless Bean" inheritBindings="true">
<annotation expr="class((a)org.jboss.ejb3.annotation.Pool)">
@org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=200, timeout=10000)
</annotation>
</domain>
-
+
+ <!-- Override the default pooling. Should be high for jBPM. -->
<domain name="jBPM MDB" extends="Message Driven Bean" inheritBindings="true">
<annotation expr="class((a)org.jboss.ejb3.annotation.Pool)">
@org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=200, timeout=10000)
13 years, 7 months
JBoss JBPM SVN: r6734 - in jbpm3/branches/jbpm-3.2-soa/enterprise-jee5: src/main/etc and 1 other directories.
by do-not-reply＠jboss.org
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((a)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((a)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((a)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((a)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((a)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((a)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
13 years, 7 months
JBoss JBPM SVN: r6733 - in jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources: META-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2010-10-04 11:58:52 -0400 (Mon, 04 Oct 2010)
New Revision: 6733
Added:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml
Log:
Adding AOP Domain to increase the threads for the jBPM MDBs.
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2010-10-04 15:58:21 UTC (rev 6732)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2010-10-04 15:58:52 UTC (rev 6733)
@@ -8,7 +8,7 @@
<description>Executes commands in a separate context.</description>
<display-name>jBPM Command Service</display-name>
<ejb-name>CommandServiceBean</ejb-name>
-
+
<resource-ref>
<description>
Data source that provides the persistence service with connections.
@@ -44,8 +44,7 @@
</description>
<display-name>jBPM Command Listener</display-name>
<ejb-name>CommandListenerBean</ejb-name>
- <mapped-name>queue/JbpmCommandQueue</mapped-name>
- <ejb-class>org.jbpm.ejb.CommandListenerBean</ejb-class>
+ <ejb-class>org.jbpm.ejb.JobListenerBean</ejb-class>
<messaging-type>javax.jms.MessageListener</messaging-type>
<activation-config>
<activation-config-property>
@@ -56,6 +55,14 @@
<activation-config-property-name>dLQJNDIName</activation-config-property-name>
<activation-config-property-value>queue/JbpmDLQ</activation-config-property-value>
</activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destination</activation-config-property-name>
+ <activation-config-property-value>queue/JbpmCommandQueue</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destinationType</activation-config-property-name>
+ <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
+ </activation-config-property>
</activation-config>
<resource-ref>
<description>
@@ -73,7 +80,7 @@
</description>
<display-name>jBPM Job Listener</display-name>
<ejb-name>JobListenerBean</ejb-name>
- <mapped-name>queue/JbpmJobQueue</mapped-name>
+ <ejb-class>org.jbpm.ejb.JobListenerBean</ejb-class>
<activation-config>
<activation-config-property>
<activation-config-property-name>maxSession</activation-config-property-name>
@@ -83,6 +90,14 @@
<activation-config-property-name>dLQJNDIName</activation-config-property-name>
<activation-config-property-value>queue/JbpmDLQ</activation-config-property-value>
</activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destination</activation-config-property-name>
+ <activation-config-property-value>queue/JbpmJobQueue</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destinationType</activation-config-property-name>
+ <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
+ </activation-config-property>
</activation-config>
<resource-ref>
<description>
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml 2010-10-04 15:58:21 UTC (rev 6732)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml 2010-10-04 15:58:52 UTC (rev 6733)
@@ -1,21 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss>
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/j2ee/schema http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="5.0">
<enterprise-beans>
<message-driven>
<ejb-name>CommandListenerBean</ejb-name>
<depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
<depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends>
+ <aop-domain-name>jBPM MDB</aop-domain-name>
</message-driven>
<message-driven>
<ejb-name>JobListenerBean</ejb-name>
<depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
<depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends>
+ <aop-domain-name>jBPM MDB</aop-domain-name>
</message-driven>
<session>
<ejb-name>CommandServiceBean</ejb-name>
<local-jndi-name>java:jbpm/CommandServiceBean</local-jndi-name>
+ <aop-domain-name>jBPM Stateless</aop-domain-name>
</session>
</enterprise-beans>
</jboss>
Added: 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 (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml 2010-10-04 15:58:52 UTC (rev 6733)
@@ -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((a)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((a)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-aop.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 7 months
JBoss JBPM SVN: r6732 - jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2010-10-04 11:58:21 -0400 (Mon, 04 Oct 2010)
New Revision: 6732
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandListenerBean.java
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java
Log:
Decided to make the MDB in the ejb-jar.xml.
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandListenerBean.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandListenerBean.java 2010-10-04 12:53:46 UTC (rev 6731)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandListenerBean.java 2010-10-04 15:58:21 UTC (rev 6732)
@@ -24,9 +24,7 @@
import java.io.Serializable;
import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
import javax.ejb.MessageDrivenContext;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -82,9 +80,6 @@
*
* @author Alejandro Guizar
*/
-@MessageDriven(activationConfig = {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue")
-})
public class CommandListenerBean implements MessageListener {
private static final long serialVersionUID = 1L;
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java 2010-10-04 12:53:46 UTC (rev 6731)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java 2010-10-04 15:58:21 UTC (rev 6732)
@@ -1,14 +1,10 @@
package org.jbpm.ejb;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
import javax.jms.JMSException;
import javax.jms.Message;
-import javax.jms.MessageListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.jbpm.command.Command;
import org.jbpm.jms.ExecuteJobCommand;
@@ -27,9 +23,6 @@
*
* @author Alejandro Guizar
*/
-@MessageDriven(messageListenerInterface = MessageListener.class, activationConfig = {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue")
-})
public class JobListenerBean extends CommandListenerBean {
private static final long serialVersionUID = 1L;
13 years, 7 months
JBoss JBPM SVN: r6731 - jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2010-10-04 08:53:46 -0400 (Mon, 04 Oct 2010)
New Revision: 6731
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandServiceBean.java
Log:
Should have removed the comma after the last property.
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandServiceBean.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandServiceBean.java 2010-10-04 12:49:40 UTC (rev 6730)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandServiceBean.java 2010-10-04 12:53:46 UTC (rev 6731)
@@ -91,7 +91,7 @@
@Resources(value = {
@Resource(name = "jdbc/JbpmDataSource", type = DataSource.class, shareable = true),
@Resource(name = "jms/JbpmConnectionFactory", type = ConnectionFactory.class, shareable = true),
- @Resource(name = "jms/JobQueue", type = Queue.class),
+ @Resource(name = "jms/JobQueue", type = Queue.class)
})
public class CommandServiceBean implements LocalCommandService {
13 years, 7 months
JBoss JBPM SVN: r6730 - jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2010-10-04 08:49:40 -0400 (Mon, 04 Oct 2010)
New Revision: 6730
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml
Log:
Added DLQ reference.
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2010-10-03 13:56:44 UTC (rev 6729)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2010-10-04 12:49:40 UTC (rev 6730)
@@ -52,6 +52,10 @@
<activation-config-property-name>maxSession</activation-config-property-name>
<activation-config-property-value>150</activation-config-property-value>
</activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>dLQJNDIName</activation-config-property-name>
+ <activation-config-property-value>queue/JbpmDLQ</activation-config-property-value>
+ </activation-config-property>
</activation-config>
<resource-ref>
<description>
@@ -75,6 +79,10 @@
<activation-config-property-name>maxSession</activation-config-property-name>
<activation-config-property-value>150</activation-config-property-value>
</activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>dLQJNDIName</activation-config-property-name>
+ <activation-config-property-value>queue/JbpmDLQ</activation-config-property-value>
+ </activation-config-property>
</activation-config>
<resource-ref>
<description>
13 years, 7 months