[jbpm-commits] JBoss JBPM SVN: r3875 - in jbpm4/trunk/modules: api/src/main/resources and 24 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Feb 13 12:09:13 EST 2009
Author: tom.baeyens at jboss.com
Date: 2009-02-13 12:09:13 -0500 (Fri, 13 Feb 2009)
New Revision: 3875
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java
jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java
jbpm4/trunk/modules/api/src/main/resources/cfg.xsd
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml
jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml
jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml
jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java
jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml
jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml
Log:
JBPM-1983 rename context environment to transaction
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -31,10 +31,10 @@
public interface Context {
/** key of the process-engine context in the environment */
- String CONTEXTNAME_ENVIRONMENT_FACTORY = "process-engine";
+ String CONTEXTNAME_PROCESS_ENGINE = "process-engine";
/** key of the block context in the environment */
- String CONTEXTNAME_ENVIRONMENT = "environment";
+ String CONTEXTNAME_TRANSACTION = "transaction";
String getName();
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -85,9 +85,9 @@
*
* <p>A second purpose of the environment is to enable specific to global searching
* of resources. E.g. you could search for an 'adminEmailAddress' in the contexts
- * 'processDefinition-execution', 'processDefinition-definition' and 'process-engine' in the given order.
+ * 'execution', 'transaction' and 'process-engine' in the given order.
* That way, a global adminEmailAddress can be specified in the process-engine context
- * and it can be refined in more specific contexts processDefinition-definition or processDefinition-execution.
+ * and it can be refined in more specific contexts.
* </p>
*
* <h3>Search order</h3>
Modified: jbpm4/trunk/modules/api/src/main/resources/cfg.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2009-02-13 17:09:13 UTC (rev 3875)
@@ -103,7 +103,7 @@
<element name="context-ref">
<annotation><documentation>The context. This refers to
- the environment, process-engine or the wire context.
+ the contexts transaction or process-engine.
</documentation></annotation>
<complexType>
<attribute name="context-name" type="string">
@@ -121,13 +121,13 @@
</documentation></annotation>
<complexType>
<sequence>
- <element ref="tns:process-engine" />
+ <element ref="tns:process-engine-context" />
<element ref="tns:environment" />
</sequence>
</complexType>
</element>
- <element name="process-engine" type="tns:contextType">
+ <element name="process-engine-context" type="tns:contextType">
<annotation><documentation>Defines the environment factory
context. (Aka application context)
</documentation></annotation>
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -104,7 +104,7 @@
<literal><emphasis role="bold">environment.cfg.xml</emphasis>:</literal>
<programlisting><jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<assign-file-type>
@@ -145,15 +145,15 @@
<types resource="jbpm.pvm.types.xml" />
<job-executor auto-start="false" />
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<hibernate-session />
<transaction />
<pvm-db-session />
<job-db-session />
<message-session />
- </environment>
+ </transaction-context>
</jbpm-configuration></programlisting>
<para>And next to it a hibernate.properties like this</para>
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -24,11 +24,11 @@
16 |<emphasis role="bold"> </hibernate-configuration></emphasis>
17 | </process-engine>
18 |
-19 | <environment>
+19 | <transaction-context>
20 |<emphasis role="bold"> <standard-transaction /></emphasis>
21 |<emphasis role="bold"> <hibernate-session /></emphasis>
22 |<emphasis role="bold"> <pvm-db-session /></emphasis>
-23 | </environment>
+23 | </transaction-context>
24 |
25 | </jbpm-configuration></programlisting>
<para><literal>line 04</literal> specifies a hibernate session factory in the
Modified: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -9,7 +9,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<check-process />
@@ -41,13 +41,13 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<hibernate-session current="true" />
<pvm-db-session />
<job-db-session />
<ejb-timer-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -1,6 +1,6 @@
<jbpm-configuration>
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<check-process />
@@ -29,13 +29,13 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<hibernate-session current="true" />
<pvm-db-session />
<job-db-session />
<ejb-timer-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -2,7 +2,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<assign-file-type>
@@ -51,9 +51,9 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<hibernate-session />
<transaction />
<pvm-db-session />
@@ -61,6 +61,6 @@
<task-db-session />
<message-session />
<timer-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -2,7 +2,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<assign-file-type>
@@ -44,9 +44,9 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<hibernate-session />
<transaction />
<pvm-db-session />
@@ -54,6 +54,6 @@
<task-db-session />
<message-session />
<timer-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -190,7 +190,7 @@
environment.addContext(environmentFactoryCtxWireContext);
// add the environment block context
- WireContext environmentContext = new WireContext(environmentCtxWireDefinition, Context.CONTEXTNAME_ENVIRONMENT, environment, true);
+ WireContext environmentContext = new WireContext(environmentCtxWireDefinition, Context.CONTEXTNAME_TRANSACTION, environment, true);
// add the environment block context to the environment
environment.addContext(environmentContext);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -77,11 +77,11 @@
}
public Context getEnvironmentFactoryContext() {
- return getContext(Context.CONTEXTNAME_ENVIRONMENT_FACTORY);
+ return getContext(Context.CONTEXTNAME_PROCESS_ENGINE);
}
public Context getEnvironmentContext() {
- return getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ return getContext(Context.CONTEXTNAME_TRANSACTION);
}
// userId methods ///////////////////////////////////////////////////////////
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -80,7 +80,7 @@
WireDefinition environmentWireDefinition = getBlockWireDefinition(documentElement, parse);
// create the application wire context from the definition
- WireContext environmentFactoryWireContext = new WireContext(environmentFactoryWireDefinition, Context.CONTEXTNAME_ENVIRONMENT_FACTORY);
+ WireContext environmentFactoryWireContext = new WireContext(environmentFactoryWireDefinition, Context.CONTEXTNAME_PROCESS_ENGINE);
// propagate the parser classloader to the application context
environmentFactoryWireContext.setClassLoader(classLoader);
@@ -94,7 +94,7 @@
}
WireDefinition getApplicationWireDefinition(Element documentElement, Parse parse) {
- Element applicationElement = XmlUtil.element(documentElement, Context.CONTEXTNAME_ENVIRONMENT_FACTORY);
+ Element applicationElement = XmlUtil.element(documentElement, "process-engine-context");
if (applicationElement != null) {
return (WireDefinition) environmentFactoryXmlParser.parseDocumentElement(applicationElement, parse);
}
@@ -102,7 +102,7 @@
}
WireDefinition getBlockWireDefinition(Element documentElement, Parse parse) {
- Element blockElement = XmlUtil.element(documentElement, Context.CONTEXTNAME_ENVIRONMENT);
+ Element blockElement = XmlUtil.element(documentElement, "transaction-context");
if (blockElement != null) {
return (WireDefinition) environmentXmlParser.parseDocumentElement(blockElement, parse);
}
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -36,12 +36,12 @@
public void testBasicEnvironmentOperation() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <object name='a' class='"+Object.class.getName()+"' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <object name='b' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -109,12 +109,12 @@
public void testUnexistingElement() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <object name='a' class='"+Object.class.getName()+"' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <object name='b' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -137,9 +137,9 @@
Environment environment = environmentFactory.openEnvironment();
try {
- Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT_FACTORY);
+ Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE);
assertNotNull(environmentFactoryCtxt);
- Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environmentCtxt);
} finally {
@@ -159,9 +159,9 @@
Environment environment = environmentFactory.openEnvironment();
try {
assertNotNull(environment);
- Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT_FACTORY);
+ Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE);
assertNotNull(environmentFactoryCtxt);
- Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environmentCtxt);
} finally {
@@ -179,9 +179,9 @@
Environment environment = environmentFactory.openEnvironment();
try {
assertNotNull(environment);
- Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT_FACTORY);
+ Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE);
assertNotNull(environmentFactoryCtxt);
- Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environmentCtxt);
} finally {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -38,12 +38,12 @@
public void testEnvironmentDefaultSearchOrder() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <string name='a' value='process-engine-a' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <string name='a' value='environment-a' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -60,12 +60,12 @@
public void testEnvironmentGivenSearchOrder() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <string name='a' value='process-engine-a' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <string name='a' value='environment-a' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -84,13 +84,13 @@
public void testEnvironmentGivenSearchOrderUnexistingObject() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <string name='a' value='process-engine-a' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <string name='a' value='environment-a' />" +
" <string name='b' value='environment-b' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -110,12 +110,12 @@
public void testEnvironmentDefaultSearchOrderWithAddedContext() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <string name='a' value='process-engine-a' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <string name='a' value='environment-a' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -144,12 +144,12 @@
public void testEnvironmentGivenSearchOrderWithAddedContext() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <string name='a' value='process-engine-a' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <string name='a' value='environment-a' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -168,7 +168,7 @@
environment.addContext(addedContext);
// only search in context 'process-engine' and 'environment'
- String[] searchOrder = new String[]{"environment", "process-engine"};
+ String[] searchOrder = new String[]{"transaction", "process-engine"};
assertEquals("environment-a", environment.get("a", searchOrder));
} finally {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -37,12 +37,12 @@
public void testApplicationTypeLookup() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <object class='"+A.class.getName()+"' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <string name='a' value='distraction' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -61,12 +61,12 @@
public void testBlockTypeLookup() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <string name='a' value='distraction' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <object class='"+A.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -85,12 +85,12 @@
public void testNonExistingTypeLookup() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <string name='a' value='A' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <string name='b' value='B' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -34,12 +34,12 @@
public void testNestedEnvironments() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <object name='a' class='"+Object.class.getName()+"' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <object name='b' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -43,14 +43,14 @@
public void dontTestGroovyExpression() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <script-manager default-expression-language='juel'" +
" default-script-language='juel'" +
" read-contexts='execution, environment, process-engine' " +
" write-context='execution'>" +
" <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" +
" </script-manager>" +
- " </process-engine>" +
+ " </process-engine-context>" +
"</jbpm-configuration>"
);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -39,14 +39,14 @@
public void testJuelExpression() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <script-manager default-expression-language='juel'" +
" default-script-language='juel'" +
" read-contexts='execution, environment, process-engine' " +
" write-context='execution'>" +
" <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />" +
" </script-manager>" +
- " </process-engine>" +
+ " </process-engine-context>" +
"</jbpm-configuration>"
);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -44,12 +44,12 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction name='tx' />" +
" <object name='o' class='"+ MyResource.class.getName()+"'>" +
" <enlist transaction='tx'/>" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -74,12 +74,12 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction name='tx' />" +
" <object name='o' class='"+ MyResource.class.getName()+"'>" +
" <enlist transaction='tx'/>" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -104,12 +104,12 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction name='tx' />" +
" <object name='o' class='"+ MyResource.class.getName()+"'>" +
" <enlist transaction='tx'/>" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -137,12 +137,12 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction name='tx' />" +
" <object name='o' class='"+ MyResource.class.getName()+"'>" +
" <enlist transaction='tx'/>" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -170,12 +170,12 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction name='transaction' />" +
" <object name='o' class='java.lang.Object'>" +
" <enlist transaction='transaction'/>" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -194,12 +194,12 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <object name='o' class='"+MyResource.class.getName()+"'>" +
" <enlist transaction='tx'/>" +
" </object>" +
" <object name='tx' class='java.lang.Object'/>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -218,9 +218,9 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -61,7 +61,7 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
" <object name='resourceOne' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
@@ -72,7 +72,7 @@
" <object name='resourceThree' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
try {
@@ -133,7 +133,7 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
" <object name='resourceOne' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
@@ -144,7 +144,7 @@
" <object name='resourceThree' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
try {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -47,12 +47,12 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
" <object name='resourceOne' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
try {
@@ -84,7 +84,7 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
" <object name='resourceOne' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
@@ -95,7 +95,7 @@
" <object name='resourceThree' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
try {
@@ -142,7 +142,7 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
" <object name='resourceOne' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
@@ -153,7 +153,7 @@
" <object name='resourceThree' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
try {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -48,12 +48,12 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
" <object name='resourceOne' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
try {
@@ -87,7 +87,7 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
" <object name='resourceOne' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
@@ -98,7 +98,7 @@
" <object name='resourceThree' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
try {
@@ -147,7 +147,7 @@
Environment environment = openEnvironment(
"<jbpm-configuration>" +
" <process-engine/>"+
- " <environment>" +
+ " <transaction-context>" +
" <transaction />" +
" <object name='resourceOne' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
@@ -158,7 +158,7 @@
" <object name='resourceThree' class='"+TestResource.class.getName()+"'>" +
" <enlist />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
try {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -56,11 +56,11 @@
// In this test, there is no eager initialization
WireContext context = new WireContext((WireDefinition) WireParser.getInstance().parseXmlString(
- " <environment>" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"'>" +
" <subscribe context='foo'/>" +
" </object>" +
- " </environment>"
+ " </transaction-context>"
));
try{
@@ -78,18 +78,18 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"'>" +
" <subscribe />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
- WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environment.get("recorder"));
// The recorder object will be subscribed to the environment WireScope
@@ -128,12 +128,12 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -162,13 +162,13 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe />" +
" </object>" +
" <object name='o' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -203,12 +203,12 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe event='interestingevent'/>" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -216,7 +216,7 @@
try {
assertEquals(events.toString(), 0, events.size());
- WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
contextBlockContext.fire("interestingevent", null);
assertEquals(events.toString(), 1, events.size());
@@ -239,18 +239,18 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe events='constructing, open, constructed, interestingevent, close'/>" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
- WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertEquals(events.toString(), 2, events.size());
int index=0;
@@ -286,13 +286,13 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe events='constructing, open, constructed, interestingevent, close'/>" +
" </object>" +
" <object name='o' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -322,15 +322,15 @@
public void testOtherWireScope() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <object name='factory' class='"+Object.class.getName()+"' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe context='process-engine'/>" +
" </object>" +
" <object name='product' factory='factory' method='getClass' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -372,15 +372,15 @@
public void testOtherWireScopeWithEventFiltering() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <object name='factory' class='"+Object.class.getName()+"' />" +
- " </process-engine>" +
- " <environment>" +
+ " </process-engine-context>" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe context='process-engine' events='initializing' />" +
" </object>" +
" <object name='product' factory='factory' method='getClass' />" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -410,12 +410,12 @@
public void testUnexistingScope() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe context='unexistingcontext' />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
@@ -439,8 +439,8 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='a' class='"+A.class.getName()+"'>" +
" <field name='o'>" +
" <object name='recorder' class='"+Recorder.class.getName()+"'>" +
@@ -448,13 +448,13 @@
" </object>" +
" </field>" +
" </object>"+
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
- WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environment.get("a"));
// The recorder object will be subscribed to the environment WireContext
@@ -498,8 +498,8 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='a' class='"+A.class.getName()+"'>" +
" <field name='o'>" +
" <object name='b' class='"+A.class.getName()+"'>" +
@@ -511,13 +511,13 @@
" </object>"+
" </field>" +
" </object>"+
- " </environment>" +
+ " </transaction-context>" +
"</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
- WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
assertNotNull(environment.get("a"));
// The recorder object will be subscribed to the environment WireContext
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -14,10 +14,10 @@
public void testEnvironmentWire(){
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context /> " +
+ " <transaction-context>" +
" <env-ref name='e' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -38,10 +38,10 @@
public void testEnvironmentFactoryWire(){
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <process-engine-ref name='f' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -60,12 +60,12 @@
public void testContextRefEnvironmentWire(){
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
- "<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ "<jbpm-configuration>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <context-ref name='c' />" +
- " </environment>" +
- "</environment-scopes>"
+ " </transaction-context>" +
+ "</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
@@ -75,7 +75,7 @@
assertNotNull(c);
assertEquals(WireContext.class, c.getClass());
- assertEquals(environment.getContext("environment"), c);
+ assertEquals(environment.getContext("transaction"), c);
} finally {
environment.close();
}
@@ -85,9 +85,9 @@
public void testContextRefEnvironmentFactoryWire(){
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <context-ref name='c' />" +
- " </process-engine>" +
+ " </process-engine-context>" +
" <environment/>" +
"</environment-scopes>"
);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -45,15 +45,15 @@
*/
public void testMethodWithNoArg() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
- "<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ "<jbpm-configuration>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" +
" <subscribe object='a' method='logEvent' />" +
" </object>" +
" <object name='a' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
- "</environment-scopes>"
+ " </transaction-context>" +
+ "</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
@@ -87,15 +87,15 @@
*/
public void testMethodWithBadName() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
- "<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ "<jbpm-configuration>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" +
" <subscribe object='a' method='i-am-not-a-method' />" +
" </object>" +
" <object name='a' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
- "</environment-scopes>"
+ " </transaction-context>" +
+ "</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
@@ -124,9 +124,9 @@
*/
public void testMethodWithOneArg() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
- "<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ "<jbpm-configuration>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" +
" <subscribe object='a' method='logEvent' >" +
" <arg>" +
@@ -135,8 +135,8 @@
" </subscribe>" +
" </object>" +
" <object name='a' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
- "</environment-scopes>"
+ " </transaction-context>" +
+ "</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
@@ -171,9 +171,9 @@
*/
public void testMethodWithTwoArgs() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
- "<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ "<jbpm-configuration>" +
+ " <process-engine-context /> "+
+ " <transaction-context>" +
" <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" +
" <subscribe object='a' method='logEvent' event='ping'>" +
" <arg type='java.lang.Object'>" +
@@ -193,8 +193,8 @@
" </subscribe>" +
" </object>" +
" <object name='a' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
- "</environment-scopes>"
+ " </transaction-context>" +
+ "</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
@@ -231,9 +231,9 @@
*/
public void testMethodWithThreeArgs() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
- "<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ "<jbpm-configuration>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" +
" <subscribe object='a' method='logEvent'>" +
" <arg type='java.lang.Object'>" +
@@ -248,8 +248,8 @@
" </subscribe>" +
" </object>" +
" <object name='a' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
- "</environment-scopes>"
+ " </transaction-context>" +
+ "</jbpm-configuration>"
);
Environment environment = environmentFactory.openEnvironment();
try {
@@ -284,8 +284,8 @@
public void testMethodWithArgsAndMultipleObjectsSubcription() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" +
" <subscribe object='a' method='logEvent' >" +
" <arg>" +
@@ -300,7 +300,7 @@
" </object>" +
" <object name='a' class='"+DefaultObservable.class.getName()+"' />" +
" <object name='b' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
Environment environment = environmentFactory.openEnvironment();
@@ -375,8 +375,8 @@
public void testMethodAndOverLoading() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='l' class='"+OverloadingRecorder.class.getName()+"' init='eager'>" +
" <subscribe object='a' method='logEvent' >" +
" <arg type='java.lang.Object'>" +
@@ -385,7 +385,7 @@
" </subscribe>" +
" </object>" +
" <object name='a' class='"+OverloadingTestClass.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
Environment environment = environmentFactory.openEnvironment();
@@ -430,8 +430,8 @@
public void testMethodAndBadArg() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='l' class='"+OverloadingRecorder.class.getName()+"' init='eager'>" +
" <subscribe object='a' method='logEvent' >" +
" <arg type='java.lang.Integer'>" +
@@ -440,7 +440,7 @@
" </subscribe>" +
" </object>" +
" <object name='a' class='"+OverloadingTestClass.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
Environment environment = environmentFactory.openEnvironment();
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -40,13 +40,13 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"'>" +
" <subscribe object='o' />" +
" </object>" +
" <object name='o' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -82,13 +82,13 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe object='o' />" +
" </object>" +
" <object name='o' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -128,15 +128,15 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe objects='newsletter, blog, newspaper' />" +
" </object>" +
" <object name='newsletter' class='"+DefaultObservable.class.getName()+"' />" +
" <object name='blog' class='"+DefaultObservable.class.getName()+"' />" +
" <object name='newspaper' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -195,12 +195,12 @@
public void testUnexistingObject() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe object='unexistingobject' />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -208,7 +208,7 @@
environmentFactory.openEnvironment();
fail("expected exception");
} catch (WireException e) {
- assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe to object in context environment: object unexistingobject unavailable", e.getMessage());
+ assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe to object in context transaction: object unexistingobject unavailable", e.getMessage());
}
}
@@ -218,13 +218,13 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe object='o' events='ping, pong' />" +
" </object>" +
" <object name='o' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -268,13 +268,13 @@
public void testNotObservableObject() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
" <subscribe object='o' />" +
" </object>" +
" <object name='o' class='java.lang.Object' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -282,7 +282,7 @@
environmentFactory.openEnvironment();
fail("expected exception");
} catch (WireException e) {
- assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe to object in context environment: object o (java.lang.Object) isn't "+Observable.class.getName(), e.getMessage());
+ assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe to object in context transaction: object o (java.lang.Object) isn't "+Observable.class.getName(), e.getMessage());
}
environmentFactory.close();
}
@@ -290,13 +290,13 @@
public void testNotListener() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='java.lang.Object' init='eager'>" +
" <subscribe object='o' />" +
" </object>" +
" <object name='o' class='" + DefaultObservable.class.getName() +"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -42,15 +42,15 @@
public void testRegisterToAllDescriptors() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"'>" +
// If no object(s) are specified, the subscriber will be informed of
// events on *all* descriptors.
" <subscribe to='wire-events' />" +
" </object>" +
" <object name='o' class='"+DefaultObservable.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -84,8 +84,8 @@
public void testOneObjectDescriptor() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
// only subscribe to wire-events of object o, which means that recorder will
// be notified of any event produced by the descriptor of object o
@@ -93,7 +93,7 @@
" </object>" +
" <object name='o' class='"+DefaultObservable.class.getName()+"' />" +
" <object name='p' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -141,15 +141,15 @@
public void testMultipleObjectDescriptors() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
// record all wire events coming from the descriptors of objects o and p
" <subscribe to='wire-events' objects='o, p' />" +
" </object>" +
" <object name='o' class='"+DefaultObservable.class.getName()+"' />" +
" <object name='p' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -217,15 +217,15 @@
public void testOneObjectDescriptorWithEventFilter() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
// record only 'initializing' wire events produced by the descriptor of object o.
" <subscribe to='wire-events' object='o' event='initializing' />" +
" </object>" +
" <object name='o' class='"+DefaultObservable.class.getName()+"' />" +
" <object name='p' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
@@ -258,15 +258,15 @@
public void testMultipleObjectDescriptorsWithEventFilter() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" +
// record 'constructing' and 'constructed' events fired by descriptors for objects o and p
" <subscribe to='wire-events' objects='o, p' events='constructing, constructed' />" +
" </object>" +
" <object name='o' class='"+DefaultObservable.class.getName()+"' />" +
" <object name='p' class='"+Object.class.getName()+"' />" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -48,18 +48,18 @@
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
"<environment-scopes>" +
- " <process-engine />" +
- " <environment>" +
+ " <process-engine-context />" +
+ " <transaction-context>" +
" <object name='recorder' class='"+Recorder.class.getName()+"'>" +
" <subscribe />" +
" </object>" +
- " </environment>" +
+ " </transaction-context>" +
"</environment-scopes>"
);
Environment environment = environmentFactory.openEnvironment();
try {
- WireContext environmentContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT);
+ WireContext environmentContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION);
// this test also checks non-eager-initialized subscription
// subscription should only be done when the object is created the first time
Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -2,7 +2,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<assign-file-type>
@@ -55,16 +55,16 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
+ <transaction />
<hibernate-session />
- <transaction />
<pvm-db-session />
<job-db-session />
<message-session />
<timer-session />
<identity-session realm="realm://jbpm-identity" />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -1,6 +1,6 @@
<jbpm-configuration>
- <process-engine>
+ <process-engine-context>
<object class="org.jbpm.pvm.internal.hibernate.PvmNamingStrategy" auto-wire="true" />
@@ -27,9 +27,9 @@
<transaction-interceptor />
</command-service>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<transaction />
<hibernate-session />
@@ -38,6 +38,6 @@
<pvm-db-session />
<job-db-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -2,7 +2,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<assign-file-type>
@@ -36,12 +36,12 @@
</hibernate-configuration>
<hibernate-session-factory />
<types resource="jbpm.pvm.types.xml" />
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<transaction />
<hibernate-session />
<pvm-db-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -2,7 +2,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<job-test-helper />
@@ -49,14 +49,14 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<transaction />
<hibernate-session />
<pvm-db-session />
<message-session target="test" />
<timer-session target="test" />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -1,10 +1,10 @@
<jbpm-configuration>
- <process-engine>
+ <process-engine-context>
<types resource="jbpm.pvm.types.xml" />
- </process-engine>
+ </process-engine-context>
- <environment>
- </environment>
+ <transaction-context>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -1,6 +1,6 @@
<jbpm-configuration>
- <process-engine>
+ <process-engine-context>
<hibernate-configuration>
<properties resource="hibernate.properties" />
@@ -17,14 +17,14 @@
<hibernate-session-factory />
<types resource="jbpm.pvm.types.xml" />
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<transaction />
<hibernate-session />
<pvm-db-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -1,6 +1,6 @@
<jbpm-configuration>
- <process-engine>
+ <process-engine-context>
<job-executor threads="1" auto-start="false" />
@@ -33,9 +33,9 @@
<!-- used in JobExecutorTimerSessionTest -->
<map name="timerVariables" synchronized="true" />
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<transaction />
<hibernate-session />
@@ -45,5 +45,5 @@
<message-session />
<timer-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -1,10 +1,10 @@
<jbpm-configuration>
- <process-engine>
+ <process-engine-context>
<types resource="jbpm.pvm.types.xml" />
- </process-engine>
+ </process-engine-context>
- <environment>
- </environment>
+ <transaction-context>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -1,6 +1,6 @@
<jbpm-configuration>
- <process-engine>
+ <process-engine-context>
<hibernate-configuration>
<properties resource="hibernate.properties" />
@@ -18,14 +18,14 @@
<types>
<type name="date" class="java.util.Date" variable-class="org.jbpm.pvm.internal.type.variable.DateVariable" />
</types>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<transaction />
<hibernate-session />
<pvm-db-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -2,7 +2,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<assign-file-type>
@@ -56,9 +56,9 @@
<holiday period="01/07/2008 - 31/08/2008" />
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<hibernate-session />
<transaction />
<pvm-db-session />
@@ -66,6 +66,6 @@
<message-session />
<timer-session />
<task-db-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-02-13 17:09:13 UTC (rev 3875)
@@ -47,11 +47,11 @@
ProcessEngine processEngine = new Configuration()
.setXmlString(
"<jbpm-configuration>" +
- " <process-engine>" +
+ " <process-engine-context>" +
" <process-service />" +
" <execution-service />" +
" <management-service />" +
- " </process-engine>" +
+ " </process-engine-context>" +
"</jbpm-configuration>"
)
.buildProcessEngine();
Modified: jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -2,7 +2,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<assign-file-type>
@@ -56,9 +56,9 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<hibernate-session />
<transaction />
<pvm-db-session />
@@ -67,6 +67,6 @@
<message-session />
<timer-session />
<history-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
Modified: jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874)
+++ jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875)
@@ -2,7 +2,7 @@
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine>
+ <process-engine-context>
<deployer-manager>
<assign-file-type>
@@ -46,15 +46,15 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine>
+ </process-engine-context>
- <environment>
+ <transaction-context>
<hibernate-session />
<transaction />
<pvm-db-session />
<job-db-session />
<message-session />
<timer-session />
- </environment>
+ </transaction-context>
</jbpm-configuration>
More information about the jbpm-commits
mailing list