7:41 p.m.
Author: alex.guizar(a)jboss.com
Date: 2010-10-01 20:41:56 -0400 (Fri, 01 Oct 2010)
New Revision: 6725
Added:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm-no-auto.cfg.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm.cfg.xml
Removed:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/core/scripts/antrun-config.xml
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java
Log:
SOA-2367 change JBPM2908Test to read different configuration files depending on the target
database, and no longer modifies the configuration
Modified: jbpm3/branches/jbpm-3.2-soa/core/scripts/antrun-config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/scripts/antrun-config.xml 2010-10-01 22:45:35 UTC
(rev 6724)
+++ jbpm3/branches/jbpm-3.2-soa/core/scripts/antrun-config.xml 2010-10-02 00:41:56 UTC
(rev 6725)
@@ -97,7 +97,5 @@
tofile="${project.test.output.dir}/hibernate-no-auto.cfg.xml" />
<macro-disable
file="${project.test.output.dir}/hibernate-no-auto.cfg.xml"
section="Automatic schema creation" />
- <macro-enable
file="${project.test.output.dir}/org/jbpm/jbpm2908/jbpm2.cfg.xml"
- section="No automatic schema creation"/>
</target>
</project>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java 2010-10-01
22:45:35 UTC (rev 6724)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2908/ChangeJbpmConfigurationAction.java 2010-10-02
00:41:56 UTC (rev 6725)
@@ -10,9 +10,11 @@
private static final long serialVersionUID = 1L;
- public void execute(ExecutionContext context) throws Exception {
+ public void execute(ExecutionContext exeContext) throws Exception {
// load another configuration
- JbpmConfiguration jbpmConfiguration =
JbpmConfiguration.parseResource("org/jbpm/jbpm2908/jbpm2.cfg.xml");
+ String dialect = (String) exeContext.getVariable("dialect");
+ JbpmConfiguration jbpmConfiguration =
JbpmConfiguration.parseResource(dialect.indexOf("HSQL") != -1 ?
+ "org/jbpm/jbpm2908/jbpm-no-auto.cfg.xml" :
"org/jbpm/jbpm2908/jbpm.cfg.xml");
try {
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java 2010-10-01
22:45:35 UTC (rev 6724)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2908/JBPM2908Test.java 2010-10-02
00:41:56 UTC (rev 6725)
@@ -35,15 +35,6 @@
*/
public class JBPM2908Test extends AbstractDbTestCase {
- protected String getJbpmTestConfig() {
- return "org/jbpm/jbpm2908/jbpm1.cfg.xml";
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- jbpmConfiguration.close();
- }
-
public void testChangingJbpmConfigurationInActionHandler() throws Exception {
// deploy definition
ProcessDefinition processDefinition1 =
ProcessDefinition.parseXmlResource("org/jbpm/jbpm2908/processdefinition1.xml");
@@ -52,7 +43,8 @@
deployProcessDefinition(processDefinition2);
// start instance
- ProcessInstance processInstance =
jbpmContext.newProcessInstance("process1");
+ ProcessInstance processInstance =
jbpmContext.newProcessInstanceForUpdate("process1");
+ processInstance.getContextInstance().setVariable("dialect",
getHibernateDialect());
processInstance.signal();
assert processInstance.hasEnded() : processInstance;
}
Copied:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm-no-auto.cfg.xml
(from rev 6720,
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml)
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm-no-auto.cfg.xml
(rev 0)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm-no-auto.cfg.xml 2010-10-02
00:41:56 UTC (rev 6725)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbpm-configuration>
+ <string name="resource.hibernate.cfg.xml"
value="hibernate-no-auto.cfg.xml" />
+</jbpm-configuration>
Copied: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm.cfg.xml
(from rev 6720,
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm.cfg.xml
(rev 0)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm.cfg.xml 2010-10-02
00:41:56 UTC (rev 6725)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbpm-configuration />
Deleted:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml 2010-10-01
22:45:35 UTC (rev 6724)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm1.cfg.xml 2010-10-02
00:41:56 UTC (rev 6725)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbpm-configuration />
Deleted:
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml 2010-10-01
22:45:35 UTC (rev 6724)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2908/jbpm2.cfg.xml 2010-10-02
00:41:56 UTC (rev 6725)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbpm-configuration>
- <!-- No automatic schema creation (begin) ===
- <string name="resource.hibernate.cfg.xml"
value="hibernate-no-auto.cfg.xml" />
- ==== No automatic schema creation (end) -->
-</jbpm-configuration>