[jboss-svn-commits] JBL Code SVN: r25893 - in labs/jbossrules/trunk/drools-process/drools-osworkflow: src/test/java/org/drools/osworkflow/test/persistence and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 30 13:27:07 EDT 2009
Author: salaboy21
Date: 2009-03-30 13:27:07 -0400 (Mon, 30 Mar 2009)
New Revision: 25893
Modified:
labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java
Log:
update the OSWorkflow Module to use the new persistence module and the new set of APIs
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml 2009-03-30 17:25:25 UTC (rev 25892)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml 2009-03-30 17:27:07 UTC (rev 25893)
@@ -12,32 +12,44 @@
<packaging>jar</packaging>
<name>Drools :: Process :: OSWorkflow</name>
- <build/>
+ <build>
+ <!--plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <argLine>-Xdebug -Djava.compiler=none -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</argLine>
+ </configuration>
+ </plugin>
+ </plugins-->
+
+ </build>
<dependencies>
- <!-- Internal dependencies -->
+ <!-- Internal dependencies -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-process-enterprise</artifactId>
- <version>5.0.0.SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-persistence-jpa</artifactId>
+ <version>5.0.0.SNAPSHOT</version>
+ </dependency>
<!-- External dependencies -->
<dependency>
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java 2009-03-30 17:25:25 UTC (rev 25892)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java 2009-03-30 17:27:07 UTC (rev 25893)
@@ -19,6 +19,18 @@
import org.drools.rule.Package;
import bitronix.tm.resource.jdbc.PoolingDataSource;
+import java.util.ArrayList;
+import java.util.List;
+import org.drools.KnowledgeBase;
+import org.drools.KnowledgeBaseFactory;
+import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderError;
+import org.drools.builder.KnowledgeBuilderErrors;
+import org.drools.builder.KnowledgeBuilderFactory;
+import org.drools.builder.ResourceType;
+import org.drools.builder.impl.KnowledgeBuilderImpl;
+import org.drools.definition.KnowledgePackage;
+import org.drools.io.ResourceFactory;
public abstract class AbstractJPAPersistenceTest extends TestCase {
@@ -65,18 +77,28 @@
/**
* Process definition.
*/
- protected static RuleBase createKnowledgeBase(RuleBaseConfiguration conf, String resourceName) {
+ protected static KnowledgeBase createKnowledgeBase(RuleBaseConfiguration conf, String resourceName) {
try {
// create a builder
- PackageBuilder builder = new PackageBuilder();
- // load the process
- Reader source = new InputStreamReader(OSWorkFlowPersistenceTest.class
- .getResourceAsStream(resourceName));
- builder.addProcessFromXml(source);
+
+ KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
+
+ kbuilder.add(ResourceFactory.newClassPathResource(resourceName), ResourceType.DRF);
+
+ KnowledgeBuilderErrors errors = kbuilder.getErrors();
+ if (errors.size() > 0) {
+ for (KnowledgeBuilderError error: errors) {
+ System.err.println(error);
+ }
+ throw new IllegalArgumentException("Could not parse knowledge.");
+ }
+ KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+ kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
+
// create the knowledge base
- Package pkg = builder.getPackage();
- RuleBase ruleBase = RuleBaseFactory.newRuleBase(conf);
- ruleBase.addPackage(pkg);
+ KnowledgeBase ruleBase = KnowledgeBaseFactory.newKnowledgeBase(conf);
+
+ ruleBase.addKnowledgePackages(kbuilder.getKnowledgePackages());
return ruleBase;
} catch (Exception e) {
// TODO Auto-generated catch block
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java 2009-03-30 17:25:25 UTC (rev 25892)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java 2009-03-30 17:27:07 UTC (rev 25893)
@@ -15,6 +15,7 @@
import org.drools.runtime.process.ProcessInstance;
import bitronix.tm.TransactionManagerServices;
+import org.drools.KnowledgeBase;
public class ComplexProcessPersistenceTest extends AbstractJPAPersistenceTest {
@@ -27,7 +28,7 @@
Properties properties = setupCommonProperties();
RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
// load the process
- RuleBase ruleBase = createKnowledgeBase(conf,"/entrevistarf.rf");
+ KnowledgeBase ruleBase = createKnowledgeBase(conf,"entrevistarf.rf");
SessionConfiguration config = new SessionConfiguration(properties);
@@ -38,20 +39,20 @@
ProcessInstance processInstance = (ProcessInstance) service.execute(startProcessCommand);
System.out.println("Started process instance " + processInstance.getId());
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ service = new SingleSessionCommandService(sessionId, ruleBase, config, environment);
GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
assertNotNull(processInstance);
System.out.println("Now working with processInstance " + processInstance.getId());
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ service = new SingleSessionCommandService(sessionId, ruleBase, config, environment);
DoActionCommand doActionCmd = new DoActionCommand();
doActionCmd.setProcessInstanceId(processInstance.getId());
doActionCmd.setActionId(2); //Action to be executed at current step
service.execute(doActionCmd);
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ service = new SingleSessionCommandService(sessionId, ruleBase, config, environment);
getProcessInstanceCommand = new GetProcessInstanceCommand();
getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
@@ -59,13 +60,13 @@
System.out.println("Now working with processInstance " + processInstance.getId());
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ service = new SingleSessionCommandService(sessionId, ruleBase, config, environment);
doActionCmd = new DoActionCommand();
doActionCmd.setProcessInstanceId(processInstance.getId());
doActionCmd.setActionId(4); //Action to be executed at current step
service.execute(doActionCmd);
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ service = new SingleSessionCommandService(sessionId, ruleBase, config, environment);
getProcessInstanceCommand = new GetProcessInstanceCommand();
getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java 2009-03-30 17:25:25 UTC (rev 25892)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java 2009-03-30 17:27:07 UTC (rev 25893)
@@ -17,6 +17,7 @@
import org.drools.runtime.process.ProcessInstance;
import bitronix.tm.TransactionManagerServices;
+import org.drools.KnowledgeBase;
public class OSWorkFlowPersistenceSplitJoinTest extends AbstractJPAPersistenceTest {
@@ -29,7 +30,7 @@
Properties properties = setupCommonProperties();
RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
// load the process
- RuleBase ruleBase = createKnowledgeBase(conf,"/simple2rf.rf");
+ KnowledgeBase ruleBase = createKnowledgeBase(conf,"simple2rf.rf");
SessionConfiguration config = new SessionConfiguration(properties);
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTest.java 2009-03-30 17:25:25 UTC (rev 25892)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTest.java 2009-03-30 17:27:07 UTC (rev 25893)
@@ -21,6 +21,7 @@
import bitronix.tm.TransactionManagerServices;
import bitronix.tm.resource.jdbc.PoolingDataSource;
+import org.drools.KnowledgeBase;
public class OSWorkFlowPersistenceTest extends AbstractJPAPersistenceTest {
@@ -33,7 +34,7 @@
Properties properties = setupCommonProperties();
RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
// load the process
- RuleBase ruleBase = createKnowledgeBase(conf,"/simplerf.rf");
+ KnowledgeBase ruleBase = createKnowledgeBase(conf,"simplerf.rf");
SessionConfiguration config = new SessionConfiguration(properties);
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java 2009-03-30 17:25:25 UTC (rev 25892)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java 2009-03-30 17:27:07 UTC (rev 25893)
@@ -19,6 +19,7 @@
import org.drools.runtime.process.ProcessInstance;
import bitronix.tm.TransactionManagerServices;
+import org.drools.KnowledgeBase;
public class OSWorkFlowPersistenceWFPTest extends AbstractJPAPersistenceTest {
@@ -31,7 +32,7 @@
Properties properties = setupCommonProperties();
RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
// load the process
- RuleBase ruleBase = createKnowledgeBase(conf, "/wfprf.rf");
+ KnowledgeBase ruleBase = createKnowledgeBase(conf, "wfprf.rf");
SessionConfiguration config = new SessionConfiguration(properties);
More information about the jboss-svn-commits
mailing list