[jboss-svn-commits] JBL Code SVN: r23635 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/workflow/instance/impl and 22 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 30 13:35:58 EDT 2008
Author: KrisVerlaenen
Date: 2008-10-30 13:35:57 -0400 (Thu, 30 Oct 2008)
New Revision: 23635
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMultiThreadTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/editpart/figure/ElementContainerFigure.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EventBasedNodeWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ExtendedNodeWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java
labs/jbossrules/trunk/drools-process/drools-bam/.classpath
labs/jbossrules/trunk/drools-process/drools-bpel/.classpath
labs/jbossrules/trunk/drools-process/drools-bpel/.project
labs/jbossrules/trunk/drools-process/drools-bpel/pom.xml
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/compiler/BPELCompiler.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELReceive.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELAssignInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFlowInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELLinkManager.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELReceiveInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELWaitInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/CopyOfBPELAssignInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/xpath/XPathReturnValueEvaluator.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELCompilerTest.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELCoreTest.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELTestUtil.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/.classpath
labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/DroolsWorkflow.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstance.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstanceFactory.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/node/StepNodeInstance.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/.classpath
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAProcessInstanceManager.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManager.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java
labs/jbossrules/trunk/drools-repository/.classpath
labs/jbossrules/trunk/drools-repository/.project
Log:
- fixed issues that were the result of the drools-api merge
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMultiThreadTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMultiThreadTest.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMultiThreadTest.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -15,57 +15,52 @@
public class ProcessMultiThreadTest extends TestCase {
- //@FIXME krisv: this has started failing
- public void test1Dummy() {
-
+ public void testMultiThreadProcessInstanceSignalling() {
+ final int THREAD_COUNT = 2;
+ try {
+ boolean success = true;
+ final Thread[] t = new Thread[THREAD_COUNT];
+
+ final PackageBuilder builder = new PackageBuilder();
+ builder.addProcessFromXml(new InputStreamReader( getClass().getResourceAsStream( "test_ProcessMultithreadEvent.rf" ) ) );
+ if (builder.getErrors().getErrors().length > 0) {
+ for (DroolsError error: builder.getErrors().getErrors()) {
+ System.err.println(error);
+ }
+ fail("Could not parse process");
+ }
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage( builder.getPackage() );
+ ruleBase = SerializationHelper.serializeObject(ruleBase);
+ StatefulSession session = ruleBase.newStatefulSession();
+ session = SerializationHelper.getSerialisedStatefulSession(session);
+ List<String> list = new ArrayList<String>();
+ session.setGlobal("list", list);
+ ProcessInstance processInstance = session.startProcess("org.drools.integrationtests.multithread");
+ final ProcessInstanceSignalRunner[] r = new ProcessInstanceSignalRunner[THREAD_COUNT];
+ for ( int i = 0; i < t.length; i++ ) {
+ r[i] = new ProcessInstanceSignalRunner(i, processInstance, "event" + (i+1));
+ t[i] = new Thread( r[i], "thread-" + i );
+ t[i].start();
+ }
+ for ( int i = 0; i < t.length; i++ ) {
+ t[i].join();
+ if ( r[i].getStatus() == ProcessInstanceSignalRunner.Status.FAIL ) {
+ success = false;
+ }
+ }
+ if ( !success ) {
+ fail( "Multithread test failed. Look at the stack traces for details. " );
+ }
+ assertEquals(2, list.size());
+ assertFalse(list.get(0).equals(list.get(1)));
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ } catch ( Exception e ) {
+ e.printStackTrace();
+ fail( "Should not raise any exception: " + e.getMessage() );
+ }
}
-// public void testMultiThreadProcessInstanceSignalling() {
-// final int THREAD_COUNT = 30;
-// try {
-// boolean success = true;
-// final Thread[] t = new Thread[THREAD_COUNT];
-//
-// final PackageBuilder builder = new PackageBuilder();
-// builder.addProcessFromXml(new InputStreamReader( getClass().getResourceAsStream( "test_ProcessMultithreadEvent.rf" ) ) );
-// if (builder.getErrors().getErrors().length > 0) {
-// for (DroolsError error: builder.getErrors().getErrors()) {
-// System.err.println(error);
-// }
-// fail("Could not parse process");
-// }
-// RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-// ruleBase.addPackage( builder.getPackage() );
-// ruleBase = SerializationHelper.serializeObject(ruleBase);
-// StatefulSession session = ruleBase.newStatefulSession();
-// session = SerializationHelper.getSerialisedStatefulSession(session);
-// List<String> list = new ArrayList<String>();
-// session.setGlobal("list", list);
-// ProcessInstance processInstance = session.startProcess("org.drools.integrationtests.multithread");
-// final ProcessInstanceSignalRunner[] r = new ProcessInstanceSignalRunner[THREAD_COUNT];
-// for ( int i = 0; i < t.length; i++ ) {
-// r[i] = new ProcessInstanceSignalRunner(i, processInstance, "event" + (i+1));
-// t[i] = new Thread( r[i], "thread-" + i );
-// t[i].start();
-// }
-// for ( int i = 0; i < t.length; i++ ) {
-// t[i].join();
-// if ( r[i].getStatus() == ProcessInstanceSignalRunner.Status.FAIL ) {
-// success = false;
-// }
-// }
-// if ( !success ) {
-// fail( "Multithread test failed. Look at the stack traces for details. " );
-// }
-// assertEquals(2, list.size());
-// assertFalse(list.get(0).equals(list.get(1)));
-// assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
-// } catch ( Exception e ) {
-// e.printStackTrace();
-// fail( "Should not raise any exception: " + e.getMessage() );
-// }
-// }
-
public static class ProcessInstanceSignalRunner implements Runnable {
private ProcessInstance processInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -221,8 +221,10 @@
}
public void start() {
- registerExternalEventNodeListeners();
- super.start();
+ synchronized (this) {
+ registerExternalEventNodeListeners();
+ super.start();
+ }
}
private void registerExternalEventNodeListeners() {
@@ -245,31 +247,33 @@
}
public void signalEvent(String type, Object event) {
- List<EventListener> listeners = eventListeners.get(type);
- if (listeners != null) {
- for (EventListener listener : listeners) {
- listener.signalEvent(type, event);
+ synchronized (this) {
+ List<EventListener> listeners = eventListeners.get(type);
+ if (listeners != null) {
+ for (EventListener listener : listeners) {
+ listener.signalEvent(type, event);
+ }
}
- }
- listeners = externalEventListeners.get(type);
- if (listeners != null) {
- for (EventListener listener : listeners) {
- listener.signalEvent(type, event);
+ listeners = externalEventListeners.get(type);
+ if (listeners != null) {
+ for (EventListener listener : listeners) {
+ listener.signalEvent(type, event);
+ }
}
- }
- for (Node node : getWorkflowProcess().getNodes()) {
- if (node instanceof EventNodeInterface) {
- if (((EventNodeInterface) node).acceptsEvent(type, event)) {
- if (node instanceof EventNode) {
- EventNodeInstance eventNodeInstance = (EventNodeInstance) getNodeInstance(node);
- eventNodeInstance.signalEvent(type, event);
- } else {
- List<NodeInstance> nodeInstances = getNodeInstances(node
- .getId());
- if (nodeInstances != null && !nodeInstances.isEmpty()) {
- for (NodeInstance nodeInstance : nodeInstances) {
- ((EventNodeInstanceInterface) nodeInstance)
- .signalEvent(type, event);
+ for (Node node : getWorkflowProcess().getNodes()) {
+ if (node instanceof EventNodeInterface) {
+ if (((EventNodeInterface) node).acceptsEvent(type, event)) {
+ if (node instanceof EventNode) {
+ EventNodeInstance eventNodeInstance = (EventNodeInstance) getNodeInstance(node);
+ eventNodeInstance.signalEvent(type, event);
+ } else {
+ List<NodeInstance> nodeInstances = getNodeInstances(node
+ .getId());
+ if (nodeInstances != null && !nodeInstances.isEmpty()) {
+ for (NodeInstance nodeInstance : nodeInstances) {
+ ((EventNodeInstanceInterface) nodeInstance)
+ .signalEvent(type, event);
+ }
}
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath 2008-10-30 17:35:57 UTC (rev 23635)
@@ -15,9 +15,6 @@
<classpathentry exported="true" kind="lib" path="lib/antlr-runtime.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-<<<<<<< .working
-=======
<classpathentry kind="lib" path="lib/drools-api.jar"/>
->>>>>>> .merge-right.r23587
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/editpart/figure/ElementContainerFigure.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/editpart/figure/ElementContainerFigure.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/editpart/figure/ElementContainerFigure.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -8,6 +8,7 @@
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.Layer;
+import org.eclipse.draw2d.LineBorder;
import org.eclipse.draw2d.ScrollPane;
import org.eclipse.draw2d.StackLayout;
import org.eclipse.swt.graphics.Color;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -19,8 +19,8 @@
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.DroolsAction;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.ActionNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EventBasedNodeWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EventBasedNodeWrapper.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EventBasedNodeWrapper.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -4,9 +4,9 @@
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.ruleflow.view.property.timers.TimersPropertyDescriptor;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.timer.Timer;
import org.drools.workflow.core.DroolsAction;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.EventBasedNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ExtendedNodeWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ExtendedNodeWrapper.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ExtendedNodeWrapper.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -4,8 +4,8 @@
import org.drools.eclipse.flow.ruleflow.view.property.action.OnEntryActionsPropertyDescriptor;
import org.drools.eclipse.flow.ruleflow.view.property.action.OnExitActionsPropertyDescriptor;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.DroolsAction;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -18,7 +18,7 @@
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.MilestoneConstraintPropertyDescriptor;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -26,7 +26,6 @@
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.ConstraintsPropertyDescriptor;
import org.drools.knowledge.definitions.process.Connection;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.WorkflowProcess;
@@ -65,7 +64,7 @@
if (constraint != null) {
label = constraint.getName();
}
- connection.setMetaData("label", label);
+ ((org.drools.workflow.core.Connection) connection).setMetaData("label", label);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.ActionNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -23,9 +23,9 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.Process;
import org.drools.util.ArrayUtils;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.ActionNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,8 +17,8 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditListDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.DroolsAction;
+import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.swt.widgets.Shell;
/**
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,6 +1,6 @@
package org.drools.eclipse.flow.ruleflow.view.property.action;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,6 +1,6 @@
package org.drools.eclipse.flow.ruleflow.view.property.action;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,6 +17,7 @@
*/
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -26,9 +27,7 @@
import org.drools.process.core.context.variable.Variable;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.datatype.DataType;
-import org.drools.process.core.datatype.impl.type.ObjectDataType;
import org.drools.workflow.core.WorkflowProcess;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
@@ -134,7 +133,7 @@
private void loadGlobals() {
String[] globalNames = process.getGlobalNames();
- this.globals = Arrays.asList(((org.drools.process.core.Process) process).getGlobalNames());
+ this.globals = new ArrayList<GlobalDescr>(globalNames.length);
for (String globalName: globalNames) {
this.globals.add(new GlobalDescr(globalName, "java.lang.Object"));
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.Split;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -21,8 +21,8 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.knowledge.definitions.process.Connection;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.Constraint;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.Split;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.Split;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -21,7 +21,7 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -20,9 +20,9 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.util.ArrayUtils;
import org.drools.workflow.core.Constraint;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.ConstraintImpl;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.JFaceResources;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -22,7 +22,7 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -22,8 +22,8 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.Process;
+import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -25,11 +25,11 @@
import org.drools.eclipse.flow.ruleflow.view.property.action.ActionCompletionProcessor;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.Process;
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.drools.util.ArrayUtils;
import org.drools.workflow.core.DroolsAction;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -18,8 +18,8 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditMapDialog;
import org.drools.knowledge.definitions.process.Process;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.context.exception.ActionExceptionHandler;
+import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.swt.widgets.Shell;
/**
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -25,11 +25,11 @@
import org.drools.eclipse.flow.ruleflow.view.property.action.ActionCompletionProcessor;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.Process;
import org.drools.process.core.timer.Timer;
import org.drools.util.ArrayUtils;
import org.drools.workflow.core.DroolsAction;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -19,9 +19,9 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.timer.Timer;
import org.drools.workflow.core.DroolsAction;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.EventBasedNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,9 +17,9 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditMapDialog;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.timer.Timer;
import org.drools.workflow.core.DroolsAction;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,6 +1,6 @@
package org.drools.eclipse.flow.ruleflow.view.property.timers;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.EventBasedNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-process/drools-bam/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bam/.classpath 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bam/.classpath 2008-10-30 17:35:57 UTC (rev 23635)
@@ -19,5 +19,6 @@
<classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/.classpath 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/.classpath 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,35 +1,33 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/1.0.1/gunit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-utils/1.2/ode-utils-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-xpath/8.7/saxon-xpath-8.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-bpel-compiler/1.2/ode-bpel-compiler-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon/8.7/saxon-8.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.0/xalan-2.7.0.jar" sourcepath="M2_REPO/xalan/xalan/2.7.0/xalan-2.7.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0.1/antlr-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-bpel-schemas/1.2/ode-bpel-schemas-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar" sourcepath="M2_REPO/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon/8.7/saxon-8.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/saxon/saxon-xpath/8.7/saxon-xpath-8.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-bpel-compiler/1.2/ode-bpel-compiler-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-bpel-schemas/1.2/ode-bpel-schemas-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ode/ode-utils/1.2/ode-utils-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.0.0.SNAPSHOT/drools-api-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-api/5.0.0.SNAPSHOT/drools-api-5.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/.project 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/.project 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,16 +1,13 @@
-<projectDescription>
- <name>drools-bpel</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-compiler</project>
- <project>drools-core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-bpel</name>
+ <comment>A rule production system</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
</projectDescription>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/pom.xml 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/pom.xml 2008-10-30 17:35:57 UTC (rev 23635)
@@ -19,6 +19,10 @@
<!-- Internal dependencies -->
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
</dependency>
<dependency>
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/compiler/BPELCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/compiler/BPELCompiler.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/compiler/BPELCompiler.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -85,7 +85,7 @@
configuration.addDialect("XPath2.0", new XPathDialectConfiguration());
PackageBuilder packageBuilder = new PackageBuilder(configuration);
ProcessBuilder processBuilder = new ProcessBuilder(packageBuilder);
- processBuilder.buildProcess(process);
+ processBuilder.buildProcess(process, fileName);
if (!processBuilder.getErrors().isEmpty()) {
for (DroolsError error: processBuilder.getErrors()) {
System.err.println(error);
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELReceive.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELReceive.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/core/BPELReceive.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -2,7 +2,7 @@
import java.util.List;
-import org.drools.workflow.core.Connection;
+import org.drools.knowledge.definitions.process.Connection;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.NodeImpl;
import org.drools.workflow.core.node.EventNodeInterface;
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELAssignInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELAssignInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELAssignInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -17,10 +17,11 @@
import org.drools.bpel.xpath.XPathReturnValueEvaluator;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.datatype.DataType;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.spi.ProcessContext;
import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -115,7 +116,8 @@
evaluator.setExpression(xpathString);
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(this);
- return (String) evaluator.evaluate(getProcessInstance().getWorkingMemory(), processContext, XPathConstants.STRING);
+ return (String) evaluator.evaluate(
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
} catch (Throwable t) {
throw new IllegalArgumentException("Could not evaluate expression " + expression, t);
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFlowInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFlowInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFlowInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -6,9 +6,8 @@
import java.util.Map;
import org.drools.bpel.core.BPELFlow;
+import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.Node;
-import org.drools.workflow.core.node.CompositeNode;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.node.CompositeNodeInstance;
/**
@@ -30,7 +29,8 @@
activatedLinks.add(linkName);
NodeInstance waitingActivityInstance = waitingActivityInstances.get(linkName);
if (waitingActivityInstance != null) {
- waitingActivityInstance.trigger(null, Node.CONNECTION_DEFAULT_TYPE);
+ ((org.drools.workflow.instance.NodeInstance) waitingActivityInstance)
+ .trigger(null, Node.CONNECTION_DEFAULT_TYPE);
}
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELLinkManager.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELLinkManager.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELLinkManager.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -4,10 +4,11 @@
import org.drools.bpel.core.BPELActivity.SourceLink;
import org.drools.bpel.core.BPELActivity.TargetLink;
import org.drools.bpel.xpath.XPathReturnValueEvaluator;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.NodeInstanceContainer;
import org.drools.spi.ProcessContext;
import org.drools.util.ArrayUtils;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
/**
@@ -74,7 +75,7 @@
evaluator.setExpression(transitionCondition);
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(activityInstance);
- return (Boolean) evaluator.evaluate(activityInstance.getProcessInstance().getWorkingMemory(), processContext);
+ return (Boolean) evaluator.evaluate(((InternalProcessInstance) activityInstance.getProcessInstance()).getWorkingMemory(), processContext);
} catch (Throwable t) {
throw new IllegalArgumentException("Could not evaluate transition condition " + transitionCondition, t);
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,18 +1,8 @@
package org.drools.bpel.instance;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.drools.bpel.core.BPELActivity;
import org.drools.bpel.core.BPELProcess;
-import org.drools.bpel.core.BPELReceive;
-import org.drools.common.EventSupport;
-import org.drools.common.InternalWorkingMemory;
+import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
/**
@@ -91,7 +81,8 @@
@Override
protected void internalStart() {
NodeInstance nodeInstance = getNodeInstance(getBPELProcess().getActivity());
- nodeInstance.trigger(null, Node.CONNECTION_DEFAULT_TYPE);
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance)
+ .trigger(null, Node.CONNECTION_DEFAULT_TYPE);
}
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,18 +1,18 @@
package org.drools.bpel.instance;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
public class BPELProcessInstanceFactory implements ProcessInstanceFactory, Externalizable {
private static final long serialVersionUID = 400L;
- public ProcessInstance createProcessInstance() {
+ public InternalProcessInstance createProcessInstance() {
return new BPELProcessInstance();
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELReceiveInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELReceiveInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELReceiveInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -2,9 +2,9 @@
import org.drools.bpel.core.BPELReceive;
import org.drools.process.core.context.variable.VariableScope;
+import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.drools.workflow.instance.node.EventNodeInstanceInterface;
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -3,11 +3,12 @@
import org.drools.bpel.core.BPELFaultHandlerScope;
import org.drools.process.core.context.exception.ExceptionScope;
import org.drools.process.core.context.variable.VariableScope;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.NodeInstanceContainer;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.exception.ExceptionScopeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.node.CompositeContextNodeInstance;
import org.drools.workflow.instance.node.FaultNodeInstance;
@@ -34,12 +35,13 @@
NodeInstanceContainer nodeInstanceContainer = scopeInstance.getNodeInstanceContainer();
if (nodeInstanceContainer instanceof ProcessInstance) {
return (ExceptionScopeInstance)
- ((ProcessInstance) nodeInstanceContainer)
+ ((InternalProcessInstance) nodeInstanceContainer)
.getContextInstance(ExceptionScope.EXCEPTION_SCOPE);
}
if (nodeInstanceContainer instanceof NodeInstance) {
return (ExceptionScopeInstance)
- ((NodeInstance) nodeInstanceContainer).resolveContextInstance(ExceptionScope.EXCEPTION_SCOPE, faultName);
+ ((org.drools.workflow.instance.NodeInstance) nodeInstanceContainer)
+ .resolveContextInstance(ExceptionScope.EXCEPTION_SCOPE, faultName);
}
throw new IllegalArgumentException(
"Could not find enclosing exception scope");
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELWaitInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELWaitInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELWaitInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -10,6 +10,7 @@
import org.drools.bpel.core.BPELWait;
import org.drools.bpel.xpath.XPathReturnValueEvaluator;
import org.drools.process.core.timer.Timer;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.spi.ProcessContext;
import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.node.TimerNodeInstance;
@@ -51,7 +52,8 @@
evaluator.setExpression(forExpression);
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(this);
- String literal = (String) evaluator.evaluate(getProcessInstance().getWorkingMemory(), processContext, XPathConstants.STRING);
+ String literal = (String) evaluator.evaluate(
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
Calendar cal = Calendar.getInstance();
Duration duration = new Duration(literal);
@@ -73,7 +75,8 @@
evaluator.setExpression(untilExpression);
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(this);
- List literal = (List) evaluator.evaluate(getProcessInstance().getWorkingMemory(), processContext, XPathConstants.NODESET);
+ List literal = (List) evaluator.evaluate(
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.NODESET);
Calendar calendar = null;
if (literal.size() == 0) {
throw new IllegalArgumentException("No results for timer until");
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/CopyOfBPELAssignInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/CopyOfBPELAssignInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/CopyOfBPELAssignInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -18,10 +18,11 @@
import org.drools.bpel.xpath.XPathReturnValueEvaluator;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.datatype.DataType;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.spi.ProcessContext;
import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -425,7 +426,8 @@
evaluator.setExpression(xpathString);
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(this);
- return (String) evaluator.evaluate(getProcessInstance().getWorkingMemory(), processContext, XPathConstants.STRING);
+ return (String) evaluator.evaluate(
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
} catch (Throwable t) {
throw new IllegalArgumentException(
"Could not evaluate expression " + expression, t);
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/xpath/XPathReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/xpath/XPathReturnValueEvaluator.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/xpath/XPathReturnValueEvaluator.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -21,6 +21,7 @@
import org.apache.ode.utils.Namespaces;
import org.drools.WorkingMemory;
import org.drools.bpel.core.BPELProcess;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.spi.ProcessContext;
import org.drools.spi.ReturnValueEvaluator;
import org.w3c.dom.Document;
@@ -84,8 +85,9 @@
}
});
XPathEvaluator xpe = (XPathEvaluator) xpf.newXPath();
- xpe.setNamespaceContext(((BPELProcess) processContext.getNodeInstance()
- .getProcessInstance().getProcess()).getNamespaceContext());
+ xpe.setNamespaceContext(((BPELProcess) ((InternalProcessInstance)
+ processContext.getNodeInstance().getProcessInstance())
+ .getProcess()).getNamespaceContext());
XPathExpression xpathExpression = xpe.compile(expression);
return xpathExpression.evaluate(DOMUtils.newDocument(), type);
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELCompilerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELCompilerTest.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELCompilerTest.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -28,7 +28,7 @@
// Build process
PackageBuilder packageBuilder = new PackageBuilder();
ProcessBuilder processBuilder = new ProcessBuilder(packageBuilder);
- processBuilder.buildProcess(process);
+ processBuilder.buildProcess(process, "/purchaseOrderProcess.bpel");
// Load process
AbstractRuleBase ruleBase = (AbstractRuleBase) RuleBaseFactory.newRuleBase();
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELCoreTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELCoreTest.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELCoreTest.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -224,7 +224,7 @@
PackageBuilderConfiguration packageConf = new PackageBuilderConfiguration( properties );
PackageBuilder packageBuilder = new PackageBuilder(packageConf);
ProcessBuilder processBuilder = new ProcessBuilder(packageBuilder);
- processBuilder.buildProcess(process);
+ processBuilder.buildProcess(process, null);
return process;
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELTestUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELTestUtil.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELTestUtil.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -7,6 +7,7 @@
import org.drools.WorkingMemory;
import org.drools.bpel.instance.BPELProcessInstance;
+import org.drools.process.instance.InternalWorkItemManager;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -17,7 +18,8 @@
}
public static WorkItem findWebServiceInvocation(WorkingMemory workingMemory, String partnerLink, String portType, String operation) {
- Set<WorkItem> workItems = workingMemory.getWorkItemManager().getWorkItems();
+ Set<WorkItem> workItems =
+ ((InternalWorkItemManager) workingMemory.getWorkItemManager()).getWorkItems();
for (Iterator<WorkItem> iterator = workItems.iterator(); iterator.hasNext(); ) {
WorkItem workItem = iterator.next();
if ("WebServiceInvocation".equals(workItem.getName())
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/.classpath 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/.classpath 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,20 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.2b7/bsh-1.2b7.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/opensymphony/oscore/2.2.5/oscore-2.2.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/opensymphony/osworkflow/2.8.0/osworkflow-2.8.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/opensymphony/propertyset/1.4/propertyset-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.2b7/bsh-1.2b7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/opensymphony/oscore/2.2.5/oscore-2.2.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/opensymphony/osworkflow/2.8.0/osworkflow-2.8.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/opensymphony/propertyset/1.4/propertyset-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.0.0.SNAPSHOT/drools-api-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-api/5.0.0.SNAPSHOT/drools-api-5.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml 2008-10-30 17:35:57 UTC (rev 23635)
@@ -19,6 +19,10 @@
<!-- Internal dependencies -->
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
</dependency>
<dependency>
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/DroolsWorkflow.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/DroolsWorkflow.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/DroolsWorkflow.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -11,9 +11,9 @@
import org.drools.osworkflow.core.OSWorkflowProcess;
import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
import org.drools.osworkflow.instance.node.StepNodeInstance;
+import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
-import org.drools.workflow.instance.NodeInstance;
import com.opensymphony.module.propertyset.PropertySet;
import com.opensymphony.workflow.FactoryException;
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -6,13 +6,13 @@
import java.util.List;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.osworkflow.core.OSWorkflowProcess;
import org.drools.osworkflow.instance.node.StepNodeInstance;
import org.drools.process.core.context.variable.VariableScope;
+import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
import com.opensymphony.module.propertyset.PropertySet;
@@ -118,10 +118,10 @@
String type = null;
if (result.getSplit() != 0) {
nodeId = result.getSplit();
- type = Node.CONNECTION_DEFAULT_TYPE;
+ type = org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE;
} else if (result.getJoin() != 0) {
nodeId = result.getJoin();
- type = Node.CONNECTION_DEFAULT_TYPE;
+ type = org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE;
} else {
nodeId = result.getStep();
type = result.getStatus();
@@ -135,7 +135,7 @@
if (result.getOwner() != null && nodeInstance instanceof StepNodeInstance) {
((StepNodeInstance) nodeInstance).setOwner(result.getOwner());
}
- nodeInstance.trigger(null, type);
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance).trigger(null, type);
List<FunctionDescriptor> postFunctions = result.getPostFunctions();
if (postFunctions != null) {
for (FunctionDescriptor postFunction: postFunctions) {
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstanceFactory.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstanceFactory.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,11 +1,11 @@
package org.drools.osworkflow.instance;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
public class OSWorkflowProcessInstanceFactory implements ProcessInstanceFactory {
- public ProcessInstance createProcessInstance() {
+ public InternalProcessInstance createProcessInstance() {
return new OSWorkflowProcessInstance();
}
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/node/StepNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/node/StepNodeInstance.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/node/StepNodeInstance.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -7,12 +7,14 @@
import java.util.List;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Connection;
import org.drools.osworkflow.core.OSWorkflowConnection;
import org.drools.osworkflow.core.node.StepNode;
import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import com.opensymphony.module.propertyset.map.MapPropertySet;
@@ -97,7 +99,8 @@
}
}
if (action.isFinish()) {
- getProcessInstance().setState(ProcessInstance.STATE_COMPLETED);
+ ((InternalProcessInstance) getProcessInstance())
+ .setState(ProcessInstance.STATE_COMPLETED);
}
}
@@ -126,13 +129,15 @@
getOSWorkflowProcessInstance().executeFunction(postFunction, transientVars);
}
}
- getNodeInstanceContainer().removeNodeInstance(this);
+ ((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
for (Connection connection: getNode().getOutgoingConnections(actionId + "")) {
- NodeInstance nodeInstance = getNodeInstanceContainer().getNodeInstance(connection.getTo());
+ NodeInstance nodeInstance = ((NodeInstanceContainer) getNodeInstanceContainer())
+ .getNodeInstance(connection.getTo());
if (nodeInstance instanceof StepNodeInstance) {
((StepNodeInstance) nodeInstance).setOwner(owner);
}
- nodeInstance.trigger(this, connection.getToType());
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance)
+ .trigger(this, connection.getToType());
}
}
List<FunctionDescriptor> postFunctions = result.getPostFunctions();
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/.classpath 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/.classpath 2008-10-30 17:35:57 UTC (rev 23635)
@@ -4,7 +4,6 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry combineaccessrules="false" kind="src" path="/drools-compiler"/>
<classpathentry combineaccessrules="false" kind="src" path="/drools-core"/>
@@ -20,5 +19,7 @@
<classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAProcessInstanceManager.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAProcessInstanceManager.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAProcessInstanceManager.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -8,7 +8,8 @@
import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Process;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceManager;
import org.drools.process.instance.impl.ProcessInstanceImpl;
@@ -29,7 +30,7 @@
public void addProcessInstance(ProcessInstance processInstance) {
ProcessInstanceInfo processInstanceInfo = new ProcessInstanceInfo(processInstance);
manager.persist(processInstanceInfo);
- processInstance.setId(processInstanceInfo.getId());
+ ((InternalProcessInstance) processInstance).setId(processInstanceInfo.getId());
processInstanceInfo.updateLastReadDate();
}
@@ -42,7 +43,7 @@
return null;
}
processInstanceInfo.updateLastReadDate();
- ProcessInstance processInstance = processInstanceInfo.getProcessInstance();
+ InternalProcessInstance processInstance = (InternalProcessInstance) processInstanceInfo.getProcessInstance();
Process process = ((InternalRuleBase) workingMemory.getRuleBase()).getProcess(processInstance.getProcessId());
if (process == null) {
throw new IllegalArgumentException(
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManager.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManager.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManager.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,7 +1,5 @@
package org.drools.persistence.processinstance;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -10,13 +8,10 @@
import javax.persistence.EntityManager;
import org.drools.WorkingMemory;
-import org.drools.common.InternalRuleBase;
-import org.drools.common.InternalWorkingMemory;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
-import org.drools.process.instance.impl.ProcessInstanceImpl;
import org.drools.process.instance.impl.WorkItemImpl;
public class JPAWorkItemManager implements WorkItemManager {
@@ -32,38 +27,7 @@
public void setEntityManager(EntityManager manager) {
this.manager = manager;
}
-
- public void addProcessInstance(ProcessInstance processInstance) {
- ProcessInstanceInfo processInstanceInfo = new ProcessInstanceInfo(processInstance);
- manager.persist(processInstanceInfo);
- processInstance.setId(processInstanceInfo.getId());
- }
- public ProcessInstance getProcessInstance(long id) {
- ProcessInstanceInfo processInstanceInfo = manager.find(ProcessInstanceInfo.class, id);
- if (processInstanceInfo == null) {
- return null;
- }
- ProcessInstance processInstance = processInstanceInfo.getProcessInstance();
- processInstance.setProcess(((InternalRuleBase) workingMemory.getRuleBase()).getProcess(processInstance.getProcessId()));
- if (processInstance.getWorkingMemory() == null) {
- processInstance.setWorkingMemory((InternalWorkingMemory) workingMemory);
- ((ProcessInstanceImpl) processInstance).reconnect();
- }
- return processInstance;
- }
-
- public Collection<ProcessInstance> getProcessInstances() {
- return new ArrayList<ProcessInstance>();
- }
-
- public void removeProcessInstance(ProcessInstance processInstance) {
- ProcessInstanceInfo processInstanceInfo = manager.find(ProcessInstanceInfo.class, processInstance.getId());
- if (processInstanceInfo != null) {
- manager.remove(processInstanceInfo);
- }
- }
-
public void internalExecuteWorkItem(WorkItem workItem) {
WorkItemInfo workItemInfo = new WorkItemInfo(workItem);
manager.persist(workItemInfo);
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java 2008-10-30 17:35:57 UTC (rev 23635)
@@ -19,6 +19,7 @@
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
import org.drools.process.core.timer.Timer;
+import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.rule.Package;
@@ -33,7 +34,6 @@
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.NodeInstance;
import org.drools.workflow.instance.node.SubProcessNodeInstance;
public class SingleSessionCommandServiceTest extends TestCase {
@@ -173,7 +173,7 @@
PackageBuilder packageBuilder = new PackageBuilder();
ProcessBuilder processBuilder = new ProcessBuilder(packageBuilder);
- processBuilder.buildProcess(process);
+ processBuilder.buildProcess(process, null);
return packageBuilder.getPackage();
}
@@ -269,7 +269,7 @@
PackageBuilder packageBuilder = new PackageBuilder();
ProcessBuilder processBuilder = new ProcessBuilder(packageBuilder);
- processBuilder.buildProcess(process);
+ processBuilder.buildProcess(process, null);
process = new RuleFlowProcess();
process.setId("org.drools.test.SubProcess");
@@ -302,7 +302,7 @@
process.addNode(end);
new ConnectionImpl(workItemNode, Node.CONNECTION_DEFAULT_TYPE, end, Node.CONNECTION_DEFAULT_TYPE);
- processBuilder.buildProcess(process);
+ processBuilder.buildProcess(process, null);
return packageBuilder.getPackage();
}
@@ -335,7 +335,7 @@
assertNotNull(processInstance);
service = new SingleSessionCommandService(ruleBase);
- Thread.sleep(200);
+ Thread.sleep(2000);
getProcessInstanceCommand = new GetProcessInstanceCommand();
getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
@@ -355,7 +355,7 @@
timerNode.setId(2);
timerNode.setName("Timer");
Timer timer = new Timer();
- timer.setDelay(200);
+ timer.setDelay(1000);
timerNode.setTimer(timer);
process.addNode(timerNode);
new ConnectionImpl(start, Node.CONNECTION_DEFAULT_TYPE, timerNode, Node.CONNECTION_DEFAULT_TYPE);
@@ -376,7 +376,7 @@
PackageBuilder packageBuilder = new PackageBuilder();
ProcessBuilder processBuilder = new ProcessBuilder(packageBuilder);
- processBuilder.buildProcess(process);
+ processBuilder.buildProcess(process, null);
return packageBuilder.getPackage();
}
Modified: labs/jbossrules/trunk/drools-repository/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-repository/.classpath 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-repository/.classpath 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,62 +1,62 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/acl-spi/2.0.2.CR6/acl-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.CR6/identity-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2.CR6/authorization-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl/2.0.2.Beta4/jboss-security-acl-2.0.2.Beta4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2.CR6/jboss-security-acl-impl-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.3.ga/javassist-3.3.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2.CR6/identity-impl-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/acl-spi/2.0.2.CR6/acl-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.CR6/identity-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2.CR6/authorization-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl/2.0.2.Beta4/jboss-security-acl-2.0.2.Beta4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2.CR6/jboss-security-acl-impl-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.3.GA/javassist-3.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2.CR6/identity-impl-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-repository/.project
===================================================================
--- labs/jbossrules/trunk/drools-repository/.project 2008-10-30 15:20:58 UTC (rev 23634)
+++ labs/jbossrules/trunk/drools-repository/.project 2008-10-30 17:35:57 UTC (rev 23635)
@@ -1,13 +1,13 @@
-<projectDescription>
- <name>drools-repository</name>
- <comment>A rule production system</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-repository</name>
+ <comment>A rule production system</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
</projectDescription>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list