JBoss JBPM SVN: r6915 - in jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src: test/java/org/jbpm and 2 other directories.
by do-not-reply@jboss.org
Author: mputz
Date: 2011-04-18 05:38:38 -0400 (Mon, 18 Apr 2011)
New Revision: 6915
Added:
jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/jbpm3171/
jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java
Modified:
jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/db/DeleteProcessInstanceDbTest.java
Log:
SOA-3030: Removed key from hashCode function, to ensure that the hashCode remains stable for persisted ProcessInstances
Modified: jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-04-18 08:58:31 UTC (rev 6914)
+++ jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-04-18 09:38:38 UTC (rev 6915)
@@ -502,14 +502,18 @@
&& processDefinition.equals(other.getProcessDefinition());
}
+ /**
+ * Computes the hash code for this process instance. Process instances without an id
+ * (not persisted to db) will return their {@linkplain System#identityHashCode(Object) identity
+ * hash code}.
+ */
public int hashCode() {
- if (key == null) return super.hashCode();
-
- int result = 295436291 + key.hashCode();
- result = 1367411281 * result + processDefinition.hashCode();
- return result;
+ if (id != 0)
+ return (int) (id ^ (id >>> 32));
+ else
+ return System.identityHashCode(this);
}
-
+
public String toString() {
return "ProcessInstance"
+ (key != null ? '(' + key + ')' : id != 0 ? "(" + id + ')'
Modified: jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/db/DeleteProcessInstanceDbTest.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/db/DeleteProcessInstanceDbTest.java 2011-04-18 08:58:31 UTC (rev 6914)
+++ jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/db/DeleteProcessInstanceDbTest.java 2011-04-18 09:38:38 UTC (rev 6915)
@@ -112,7 +112,58 @@
newTransaction();
assertDeleted(processInstance);
}
+
+ // Test related to JBPM-3171: if the ProcessInstance.hashCode function contains the process instance key,
+ // the variable handling is broken, which results in a Integrity constraint violation FK_TKVARMAP_CTXT table: JBPM_TOKENVARIABLEMAP
+ // at process instance deletion.
+ public void testDeleteProcessInstanceWithSubProcessInstanceAndVariableAndSetKey() {
+ ProcessDefinition buyCheese = ProcessDefinition.parseXmlString("<process-definition name='buy cheese'>"
+ + " <start-state>"
+ + " <transition to='find shop' />"
+ + " <event type='node-leave'>"
+ + " <script name='set_key'>"
+ + " executionContext.getProcessInstance().setKey(\"fondue_purchase\");"
+ + " </script>"
+ + " </event>"
+ + " </start-state>"
+ + " <state name='find shop' >"
+ + " <event type='node-enter'>"
+ + " <script name='change_variable'>"
+ + " executionContext.setVariable(\"cheese\", \"comte\");"
+ + " </script>"
+ + " </event>"
+ + " </state>"
+ + "</process-definition>");
+ deployProcessDefinition(buyCheese);
+ ProcessDefinition makeFondue = ProcessDefinition.parseXmlString("<process-definition name='make fondue'>"
+ + " <start-state>"
+ + " <transition to='buy cheese' />"
+ + " <event type='node-leave'>"
+ + " <script name='add_variable'>"
+ + " executionContext.setVariable(\"cheese\", \"vacherin\");"
+ + " </script>"
+ + " </event>"
+ + " </start-state>"
+ + " <process-state name='buy cheese'>"
+ + " <sub-process name='buy cheese'/>"
+ + " <variable name='cheese' access='read,write' mapped-name='cheese'/>"
+ + " </process-state>"
+ + "</process-definition>");
+ deployProcessDefinition(makeFondue);
+
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("make fondue");
+ processInstance.signal();
+
+ processInstance = saveAndReload(processInstance);
+ jbpmContext.getGraphSession().deleteProcessInstance(processInstance);
+
+ newTransaction();
+ assertDeleted(processInstance.getRootToken().getProcessInstance());
+ assertDeleted(processInstance);
+ }
+
+
private void assertDeleted(ProcessInstance processInstance) {
long processInstanceId = processInstance.getId();
assertNull("process instance not deleted: " + processInstanceId,
Added: jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java (rev 0)
+++ jbpm3/tags/jbpm-3.2.10_SOA-3030/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java 2011-04-18 09:38:38 UTC (rev 6915)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jbpm3171;
+
+import java.util.Date;
+
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.context.exe.ContextInstance;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+
+/**
+ * Test hashCode implementation of ProcessInstance and - as a result -
+ * correct variable handling
+ *
+ * @see <a href="https://jira.jboss.org/browse/JBPM-3171">JBPM-3171</a>
+ * @author Martin Weiler
+ */
+public class JBPM3171Test extends AbstractJbpmTestCase {
+
+ ProcessDefinition processDefinition;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ processDefinition = ProcessDefinition.createNewProcessDefinition();
+ }
+
+ // test normal variable handling
+ public void testVariableWithoutKey() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ ContextInstance contextInstance = processInstance.getContextInstance();
+ contextInstance.setVariable("red", new String("hat"));
+ assertEquals("hat", contextInstance.getVariable("red"));
+ }
+
+ // test variable handling when process instance has been created with a key
+ public void testVariableWithKey() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition, null, "key_at_instance_creation");
+ ContextInstance contextInstance = processInstance.getContextInstance();
+ contextInstance.setVariable("j", new String("boss"));
+ assertEquals("boss", contextInstance.getVariable("j"));
+ }
+
+ // test variable handling when setKey is called on the process instance after creation
+ public void testVariableAfterSettingKey() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ ContextInstance contextInstance = processInstance.getContextInstance();
+ contextInstance.setVariable("hiber", new String("nate"));
+ contextInstance.getProcessInstance().setKey("key_set_on_existing_instance");
+ assertEquals("nate", contextInstance.getVariable("hiber"));
+ }
+
+ // test if hashCode changes after setting a key on the process instance
+ public void testHashCodeAfterSettingKey() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ int hashCode = processInstance.hashCode();
+ processInstance.setKey("key_set_on_existing_instance");
+ assertEquals(hashCode, processInstance.hashCode());
+ }
+
+ // basic ProcessInstance.hashCode test
+ public void testProcessInstanceHashCode() {
+ ProcessInstance processInstance1 = new ProcessInstance(processDefinition);
+ ProcessInstance processInstance2 = new ProcessInstance(processDefinition);
+ assertTrue(processInstance1.hashCode()!=processInstance2.hashCode());
+ }
+}
13 years
JBoss JBPM SVN: r6914 - jbpm3/tags.
by do-not-reply@jboss.org
Author: mputz
Date: 2011-04-18 04:58:31 -0400 (Mon, 18 Apr 2011)
New Revision: 6914
Added:
jbpm3/tags/jbpm-3.2.10_SOA-3030/
Log:
Create patch branch for SOA-3030
13 years
JBoss JBPM SVN: r6913 - in jbpm3/branches/jbpm-3.2-soa/core/src: test/java/org/jbpm and 2 other directories.
by do-not-reply@jboss.org
Author: mputz
Date: 2011-04-14 09:59:06 -0400 (Thu, 14 Apr 2011)
New Revision: 6913
Added:
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/db/DeleteProcessInstanceDbTest.java
Log:
JBPM-3171: Removed key from hashCode function, to ensure that the hashCode remains stable for persisted ProcessInstances
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-04-04 21:27:00 UTC (rev 6912)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2011-04-14 13:59:06 UTC (rev 6913)
@@ -502,14 +502,18 @@
&& processDefinition.equals(other.getProcessDefinition());
}
+ /**
+ * Computes the hash code for this process instance. Process instances without an id
+ * (not persisted to db) will return their {@linkplain System#identityHashCode(Object) identity
+ * hash code}.
+ */
public int hashCode() {
- if (key == null) return super.hashCode();
-
- int result = 295436291 + key.hashCode();
- result = 1367411281 * result + processDefinition.hashCode();
- return result;
+ if (id != 0)
+ return (int) (id ^ (id >>> 32));
+ else
+ return System.identityHashCode(this);
}
-
+
public String toString() {
return "ProcessInstance"
+ (key != null ? '(' + key + ')' : id != 0 ? "(" + id + ')'
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/db/DeleteProcessInstanceDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/db/DeleteProcessInstanceDbTest.java 2011-04-04 21:27:00 UTC (rev 6912)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/db/DeleteProcessInstanceDbTest.java 2011-04-14 13:59:06 UTC (rev 6913)
@@ -112,7 +112,58 @@
newTransaction();
assertDeleted(processInstance);
}
+
+ // Test related to JBPM-3171: if the ProcessInstance.hashCode function contains the process instance key,
+ // the variable handling is broken, which results in a Integrity constraint violation FK_TKVARMAP_CTXT table: JBPM_TOKENVARIABLEMAP
+ // at process instance deletion.
+ public void testDeleteProcessInstanceWithSubProcessInstanceAndVariableAndSetKey() {
+ ProcessDefinition buyCheese = ProcessDefinition.parseXmlString("<process-definition name='buy cheese'>"
+ + " <start-state>"
+ + " <transition to='find shop' />"
+ + " <event type='node-leave'>"
+ + " <script name='set_key'>"
+ + " executionContext.getProcessInstance().setKey(\"fondue_purchase\");"
+ + " </script>"
+ + " </event>"
+ + " </start-state>"
+ + " <state name='find shop' >"
+ + " <event type='node-enter'>"
+ + " <script name='change_variable'>"
+ + " executionContext.setVariable(\"cheese\", \"comte\");"
+ + " </script>"
+ + " </event>"
+ + " </state>"
+ + "</process-definition>");
+ deployProcessDefinition(buyCheese);
+ ProcessDefinition makeFondue = ProcessDefinition.parseXmlString("<process-definition name='make fondue'>"
+ + " <start-state>"
+ + " <transition to='buy cheese' />"
+ + " <event type='node-leave'>"
+ + " <script name='add_variable'>"
+ + " executionContext.setVariable(\"cheese\", \"vacherin\");"
+ + " </script>"
+ + " </event>"
+ + " </start-state>"
+ + " <process-state name='buy cheese'>"
+ + " <sub-process name='buy cheese'/>"
+ + " <variable name='cheese' access='read,write' mapped-name='cheese'/>"
+ + " </process-state>"
+ + "</process-definition>");
+ deployProcessDefinition(makeFondue);
+
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("make fondue");
+ processInstance.signal();
+
+ processInstance = saveAndReload(processInstance);
+ jbpmContext.getGraphSession().deleteProcessInstance(processInstance);
+
+ newTransaction();
+ assertDeleted(processInstance.getRootToken().getProcessInstance());
+ assertDeleted(processInstance);
+ }
+
+
private void assertDeleted(ProcessInstance processInstance) {
long processInstanceId = processInstance.getId();
assertNull("process instance not deleted: " + processInstanceId,
Added: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java 2011-04-14 13:59:06 UTC (rev 6913)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jbpm3171;
+
+import java.util.Date;
+
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.context.exe.ContextInstance;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+
+/**
+ * Test hashCode implementation of ProcessInstance and - as a result -
+ * correct variable handling
+ *
+ * @see <a href="https://jira.jboss.org/browse/JBPM-3171">JBPM-3171</a>
+ * @author Martin Weiler
+ */
+public class JBPM3171Test extends AbstractJbpmTestCase {
+
+ ProcessDefinition processDefinition;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ processDefinition = ProcessDefinition.createNewProcessDefinition();
+ }
+
+ // test normal variable handling
+ public void testVariableWithoutKey() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ ContextInstance contextInstance = processInstance.getContextInstance();
+ contextInstance.setVariable("red", new String("hat"));
+ assertEquals("hat", contextInstance.getVariable("red"));
+ }
+
+ // test variable handling when process instance has been created with a key
+ public void testVariableWithKey() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition, null, "key_at_instance_creation");
+ ContextInstance contextInstance = processInstance.getContextInstance();
+ contextInstance.setVariable("j", new String("boss"));
+ assertEquals("boss", contextInstance.getVariable("j"));
+ }
+
+ // test variable handling when setKey is called on the process instance after creation
+ public void testVariableAfterSettingKey() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ ContextInstance contextInstance = processInstance.getContextInstance();
+ contextInstance.setVariable("hiber", new String("nate"));
+ contextInstance.getProcessInstance().setKey("key_set_on_existing_instance");
+ assertEquals("nate", contextInstance.getVariable("hiber"));
+ }
+
+ // test if hashCode changes after setting a key on the process instance
+ public void testHashCodeAfterSettingKey() {
+ ProcessInstance processInstance = new ProcessInstance(processDefinition);
+ int hashCode = processInstance.hashCode();
+ processInstance.setKey("key_set_on_existing_instance");
+ assertEquals(hashCode, processInstance.hashCode());
+ }
+
+ // basic ProcessInstance.hashCode test
+ public void testProcessInstanceHashCode() {
+ ProcessInstance processInstance1 = new ProcessInstance(processDefinition);
+ ProcessInstance processInstance2 = new ProcessInstance(processDefinition);
+ assertTrue(processInstance1.hashCode()!=processInstance2.hashCode());
+ }
+}
13 years
JBoss JBPM SVN: r6912 - in jbpm3/branches/jbpm-3.2-soa/enterprise-jee5: scripts and 3 other directories.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2011-04-04 17:27:00 -0400 (Mon, 04 Apr 2011)
New Revision: 6912
Added:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/scripts/assembly-eap4.xml
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources-eap4/
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources-eap4/jbpm-aop.xml
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml
Removed:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap4x-aop.xml
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap5x-aop.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml
Log:
JBPM-3169 distinguish jbpm-enterprise-jee5 artifacts by classifier
Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2011-03-30 09:44:26 UTC (rev 6911)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2011-04-04 21:27:00 UTC (rev 6912)
@@ -42,6 +42,22 @@
</descriptors>
</configuration>
</execution>
+
+ <execution>
+ <id>assembly-eap4</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>scripts/assembly-eap4.xml</descriptor>
+ </descriptors>
+ <archive>
+ <addMavenDescriptor>true</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -84,39 +100,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>eap4x</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <finalName>${project.artifactId}-${project.version}-eap4x</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>*eap5x*</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
- </profile>
-
- <profile>
- <id>eap5x</id>
- <build>
- <finalName>${project.artifactId}-${project.version}-eap5x</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>*eap4x*</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
- </profile>
- </profiles>
</project>
Added: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/scripts/assembly-eap4.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/scripts/assembly-eap4.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/scripts/assembly-eap4.xml 2011-04-04 21:27:00 UTC (rev 6912)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>eap4</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>jbpm-aop.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/src/main/resources-eap4</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Copied: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-aop.xml (from rev 6902, jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap5x-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 2011-04-04 21:27:00 UTC (rev 6912)
@@ -0,0 +1,18 @@
+<?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)
+ </annotation>
+ </domain>
+</aop>
+
Deleted: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap4x-aop.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap4x-aop.xml 2011-03-30 09:44:26 UTC (rev 6911)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap4x-aop.xml 2011-04-04 21:27:00 UTC (rev 6912)
@@ -1,17 +0,0 @@
-<?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)
- </annotation>
- </domain>
-</aop>
-
Deleted: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap5x-aop.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap5x-aop.xml 2011-03-30 09:44:26 UTC (rev 6911)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/jbpm-eap5x-aop.xml 2011-04-04 21:27:00 UTC (rev 6912)
@@ -1,18 +0,0 @@
-<?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)
- </annotation>
- </domain>
-</aop>
-
Added: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources-eap4/jbpm-aop.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources-eap4/jbpm-aop.xml (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources-eap4/jbpm-aop.xml 2011-04-04 21:27:00 UTC (rev 6912)
@@ -0,0 +1,17 @@
+<?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)
+ </annotation>
+ </domain>
+</aop>
+
Property changes on: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources-eap4/jbpm-aop.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 1 month