[jboss-svn-commits] JBL Code SVN: r29055 - in labs/jbossrules/trunk: drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 25 11:40:04 EDT 2009
Author: KrisVerlaenen
Date: 2009-08-25 11:40:04 -0400 (Tue, 25 Aug 2009)
New Revision: 29055
Modified:
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/AgendaViewContentProvider.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectRuntimeWizardPage.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/resources/org/drools/eclipse/wizard/project/RuleFlowLauncherSample.java.template
labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELGuvnorTest.java
labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest.java
labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest2.java
labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest3.java
Log:
- fixing bpmn2 wizard
- minor fix due to API change
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/AgendaViewContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/AgendaViewContentProvider.java 2009-08-25 14:27:34 UTC (rev 29054)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/AgendaViewContentProvider.java 2009-08-25 15:40:04 UTC (rev 29055)
@@ -4,6 +4,8 @@
import java.util.List;
import org.drools.eclipse.DroolsEclipsePlugin;
+import org.drools.reteoo.ReteooStatefulSession;
+import org.drools.runtime.rule.AgendaGroup;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IValue;
import org.eclipse.debug.core.model.IVariable;
@@ -57,10 +59,21 @@
}
}
+ private void testDebugExpression() {
+ ReteooStatefulSession session = null;
+ AgendaGroup[] agendaGroups = session.getAgenda().getAgendaGroups();
+ String focus = session.getAgenda().getFocusName();
+ }
+
private Object[] getAgendaElements(IJavaObject workingMemoryImpl) throws DebugException {
List result = new ArrayList();
IValue agendaGroupObjects = DebugUtil.getValueByExpression("return getAgenda().getAgendaGroups();", workingMemoryImpl);
+ // Drools 4 code
IValue focus = DebugUtil.getValueByExpression("return getAgenda().getFocus();", workingMemoryImpl);
+ if (focus == null) {
+ // Drools 5 code
+ focus = DebugUtil.getValueByExpression("return getAgenda().getFocusName();", workingMemoryImpl);
+ }
if (agendaGroupObjects instanceof IJavaArray) {
IJavaArray agendaGroupArray = (IJavaArray) agendaGroupObjects;
IJavaValue[] agendaGroupValueArray = agendaGroupArray.getValues();
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectRuntimeWizardPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectRuntimeWizardPage.java 2009-08-25 14:27:34 UTC (rev 29054)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectRuntimeWizardPage.java 2009-08-25 15:40:04 UTC (rev 29055)
@@ -118,6 +118,7 @@
}
});
droolsGenerateCombo.select(1);
+ generationType = DROOLS5;
gridData = new GridData();
gridData.grabExcessHorizontalSpace = true;
gridData.horizontalAlignment = GridData.FILL;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java 2009-08-25 14:27:34 UTC (rev 29054)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java 2009-08-25 15:40:04 UTC (rev 29055)
@@ -383,7 +383,8 @@
private void createRuleFlow(IJavaProject project, IProgressMonitor monitor)
throws CoreException {
- if (runtimePage.getGenerationType() == NewDroolsProjectRuntimeWizardPage.DROOLS4) {
+ String generationType = runtimePage.getGenerationType();
+ if (NewDroolsProjectRuntimeWizardPage.DROOLS4.equals(generationType)) {
String fileName = "org/drools/eclipse/wizard/project/ruleflow_4.rf.template";
IFolder folder = project.getProject().getFolder("src/main/rules");
IFile file = folder.getFile("ruleflow.rf");
@@ -411,7 +412,7 @@
} else {
file.setContents(inputstream, true, false, monitor);
}
- } else if (runtimePage.getGenerationType() == NewDroolsProjectRuntimeWizardPage.DROOLS5) {
+ } else if (NewDroolsProjectRuntimeWizardPage.DROOLS5.equals(generationType)) {
String fileName = "org/drools/eclipse/wizard/project/ruleflow.rf.template";
IFolder folder = project.getProject().getFolder("src/main/rules");
IFile file = folder.getFile("ruleflow.rf");
@@ -441,9 +442,10 @@
throws JavaModelException, IOException {
String s;
- if (runtimePage.getGenerationType() == NewDroolsProjectRuntimeWizardPage.DROOLS4) {
+ String generationType = runtimePage.getGenerationType();
+ if (NewDroolsProjectRuntimeWizardPage.DROOLS4.equals(generationType)) {
s = "org/drools/eclipse/wizard/project/RuleFlowLauncherSample_4.java.template";
- } else if (runtimePage.getGenerationType() == NewDroolsProjectRuntimeWizardPage.DROOLS5) {
+ } else if (NewDroolsProjectRuntimeWizardPage.DROOLS5.equals(generationType)) {
s = "org/drools/eclipse/wizard/project/RuleFlowLauncherSample.java.template";
} else {
s = "org/drools/eclipse/wizard/project/ProcessLauncherSample_bpmn.java.template";
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/resources/org/drools/eclipse/wizard/project/RuleFlowLauncherSample.java.template
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/resources/org/drools/eclipse/wizard/project/RuleFlowLauncherSample.java.template 2009-08-25 14:27:34 UTC (rev 29054)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/resources/org/drools/eclipse/wizard/project/RuleFlowLauncherSample.java.template 2009-08-25 15:40:04 UTC (rev 29055)
@@ -15,7 +15,7 @@
/**
* This is a sample file to launch a process.
*/
-public class RuleFlowTest {
+public class ProcessTest {
public static final void main(String[] args) {
try {
Modified: labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELGuvnorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELGuvnorTest.java 2009-08-25 14:27:34 UTC (rev 29054)
+++ labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELGuvnorTest.java 2009-08-25 15:40:04 UTC (rev 29055)
@@ -40,7 +40,7 @@
}
private static KnowledgeBase readKnowledgeBase() throws Exception {
- ResourceType bpelType = new ResourceType(BPELProcess.ODE_TYPE, "ODE BPEL Process");
+ ResourceType bpelType = new ResourceType(BPELProcess.ODE_TYPE, "ODE BPEL Process", "bpel.jar");
ResourceTypeBuilderRegistry.getInstance().register(
bpelType, new BPELResourceTypeBuilder());
KnowledgeAgent kagent = KnowledgeAgentFactory.newKnowledgeAgent("Guvnor");
Modified: labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest.java 2009-08-25 14:27:34 UTC (rev 29054)
+++ labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest.java 2009-08-25 15:40:04 UTC (rev 29055)
@@ -43,7 +43,7 @@
}
private static KnowledgeBase readKnowledgeBase() throws Exception {
- ResourceType bpelType = new ResourceType(BPELProcess.ODE_TYPE, "ODE BPEL Process");
+ ResourceType bpelType = new ResourceType(BPELProcess.ODE_TYPE, "ODE BPEL Process", "bpel.jar");
ResourceTypeBuilderRegistry.getInstance().register(
bpelType, new BPELResourceTypeBuilder());
KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
Modified: labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest2.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest2.java 2009-08-25 14:27:34 UTC (rev 29054)
+++ labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest2.java 2009-08-25 15:40:04 UTC (rev 29055)
@@ -43,7 +43,7 @@
}
private static KnowledgeBase readKnowledgeBase() throws Exception {
- ResourceType bpelType = new ResourceType(BPELProcess.ODE_TYPE, "ODE BPEL Process");
+ ResourceType bpelType = new ResourceType(BPELProcess.ODE_TYPE, "ODE BPEL Process", "bpel.jar");
ResourceTypeBuilderRegistry.getInstance().register(
bpelType, new BPELResourceTypeBuilder());
KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
Modified: labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest3.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest3.java 2009-08-25 14:27:34 UTC (rev 29054)
+++ labs/jbossrules/trunk/drools-process/drools-ode/src/test/java/org/drools/ode/DroolsBPELTest3.java 2009-08-25 15:40:04 UTC (rev 29055)
@@ -43,7 +43,7 @@
}
private static KnowledgeBase readKnowledgeBase() throws Exception {
- ResourceType bpelType = new ResourceType(BPELProcess.ODE_TYPE, "ODE BPEL Process");
+ ResourceType bpelType = new ResourceType(BPELProcess.ODE_TYPE, "ODE BPEL Process", "bpel.jar");
ResourceTypeBuilderRegistry.getInstance().register(
bpelType, new BPELResourceTypeBuilder());
KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
More information about the jboss-svn-commits
mailing list