[jboss-svn-commits] JBL Code SVN: r36377 - in labs/jbossrules/trunk: drools-camel and 37 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Dec 12 09:51:56 EST 2010
Author: KrisVerlaenen
Date: 2010-12-12 09:51:53 -0500 (Sun, 12 Dec 2010)
New Revision: 36377
Added:
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/.classpath
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/.project
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/.classpath
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/.project
Modified:
labs/jbossrules/trunk/drools-camel/pom.xml
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/BPMN2ProcessFactory.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilderFactory.java
labs/jbossrules/trunk/drools-container/drools-seam/pom.xml
labs/jbossrules/trunk/drools-container/drools-spring/pom.xml
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/META-INF/drools.session.conf
labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/META-INF/persistence.xml
labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/ProcessMarshallerFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/process/ProcessRuntimeFactory.java
labs/jbossrules/trunk/drools-docs/pom.xml
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/build.properties
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core/WorkItemWrapper.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java
labs/jbossrules/trunk/drools-examples/drools-examples-drl/pom.xml
labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/PetStore.java
labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/process/order/OrderExample.java
labs/jbossrules/trunk/drools-examples/drools-examples-fusion/pom.xml
labs/jbossrules/trunk/drools-grid/drools-grid-impl/pom.xml
labs/jbossrules/trunk/drools-guvnor/pom.xml
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuvnorAPIServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java
labs/jbossrules/trunk/drools-ide-common/pom.xml
labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/trunk/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/impl/KnowledgeStoreServiceImpl.java
labs/jbossrules/trunk/drools-pipeline/pom.xml
labs/jbossrules/trunk/drools-pipeline/src/test/java/org/drools/runtime/pipeline/impl/JSonBatchExecutionTest.java
labs/jbossrules/trunk/drools-pipeline/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
labs/jbossrules/trunk/drools-server/pom.xml
labs/jbossrules/trunk/drools-simulator/pom.xml
labs/jbossrules/trunk/install/lib/
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/pom.xml
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/META-INF/persistence.xml
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2827: Migrate Drools Flow to jBPM5
- migrating
Modified: labs/jbossrules/trunk/drools-camel/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-camel/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-camel/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -34,8 +34,8 @@
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-compiler</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow-builder</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -48,8 +48,6 @@
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.io.Resource;
import org.drools.io.ResourceFactory;
-import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -60,6 +58,8 @@
import org.drools.runtime.process.WorkItemManager;
import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.runtime.rule.FactHandle;
+import org.jbpm.process.core.context.variable.VariableScope;
+import org.jbpm.process.instance.context.variable.VariableScopeInstance;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -1107,7 +1107,7 @@
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
assertEquals( "MyValue",
- ((VariableScopeInstance) ((org.drools.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
+ ((VariableScopeInstance) ((org.jbpm.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
}
@Test
@@ -1166,7 +1166,7 @@
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
assertEquals( "MyValue",
- ((VariableScopeInstance) ((org.drools.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
+ ((VariableScopeInstance) ((org.jbpm.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
}
@Test
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -44,6 +44,7 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.ResourceType;
+import org.drools.command.impl.CommandBasedStatefulKnowledgeSession;
import org.drools.command.runtime.rule.ModifyCommand;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalRuleBase;
@@ -52,11 +53,12 @@
import org.drools.grid.impl.GridImpl;
import org.drools.grid.service.directory.WhitePages;
import org.drools.grid.service.directory.impl.WhitePagesImpl;
+import org.drools.impl.KnowledgeBaseImpl;
import org.drools.impl.StatefulKnowledgeSessionImpl;
+import org.drools.impl.StatelessKnowledgeSessionImpl;
import org.drools.io.Resource;
import org.drools.io.ResourceFactory;
-import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.reteoo.ReteooRuleBase;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -69,13 +71,11 @@
import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResultsRow;
+import org.jbpm.process.core.context.variable.VariableScope;
+import org.jbpm.process.instance.context.variable.VariableScopeInstance;
import org.xml.sax.SAXException;
import com.thoughtworks.xstream.XStream;
-import org.drools.command.impl.CommandBasedStatefulKnowledgeSession;
-import org.drools.impl.KnowledgeBaseImpl;
-import org.drools.impl.StatelessKnowledgeSessionImpl;
-import org.drools.reteoo.ReteooRuleBase;
public class XStreamBatchExecutionTest extends ContextTestSupport {
protected GridNode node;
@@ -1446,7 +1446,7 @@
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
assertEquals( "MyValue",
- ((VariableScopeInstance) ((org.drools.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
+ ((VariableScopeInstance) ((org.jbpm.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
}
public void testProcessRuntimeSignalEvent() throws Exception {
@@ -1512,7 +1512,7 @@
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
assertEquals( "MyValue",
- ((VariableScopeInstance) ((org.drools.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
+ ((VariableScopeInstance) ((org.jbpm.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
}
public void testCompleteWorkItem() {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/BPMN2ProcessFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/BPMN2ProcessFactory.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/BPMN2ProcessFactory.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -25,7 +25,7 @@
@SuppressWarnings("unchecked")
private static void loadProvider() {
- ServiceRegistryImpl.getInstance().addDefault( BPMN2ProcessProvider.class, "org.drools.bpmn2.BPMN2ProcessProviderImpl" );
+ ServiceRegistryImpl.getInstance().addDefault( BPMN2ProcessProvider.class, "org.jbpm.bpmn2.BPMN2ProcessProviderImpl" );
setBPMN2ProcessProvider(ServiceRegistryImpl.getInstance().get( BPMN2ProcessProvider.class ) );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilderFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilderFactory.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilderFactory.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -23,7 +23,7 @@
}
private static void loadProvider() {
- ServiceRegistryImpl.getInstance().addDefault( ProcessBuilderFactoryService.class, "org.drools.process.builder.ProcessBuilderFactoryServiceImpl" );
+ ServiceRegistryImpl.getInstance().addDefault( ProcessBuilderFactoryService.class, "org.jbpm.process.builder.ProcessBuilderFactoryServiceImpl" );
setProcessBuilderFactoryService(ServiceRegistryImpl.getInstance().get( ProcessBuilderFactoryService.class ) );
}
Modified: labs/jbossrules/trunk/drools-container/drools-seam/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-seam/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-container/drools-seam/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -41,8 +41,8 @@
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-workitems</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-workitems</artifactId>
</dependency>
<dependency>
@@ -51,18 +51,18 @@
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-compiler</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow-builder</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-core</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-persistence-jpa</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-persistence-jpa</artifactId>
</dependency>
</dependencies>
Modified: labs/jbossrules/trunk/drools-container/drools-spring/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-container/drools-spring/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -37,14 +37,19 @@
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-flow-persistence-jpa</artifactId>
+ <artifactId>drools-persistence-jpa</artifactId>
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-persistence-jpa</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-grid-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -25,8 +25,8 @@
import org.drools.ClockType;
import org.drools.Person;
import org.drools.RuleBaseConfiguration;
+import org.drools.SessionConfiguration;
import org.drools.RuleBaseConfiguration.AssertBehaviour;
-import org.drools.SessionConfiguration;
import org.drools.agent.impl.KnowledgeAgentImpl;
import org.drools.common.InternalRuleBase;
import org.drools.conf.EventProcessingOption;
@@ -39,10 +39,10 @@
import org.drools.io.ResourceFactory;
import org.drools.io.impl.ResourceChangeScannerImpl;
import org.drools.io.impl.UrlResource;
-import org.drools.process.instance.impl.humantask.HumanTaskHandler;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
import org.drools.runtime.process.WorkItemHandler;
+import org.jbpm.process.instance.impl.humantask.HumanTaskHandler;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringDroolsTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -31,33 +31,33 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.ProcessBuilderImpl;
import org.drools.core.util.DroolsStreamUtils;
import org.drools.persistence.jpa.KnowledgeStoreService;
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
-import org.drools.process.core.timer.Timer;
import org.drools.rule.Package;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.ruleflow.instance.RuleFlowProcessInstance;
import org.drools.runtime.Environment;
import org.drools.runtime.EnvironmentName;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.NodeInstance;
import org.drools.runtime.process.ProcessInstance;
import org.drools.runtime.process.WorkItem;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.impl.ConnectionImpl;
-import org.drools.workflow.core.impl.DroolsConsequenceAction;
-import org.drools.workflow.core.node.ActionNode;
-import org.drools.workflow.core.node.EndNode;
-import org.drools.workflow.core.node.StartNode;
-import org.drools.workflow.core.node.SubProcessNode;
-import org.drools.workflow.core.node.TimerNode;
-import org.drools.workflow.core.node.WorkItemNode;
-import org.drools.workflow.instance.node.SubProcessNodeInstance;
import org.h2.tools.DeleteDbFiles;
import org.h2.tools.Server;
+import org.jbpm.compiler.ProcessBuilderImpl;
+import org.jbpm.process.core.timer.Timer;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
+import org.jbpm.ruleflow.instance.RuleFlowProcessInstance;
+import org.jbpm.workflow.core.Node;
+import org.jbpm.workflow.core.impl.ConnectionImpl;
+import org.jbpm.workflow.core.impl.DroolsConsequenceAction;
+import org.jbpm.workflow.core.node.ActionNode;
+import org.jbpm.workflow.core.node.EndNode;
+import org.jbpm.workflow.core.node.StartNode;
+import org.jbpm.workflow.core.node.SubProcessNode;
+import org.jbpm.workflow.core.node.TimerNode;
+import org.jbpm.workflow.core.node.WorkItemNode;
+import org.jbpm.workflow.instance.node.SubProcessNodeInstance;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/META-INF/drools.session.conf
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/META-INF/drools.session.conf 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/META-INF/drools.session.conf 2010-12-12 14:51:53 UTC (rev 36377)
@@ -1,5 +1 @@
-drools.workItemHandlers = MyWorkItemHandlers.conf
-#drools.commandService = org.drools.persistence.session.SingleSessionCommandService
-#drools.processInstanceManagerFactory = org.drools.persistence.processinstance.JPAProcessInstanceManagerFactory
-#drools.workItemManagerFactory = org.drools.persistence.processinstance.JPAWorkItemManagerFactory
-#drools.processSignalManagerFactory = org.drools.persistence.processinstance.JPASignalManagerFactory
\ No newline at end of file
+drools.workItemHandlers = MyWorkItemHandlers.conf
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/META-INF/persistence.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/META-INF/persistence.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -12,8 +12,8 @@
<jta-data-source>jdbc/testDS1</jta-data-source>
-->
<class>org.drools.persistence.session.SessionInfo</class>
- <class>org.drools.persistence.processinstance.ProcessInstanceInfo</class>
- <class>org.drools.persistence.processinstance.WorkItemInfo</class>
+ <class>org.jbpm.persistence.processinstance.ProcessInstanceInfo</class>
+ <class>org.drools.persistence.processinstance.WorkItemInfo</class>
<!-- my persistent variables -->
<class>org.drools.container.spring.beans.persistence.MyEntity</class>
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -7,9 +7,9 @@
http://drools.org/schema/drools-spring org/drools/container/spring/drools-spring-1.2.0.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="rwih1" class="org.drools.process.instance.impl.humantask.HumanTaskHandler" />
+ <bean id="rwih1" class="org.jbpm.process.instance.impl.humantask.HumanTaskHandler" />
- <bean id="rwih2" class="org.drools.process.instance.impl.humantask.HumanTaskHandler" />
+ <bean id="rwih2" class="org.jbpm.process.instance.impl.humantask.HumanTaskHandler" />
<bean id="raf1" class="org.drools.container.spring.MockAccumulateFunction" />
<bean id="raf2" class="org.drools.container.spring.MockAccumulateFunction" />
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -316,12 +316,12 @@
public String getProcessInstanceManagerFactory() {
return this.chainedProperties.getProperty( "drools.processInstanceManagerFactory",
- "org.drools.process.instance.impl.DefaultProcessInstanceManagerFactory" );
+ "org.jbpm.process.instance.impl.DefaultProcessInstanceManagerFactory" );
}
public String getSignalManagerFactory() {
return this.chainedProperties.getProperty( "drools.processSignalManagerFactory",
- "org.drools.process.instance.event.DefaultSignalManagerFactory" );
+ "org.jbpm.process.instance.event.DefaultSignalManagerFactory" );
}
public CommandService getCommandService(KnowledgeBase kbase,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/ProcessMarshallerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/ProcessMarshallerFactory.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/ProcessMarshallerFactory.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -22,7 +22,7 @@
}
private static void loadProvider() {
- ServiceRegistryImpl.getInstance().addDefault( ProcessMarshallerFactoryService.class, "org.drools.marshalling.impl.ProcessMarshallerFactoryServiceImpl" );
+ ServiceRegistryImpl.getInstance().addDefault( ProcessMarshallerFactoryService.class, "org.jbpm.marshalling.impl.ProcessMarshallerFactoryServiceImpl" );
setProcessMarshallerFactoryService(ServiceRegistryImpl.getInstance().get( ProcessMarshallerFactoryService.class ) );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/process/ProcessRuntimeFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/process/ProcessRuntimeFactory.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/process/ProcessRuntimeFactory.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -24,7 +24,7 @@
}
private static void loadProvider() {
- ServiceRegistryImpl.getInstance().addDefault( ProcessRuntimeFactoryService.class, "org.drools.process.instance.ProcessRuntimeFactoryServiceImpl" );
+ ServiceRegistryImpl.getInstance().addDefault( ProcessRuntimeFactoryService.class, "org.jbpm.process.instance.ProcessRuntimeFactoryServiceImpl" );
setProcessRuntimeFactoryService(ServiceRegistryImpl.getInstance().get( ProcessRuntimeFactoryService.class ) );
}
Modified: labs/jbossrules/trunk/drools-docs/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-docs/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-docs/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -17,7 +17,7 @@
<!-- These are just the soa modules -->
<module>drools-docs-introduction</module>
<module>drools-docs-expert</module>
- <module>drools-docs-flow</module>
+ <!--module>drools-docs-flow</module-->
<module>drools-docs-fusion</module>
<module>drools-docs-guvnor</module>
<!-- Other modules are defined in the not-soa profile -->
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/.classpath (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/.classpath 2010-12-12 14:51:53 UTC (rev 36377)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.core.commands/3.6.0.I20100512-1500/org.eclipse.core.commands-3.6.0.I20100512-1500.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.core.contenttype/3.4.100.v20100505-1235/org.eclipse.core.contenttype-3.4.100.v20100505-1235.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.core.filebuffers/3.5.100.v20100520-0800/org.eclipse.core.filebuffers-3.5.100.v20100520-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.core.jobs/3.5.1.R36x_v20100824/org.eclipse.core.jobs-3.5.1.R36x_v20100824.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.core.resources/3.6.0.v20100526-0737/org.eclipse.core.resources-3.6.0.v20100526-0737.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.core.runtime/3.6.0.v20100505/org.eclipse.core.runtime-3.6.0.v20100505.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.debug.core/3.6.0.v20100519/org.eclipse.debug.core-3.6.0.v20100519.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.debug.ui/3.6.1.v20100901_r361/org.eclipse.debug.ui-3.6.1.v20100901_r361.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.draw2d/3.6.1.v20100913-2020/org.eclipse.draw2d-3.6.1.v20100913-2020.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.equinox.app/1.3.1.R36x_v20100803/org.eclipse.equinox.app-1.3.1.R36x_v20100803.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.equinox.common/3.6.0.v20100503/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.equinox.preferences/3.3.0.v20100503/org.eclipse.equinox.preferences-3.3.0.v20100503.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.equinox.registry/3.5.0.v20100503/org.eclipse.equinox.registry-3.5.0.v20100503.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.gef/3.6.1.v20100712-1224/org.eclipse.gef-3.6.1.v20100712-1224.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jdt.core/3.6.1.v_A68_R36x/org.eclipse.jdt.core-3.6.1.v_A68_R36x.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jdt.debug/3.6.1.v20100715_r361/org.eclipse.jdt.debug-3.6.1.v20100715_r361.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jdt.debug.ui/3.5.0.v20100602-0830/org.eclipse.jdt.debug.ui-3.5.0.v20100602-0830.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jdt.junit/3.6.1.r361_v20100825-0800/org.eclipse.jdt.junit-3.6.1.r361_v20100825-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jdt.junit.core/3.6.1.r361_v20100825-0800/org.eclipse.jdt.junit.core-3.6.1.r361_v20100825-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jdt.launching/3.5.100.v20100526/org.eclipse.jdt.launching-3.5.100.v20100526.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jdt.ui/3.6.1.r361_v20100825-0800/org.eclipse.jdt.ui-3.6.1.r361_v20100825-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jface/3.6.1.M20100825-0800/org.eclipse.jface-3.6.1.M20100825-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.jface.text/3.6.1.r361_v20100825-0800/org.eclipse.jface.text-3.6.1.r361_v20100825-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ltk.core.refactoring/3.5.100.v20100526-0800/org.eclipse.ltk.core.refactoring-3.5.100.v20100526-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ltk.ui.refactoring/3.5.0.v20100526-0800/org.eclipse.ltk.ui.refactoring-3.5.0.v20100526-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.swt/3.6.1.v3655c/org.eclipse.swt-3.6.1.v3655c.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.swt.gtk.linux.x86/3.6.1.v3655c/org.eclipse.swt.gtk.linux.x86-3.6.1.v3655c.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.text/3.5.0.v20100601-1300/org.eclipse.text-3.5.0.v20100601-1300.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui/3.6.1.M20100826-1330/org.eclipse.ui-3.6.1.M20100826-1330.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui.console/3.5.0.v20100526/org.eclipse.ui.console-3.5.0.v20100526.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui.editors/3.6.1.r361_v20100825-0800/org.eclipse.ui.editors-3.6.1.r361_v20100825-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui.forms/3.5.2.r36_v20100702/org.eclipse.ui.forms-3.5.2.r36_v20100702.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui.ide/3.6.1.M20100825-0800/org.eclipse.ui.ide-3.6.1.M20100825-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui.views/3.5.0.I20100527-0800/org.eclipse.ui.views-3.5.0.I20100527-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui.views.properties.tabbed/3.5.100.I20100509-0800/org.eclipse.ui.views.properties.tabbed-3.5.100.I20100509-0800.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui.workbench/3.6.1.M20100826-1330/org.eclipse.ui.workbench-3.6.1.M20100826-1330.jar"/>
+ <classpathentry kind="lib" path="/NotBackedUp/.m2/repository/p2/osgi/bundle/org.eclipse.ui.workbench.texteditor/3.6.1.r361_v20100714-0800/org.eclipse.ui.workbench.texteditor-3.6.1.r361_v20100714-0800.jar"/>
+ <classpathentry kind="lib" path="xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="lib" path="xstream-1.3.1.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="lib" path="lib/antlr-runtime.jar"/>
+ <classpathentry kind="lib" path="lib/drools-api.jar"/>
+ <classpathentry kind="lib" path="lib/drools-compiler.jar"/>
+ <classpathentry kind="lib" path="lib/drools-core.jar"/>
+ <classpathentry kind="lib" path="lib/drools-decisiontables.jar"/>
+ <classpathentry kind="lib" path="lib/drools-ide-common.jar"/>
+ <classpathentry kind="lib" path="lib/drools-jsr94.jar"/>
+ <classpathentry kind="lib" path="lib/drools-templates.jar"/>
+ <classpathentry kind="lib" path="lib/jbpm-bpmn2.jar"/>
+ <classpathentry kind="lib" path="lib/jbpm-flow-builder.jar"/>
+ <classpathentry kind="lib" path="lib/jbpm-flow.jar"/>
+ <classpathentry kind="lib" path="lib/jsr94.jar"/>
+ <classpathentry kind="lib" path="lib/jxl.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/mvel2.jar"/>
+ <classpathentry kind="lib" path="lib/xpp3_min.jar"/>
+ <classpathentry kind="lib" path="lib/xstream.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/.project
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/.project (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/.project 2010-12-12 14:51:53 UTC (rev 36377)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.drools.eclipse</name>
+ <comment>To use these drools eclipse plugins in production, use the download site linked on:
+ http://www.jboss.org/drools/downloads
+
+ To use these drools eclipse plugins locally in development,
+ see the description of the module org.drools.updatesite. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>xpp3_min-1.1.4c.jar</name>
+ <type>1</type>
+ <location>/NotBackedUp/.m2/repository/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar</location>
+ </link>
+ <link>
+ <name>xstream-1.3.1.jar</name>
+ <type>1</type>
+ <location>/NotBackedUp/.m2/repository/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar</location>
+ </link>
+ </linkedResources>
+</projectDescription>
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -17,7 +17,6 @@
package org.drools.eclipse.debug;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -30,7 +29,6 @@
import org.drools.eclipse.flow.common.editor.editpart.ProcessEditPart;
import org.drools.eclipse.flow.common.editor.editpart.ProcessEditPartFactory;
import org.drools.eclipse.flow.common.editor.editpart.figure.ElementFigure;
-import org.drools.process.core.Process;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -54,6 +52,7 @@
import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.ViewPart;
+import org.jbpm.process.core.Process;
/**
* @author Kris Verlaenen
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core/WorkItemWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core/WorkItemWrapper.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core/WorkItemWrapper.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -29,11 +29,11 @@
import org.drools.process.core.WorkDefinition;
import org.drools.process.core.datatype.DataType;
import org.drools.process.core.impl.WorkImpl;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
+import org.jbpm.workflow.core.Node;
+import org.jbpm.workflow.core.node.WorkItemNode;
/**
* Wrapper for a work item node.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -48,7 +48,6 @@
import org.drools.process.core.WorkDefinition;
import org.drools.process.core.WorkDefinitionExtension;
import org.drools.process.core.WorkEditor;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.draw2d.ChopboxAnchor;
import org.eclipse.draw2d.ConnectionAnchor;
import org.eclipse.draw2d.IFigure;
@@ -65,6 +64,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.views.properties.IPropertySource;
+import org.jbpm.workflow.core.node.WorkItemNode;
/**
* EditPart for a Task node.
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/.classpath (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/.classpath 2010-12-12 14:51:53 UTC (rev 36377)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry exported="true" kind="lib" path="lib/mina-core.jar" sourcepath="org.drools.eclipse.tasksrc.zip"/>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-api.jar" sourcepath="org.drools.eclipse.tasksrc.zip"/>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-jdk14.jar" sourcepath="org.drools.eclipse.tasksrc.zip"/>
+ <classpathentry kind="lib" path="lib/jbpm-human-task.jar"/>
+ <classpathentry kind="lib" path="lib/drools-api.jar"/>
+ <classpathentry kind="lib" path="lib/drools-core.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/.project
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/.project (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/.project 2010-12-12 14:51:53 UTC (rev 36377)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.drools.eclipse.task</name>
+ <comment>To use these drools eclipse plugins in production, use the download site linked on:
+ http://www.jboss.org/drools/downloads
+
+ To use these drools eclipse plugins locally in development,
+ see the description of the module org.drools.updatesite. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/build.properties 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse.task/build.properties 2010-12-12 14:51:53 UTC (rev 36377)
@@ -7,7 +7,12 @@
contexts.xml,\
lib/,\
lib/drools-core.jar,\
- about.html
+ about.html,\
+ lib/drools-api.jar,\
+ lib/mina-core.jar,\
+ lib/slf4j-api.jar,\
+ lib/slf4j-jdk14.jar,\
+ lib/jbpm-human-task.jar
src.includes = about.html,\
icons/,\
lib/,\
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.drools</groupId>
- <artifactId>drools</artifactId>
+ <artifactId>drools-examples</artifactId>
<version>5.2.0-SNAPSHOT</version>
</parent>
@@ -27,8 +27,8 @@
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-compiler</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow-builder</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/PetStore.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/PetStore.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/PetStore.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -21,6 +21,7 @@
import java.awt.GridLayout;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -46,8 +47,10 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderConfiguration;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.ResourceType;
+import org.drools.builder.conf.DumpDirOption;
import org.drools.io.ResourceFactory;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -55,7 +58,9 @@
public static void main(String[] args) {
try {
- KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
+ KnowledgeBuilderConfiguration conf = KnowledgeBuilderFactory.newKnowledgeBuilderConfiguration();
+ conf.setOption( DumpDirOption.get(new File("/home/kverlaen/NotBackedUp/development/drools/drools-examples/drools-examples-drl/dump")) );
+ KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder(conf);
kbuilder.add( ResourceFactory.newClassPathResource( "PetStore.drl",
PetStore.class ),
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/process/order/OrderExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/process/order/OrderExample.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/process/order/OrderExample.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -44,11 +44,11 @@
import org.drools.io.ResourceFactory;
import org.drools.logger.KnowledgeRuntimeLogger;
import org.drools.logger.KnowledgeRuntimeLoggerFactory;
-import org.drools.process.instance.impl.demo.UIWorkItemHandler;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.WorkItem;
import org.drools.runtime.process.WorkItemHandler;
import org.drools.runtime.process.WorkItemManager;
+import org.jbpm.process.instance.impl.demo.UIWorkItemHandler;
public class OrderExample extends JFrame {
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-fusion/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-fusion/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-fusion/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.drools</groupId>
- <artifactId>drools</artifactId>
+ <artifactId>drools-examples</artifactId>
<version>5.2.0-SNAPSHOT</version>
</parent>
@@ -27,8 +27,8 @@
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-compiler</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow-builder</artifactId>
</dependency>
<!-- External dependencies -->
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -106,8 +106,8 @@
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-bpmn2</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-bpmn2</artifactId>
<scope>test</scope>
</dependency>
Modified: labs/jbossrules/trunk/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-guvnor/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -152,8 +152,8 @@
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-bpmn2</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-bpmn2</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuvnorAPIServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuvnorAPIServlet.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuvnorAPIServlet.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -33,22 +33,22 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.drools.bpmn2.legacy.beta1.XmlBPMNProcessDumper;
-import org.drools.bpmn2.xml.BPMNDISemanticModule;
-import org.drools.bpmn2.xml.BPMNSemanticModule;
-import org.drools.compiler.xml.XmlProcessReader;
import org.drools.definition.process.Connection;
import org.drools.definition.process.Node;
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rpc.RuleFlowContentModel;
import org.drools.guvnor.server.contenthandler.BPMN2ProcessHandler;
import org.drools.guvnor.server.util.LoggingHelper;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.impl.ConstraintImpl;
-import org.drools.workflow.core.node.Split;
-import org.drools.workflow.core.node.StartNode;
import org.drools.xml.SemanticModules;
+import org.jbpm.bpmn2.xml.BPMNDISemanticModule;
+import org.jbpm.bpmn2.xml.BPMNSemanticModule;
+import org.jbpm.bpmn2.xml.XmlBPMNProcessDumper;
+import org.jbpm.compiler.xml.XmlProcessReader;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
+import org.jbpm.workflow.core.Constraint;
+import org.jbpm.workflow.core.impl.ConstraintImpl;
+import org.jbpm.workflow.core.node.Split;
+import org.jbpm.workflow.core.node.StartNode;
import com.google.gwt.user.client.rpc.SerializationException;
@@ -206,9 +206,6 @@
SemanticModules semanticModules = new SemanticModules();
semanticModules.addSemanticModule(new BPMNSemanticModule());
semanticModules.addSemanticModule(new BPMNDISemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMNSemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMN2SemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMNDISemanticModule());
XmlProcessReader xmlReader = new XmlProcessReader(semanticModules);
RuleFlowProcess process = (RuleFlowProcess) xmlReader.read(isr);
if (process == null) {
@@ -242,9 +239,6 @@
SemanticModules semanticModules = new SemanticModules();
semanticModules.addSemanticModule(new BPMNSemanticModule());
semanticModules.addSemanticModule(new BPMNDISemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMNSemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMN2SemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMNDISemanticModule());
XmlProcessReader xmlReader = new XmlProcessReader(semanticModules);
RuleFlowProcess process = (RuleFlowProcess) xmlReader.read(isr);
isr.close();
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -24,7 +24,7 @@
import org.drools.repository.PackageItem;
import org.drools.repository.PackageIterator;
import org.drools.repository.RulesRepository;
-import org.drools.compiler.xml.processes.RuleFlowMigrator;
+import org.jbpm.compiler.xml.processes.RuleFlowMigrator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: labs/jbossrules/trunk/drools-ide-common/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-ide-common/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-ide-common/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -17,8 +17,8 @@
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-compiler</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow-builder</artifactId>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
Modified: labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/MockWorkingMemory.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-ide-common/src/test/java/org/drools/testframework/MockWorkingMemory.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -50,10 +50,7 @@
import org.drools.event.RuleBaseEventListener;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.event.WorkingMemoryEventSupport;
-import org.drools.process.instance.ProcessInstanceManager;
import org.drools.process.instance.WorkItemManager;
-import org.drools.process.instance.event.SignalManager;
-import org.drools.process.instance.timer.TimerManager;
import org.drools.reteoo.LIANodePropagation;
import org.drools.reteoo.ObjectTypeConf;
import org.drools.reteoo.PartitionTaskManager;
@@ -77,6 +74,9 @@
import org.drools.time.TimerService;
import org.drools.time.impl.JDKTimerService;
import org.drools.type.DateFormats;
+import org.jbpm.process.instance.ProcessInstanceManager;
+import org.jbpm.process.instance.event.SignalManager;
+import org.jbpm.process.instance.timer.TimerManager;
public class MockWorkingMemory implements InternalWorkingMemory {
Modified: labs/jbossrules/trunk/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/impl/KnowledgeStoreServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/impl/KnowledgeStoreServiceImpl.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/impl/KnowledgeStoreServiceImpl.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -35,9 +35,9 @@
protected void setDefaultImplementations() {
setCommandServiceClass( SingleSessionCommandService.class );
- setProcessInstanceManagerFactoryClass( "org.drools.persistence.processinstance.JPAProcessInstanceManagerFactory" );
+ setProcessInstanceManagerFactoryClass( "org.jbpm.persistence.processinstance.JPAProcessInstanceManagerFactory" );
setWorkItemManagerFactoryClass( JPAWorkItemManagerFactory.class );
- setProcessSignalManagerFactoryClass( "org.drools.persistence.processinstance.JPASignalManagerFactory" );
+ setProcessSignalManagerFactoryClass( "org.jbpm.persistence.processinstance.JPASignalManagerFactory" );
setTimerServiceClass( JpaJDKTimerService.class );
}
Modified: labs/jbossrules/trunk/drools-pipeline/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-pipeline/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -28,8 +28,8 @@
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-compiler</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow-builder</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
Modified: labs/jbossrules/trunk/drools-pipeline/src/test/java/org/drools/runtime/pipeline/impl/JSonBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/src/test/java/org/drools/runtime/pipeline/impl/JSonBatchExecutionTest.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-pipeline/src/test/java/org/drools/runtime/pipeline/impl/JSonBatchExecutionTest.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -49,11 +49,12 @@
import org.drools.common.InternalRuleBase;
import org.drools.definition.KnowledgePackage;
import org.drools.grid.GridNode;
+import org.drools.grid.impl.GridImpl;
+import org.drools.grid.service.directory.WhitePages;
+import org.drools.grid.service.directory.impl.WhitePagesImpl;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.io.Resource;
import org.drools.io.ResourceFactory;
-import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
@@ -70,12 +71,11 @@
import org.drools.runtime.process.WorkItemManager;
import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.runtime.rule.FactHandle;
+import org.jbpm.process.core.context.variable.VariableScope;
+import org.jbpm.process.instance.context.variable.VariableScopeInstance;
import org.xml.sax.SAXException;
import com.thoughtworks.xstream.XStream;
-import org.drools.grid.impl.GridImpl;
-import org.drools.grid.service.directory.WhitePages;
-import org.drools.grid.service.directory.impl.WhitePagesImpl;
public class JSonBatchExecutionTest extends TestCase {
@@ -1330,7 +1330,7 @@
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
assertEquals( "MyValue",
- ((VariableScopeInstance) ((org.drools.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
+ ((VariableScopeInstance) ((org.jbpm.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
}
public void testProcessRuntimeSignalEvent() throws Exception {
@@ -1395,7 +1395,7 @@
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
assertEquals( "MyValue",
- ((VariableScopeInstance) ((org.drools.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
+ ((VariableScopeInstance) ((org.jbpm.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
}
public void testCompleteWorkItem() {
Modified: labs/jbossrules/trunk/drools-pipeline/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-pipeline/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -49,11 +49,12 @@
import org.drools.common.InternalRuleBase;
import org.drools.definition.KnowledgePackage;
import org.drools.grid.GridNode;
+import org.drools.grid.impl.GridImpl;
+import org.drools.grid.service.directory.WhitePages;
+import org.drools.grid.service.directory.impl.WhitePagesImpl;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.io.Resource;
import org.drools.io.ResourceFactory;
-import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
@@ -71,13 +72,11 @@
import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResultsRow;
+import org.jbpm.process.core.context.variable.VariableScope;
+import org.jbpm.process.instance.context.variable.VariableScopeInstance;
import org.xml.sax.SAXException;
import com.thoughtworks.xstream.XStream;
-import org.drools.grid.GridConnection;
-import org.drools.grid.impl.GridImpl;
-import org.drools.grid.service.directory.WhitePages;
-import org.drools.grid.service.directory.impl.WhitePagesImpl;
public class XStreamBatchExecutionTest extends TestCase {
@@ -1353,7 +1352,7 @@
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
assertEquals( "MyValue",
- ((VariableScopeInstance) ((org.drools.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
+ ((VariableScopeInstance) ((org.jbpm.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
}
public void testProcessRuntimeSignalEvent() throws Exception {
@@ -1416,7 +1415,7 @@
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
assertEquals( "MyValue",
- ((VariableScopeInstance) ((org.drools.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
+ ((VariableScopeInstance) ((org.jbpm.process.instance.ProcessInstance) processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE )).getVariable( "MyVar" ) );
}
public void testCompleteWorkItem() {
Modified: labs/jbossrules/trunk/drools-server/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-server/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -39,8 +39,8 @@
<artifactId>drools-persistence-jpa</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-workitems</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-workitems</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
Modified: labs/jbossrules/trunk/drools-simulator/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-simulator/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/drools-simulator/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -28,8 +28,8 @@
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-compiler</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow-builder</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Property changes on: labs/jbossrules/trunk/install/lib
___________________________________________________________________
Name: svn:ignore
- birt-runtime-2_3_2_2.zip
*.zip
*.tar
*.gz
+ birt-runtime-2_3_2_2.zip
*.zip
*.tar
*.gz
drools-5.1.0.SNAPSHOT-guvnor.war
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/pom.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -38,12 +38,12 @@
<artifactId>drools-persistence-jpa</artifactId>
</dependency-->
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-flow-core</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-bpmn2</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-bpmn2</artifactId>
</dependency>
</dependencies>
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java 2010-12-12 14:51:53 UTC (rev 36377)
@@ -39,11 +39,8 @@
protected void onTearDown() throws Exception {
}
-
- public void testDummy() {
- }
- public void TODOtestMinimalProcess() throws Exception {
+ public void testMinimalProcess() throws Exception {
KnowledgeBase kbase = createKnowledgeBase("BPMN2-MinimalProcess.xml");
StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
ProcessInstance processInstance = ksession.startProcess("Minimal");
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/META-INF/persistence.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/META-INF/persistence.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -5,14 +5,10 @@
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>jdbc/testDS1</jta-data-source>
<class>org.drools.persistence.session.SessionInfo</class>
- <class>org.drools.persistence.processinstance.ProcessInstanceInfo</class>
- <class>org.drools.persistence.processinstance.EventType</class>
+ <class>org.jbpm.persistence.processinstance.ProcessInstanceInfo</class>
<class>org.drools.persistence.session.MyEntity</class>
<class>org.drools.persistence.session.MyEntityMethods</class>
<class>org.drools.persistence.session.MyEntityOnlyFields</class>
- <class>org.drools.persistence.processinstance.variabletypes.JPAPersistedVariable</class>
- <class>org.drools.persistence.processinstance.variabletypes.VariableInstanceInfo</class>
- <class>org.drools.persistence.processinstance.variabletypes.SerializablePersistedVariable</class>
<class>org.drools.persistence.processinstance.WorkItemInfo</class>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-12-12 14:51:53 UTC (rev 36377)
@@ -20,6 +20,7 @@
# versioning
ignore.drools.version=5.2.0.SNAPSHOT
+ignore.jbpm.version=5.0-CR1
ignore.junit.version=4.8.1
@@ -187,12 +188,12 @@
org.drools,org.drools.api,${ignore.drools.version}
org.drools,org.drools.core,${ignore.drools.version}
-org.drools,org.drools.flow.core,${ignore.drools.version}
+org.jbpm,jbpm-flow,${ignore.jbpm.version}
org.drools,org.drools.compiler,${ignore.drools.version}
-org.drools,org.drools.flow.compiler,${ignore.drools.version}
+org.jbpm,jbpm-flow-builder,${ignore.jbpm.version}
org.drools,org.drools.templates,${ignore.drools.version}
org.drools,org.drools.decisiontables,${ignore.drools.version}
-org.drools,org.drools.bpmn2,${ignore.drools.version}
+org.jbpm,jbpm-bpmn2,${ignore.jbpm.version}
#org.drools,org.drools.persistence-jpa,${ignore.drools.version}
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-12-12 09:47:12 UTC (rev 36376)
+++ labs/jbossrules/trunk/pom.xml 2010-12-12 14:51:53 UTC (rev 36377)
@@ -18,6 +18,7 @@
<springframework-version>2.5.6</springframework-version>
<gwt.version>2.1.0</gwt.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jbpm.version>5.0-CR1</jbpm.version>
</properties>
<prerequisites>
<maven>3.0.1</maven>
@@ -268,8 +269,8 @@
<module>drools-camel</module>
<module>drools-compiler</module>
<module>drools-core</module>
- <module>drools-flow-core</module>
- <module>drools-flow-compiler</module>
+ <!--module>drools-flow-core</module>
+ <module>drools-flow-compiler</module-->
<module>drools-container</module>
<module>drools-decisiontables</module>
<module>drools-factconstraint</module>
@@ -278,8 +279,8 @@
<module>drools-ide-common</module>
<module>drools-jsr94</module>
<module>drools-persistence-jpa</module>
- <module>drools-flow-persistence-jpa</module>
- <module>drools-process</module>
+ <!--module>drools-flow-persistence-jpa</module-->
+ <!--module>drools-process</module-->
<module>drools-repository-parent</module>
<module>drools-server</module>
<module>drools-templates</module>
@@ -711,11 +712,11 @@
<artifactId>drools-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.drools</groupId>
<artifactId>drools-flow-core</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-grid-impl</artifactId>
@@ -766,11 +767,11 @@
<artifactId>drools-compiler</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.drools</groupId>
<artifactId>drools-flow-compiler</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-jsr94</artifactId>
@@ -786,7 +787,7 @@
<artifactId>drools-decisiontables</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.drools</groupId>
<artifactId>drools-bpmn2</artifactId>
<version>${project.version}</version>
@@ -800,7 +801,7 @@
<groupId>org.drools</groupId>
<artifactId>drools-bam</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-docs</artifactId>
@@ -873,7 +874,7 @@
<artifactId>drools-persistence-jpa</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.drools</groupId>
<artifactId>drools-flow-persistence-jpa</artifactId>
<version>${project.version}</version>
@@ -897,7 +898,7 @@
<groupId>org.drools</groupId>
<artifactId>drools-gwt-form</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-eclipse-plugin</artifactId>
@@ -919,6 +920,41 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow</artifactId>
+ <version>${jbpm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-flow-builder</artifactId>
+ <version>${jbpm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-persistence-jpa</artifactId>
+ <version>${jbpm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-workitems</artifactId>
+ <version>${jbpm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-bpmn2</artifactId>
+ <version>${jbpm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-human-task</artifactId>
+ <version>${jbpm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-bam</artifactId>
+ <version>${jbpm.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
More information about the jboss-svn-commits
mailing list