[jboss-svn-commits] JBL Code SVN: r19116 - in labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src: main/java/org/drools/brms/client/modeldriven/brl and 26 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 19 09:48:33 EDT 2008
Author: tirelli
Date: 2008-03-19 09:48:32 -0400 (Wed, 19 Mar 2008)
New Revision: 19116
Added:
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/DTColumnConfig.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/resources/billasurf.jar
Removed:
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java
Modified:
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldValue.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertFact.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionRetractFact.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionSetField.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFactPattern.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFieldConstraint.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/DSLSentence.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FactPattern.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ISingleFieldConstraint.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleModel.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionCol.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionInsertFactCol.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionSetFieldCol.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/AttributeCol.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ConditionCol.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/GuidedDecisionTable.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FactData.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FieldData.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/RetractFact.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyField.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/ActionError.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/DescrBuildError.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/RuleFlowLoadError.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/ReturnValueEvaluatorBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaRuleBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueEvaluatorBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaLexer.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParser.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialectConfiguration.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AndHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/CollectHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ExistsHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FieldBindingHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FieldConstraintHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ForallHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FromHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/LiteralRestrictionHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/NotHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/OrHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/PatternHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/RestrictionConnectiveHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/VariableRestrictionsHandler.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/Cheese.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/Person.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngineTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/compiler/RuleErrorTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzerTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/FactPopulatorTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/ScenarioTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/TestingEventListenerTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/rules/DumperTestHelper.java
labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/rules/XmlPackageReaderTest.java
Log:
reapplying commit #19103 and some non-commited changes
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -4,11 +4,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-import org.drools.brms.client.modeldriven.brl.ActionFieldList;
import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
import org.drools.brms.client.modeldriven.brl.DSLSentence;
import org.drools.brms.client.modeldriven.brl.FactPattern;
@@ -106,25 +102,7 @@
public DSLSentence[] conditionDSLSentences = new DSLSentence[0];
public DSLSentence[] actionDSLSentences = new DSLSentence[0];
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- factTypes = (String[])in.readObject();
- fieldsForType = (Map)in.readObject();
- fieldTypes = (Map)in.readObject();
- globalTypes = (Map)in.readObject();
- dataEnumLists = (Map)in.readObject();
- conditionDSLSentences = (DSLSentence[])in.readObject();
- actionDSLSentences = (DSLSentence[])in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(factTypes);
- out.writeObject(fieldsForType);
- out.writeObject(fieldTypes);
- out.writeObject(globalTypes);
- out.writeObject(dataEnumLists);
- out.writeObject(conditionDSLSentences);
- out.writeObject(actionDSLSentences);
- }
/**
* This is used to calculate what fields an enum list may depend on. Optional.
@@ -282,8 +260,14 @@
}
}
}
+ return getEnumValues(pat.factType, field);
+ }
- return (String[]) this.dataEnumLists.get(pat.factType + "." + field);
+ /**
+ * For simple cases - where a list of values are known based on a field.
+ */
+ public String[] getEnumValues(String factType, String field) {
+ return (String[]) this.dataEnumLists.get(factType + "." + field);
}
public String[] getEnums(String type, ActionFieldValue[] currentValues, String field) {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldValue.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldValue.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldValue.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.IOException;
/**
* Holds field and value for "action" parts of the rule.
@@ -32,17 +29,7 @@
public ActionFieldValue() {
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- field = (String)in.readObject();
- value = (String)in.readObject();
- type = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(field);
- out.writeObject(value);
- out.writeObject(type);
- }
/**
* This will return true if the value is really a "formula" - in
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertFact.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertFact.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertFact.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
/**
* This is used when asserting a new fact.
@@ -21,11 +18,5 @@
public ActionInsertFact() {
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- factType = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(factType);
- }
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionRetractFact.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionRetractFact.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionRetractFact.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
/**
* This is used to specify that the bound fact should be retracted
@@ -23,11 +20,5 @@
public String variableName;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- variableName = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(variableName);
- }
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionSetField.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionSetField.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionSetField.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
/**
* For setting a field on a bound LHS variable or a global.
@@ -23,11 +20,5 @@
public String variable;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- variable = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(variable);
- }
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFactPattern.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFactPattern.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFactPattern.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
/**
* Represents first order logic like Or, Not, Exists.
@@ -27,17 +24,7 @@
public FactPattern[] patterns;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- type = (String)in.readObject();
- patterns = (FactPattern[])in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(type);
- out.writeObject(patterns);
- }
-
-
/**
* This type should be from the contants in this class of course.
*/
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFieldConstraint.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFieldConstraint.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFieldConstraint.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
/**
* This is a field constraint that may span multiple fields.
@@ -39,15 +36,7 @@
*/
public FieldConstraint[] constraints = null;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- compositeJunctionType = (String)in.readObject();
- constraints = (FieldConstraint[])in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(compositeJunctionType);
- out.writeObject(constraints);
- }
//Note this is a bit ugly, GWT had some early limitations which required this to kind of work this way.
//when generics are available, could probably switch to it, but remember this is persistent stuff
//so don't want to break backwards compat (as XStream is used)
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/DSLSentence.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/DSLSentence.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/DSLSentence.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
/**
* This represents a DSL sentence.
@@ -15,13 +12,7 @@
public String sentence;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- sentence = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(sentence);
- }
/**
* This will strip off any residual "{" stuff...
*/
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FactPattern.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FactPattern.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FactPattern.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
/**
* A fact pattern is a declaration of a fact type, and its constraint,
@@ -28,17 +25,7 @@
//this.constraints = new CompositeFieldConstraint();
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- constraintList = (CompositeFieldConstraint)in.readObject();
- factType = (String)in.readObject();
- boundName = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(constraintList);
- out.writeObject(factType);
- out.writeObject(boundName);
- }
/**
* This will add a top level constraint.
*/
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ISingleFieldConstraint.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ISingleFieldConstraint.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ISingleFieldConstraint.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
/**
* Represents a constraint, which may be part of a direct field constraint or a connective.
@@ -48,13 +45,5 @@
public String value;
public int constraintValueType;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- value = (String)in.readObject();
- constraintValueType = in.readInt();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(value);
- out.writeInt(constraintValueType);
- }
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.brl;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
/**
* This holds values for rule attributes (eg salience, agenda-group etc).
@@ -27,15 +24,7 @@
public RuleAttribute() {
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- attributeName = (String)in.readObject();
- value = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(attributeName);
- out.writeObject(value);
- }
public String toString() {
StringBuffer ret = new StringBuffer();
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleModel.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleModel.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleModel.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,9 +2,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
public class RuleModel
implements
@@ -22,21 +19,7 @@
public IPattern[] lhs = new IPattern[0];
public IAction[] rhs = new IAction[0];
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- name = (String)in.readObject();
- modelVersion = (String)in.readObject();
- attributes = (RuleAttribute[])in.readObject();
- lhs = (IPattern[])in.readObject();
- rhs = (IAction[])in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(name);
- out.writeObject(modelVersion);
- out.writeObject(attributes);
- out.writeObject(lhs);
- out.writeObject(rhs);
- }
/**
* This will return the fact pattern that a variable is bound to.
*
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionCol.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionCol.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionCol.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,24 +1,12 @@
package org.drools.brms.client.modeldriven.dt;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
+public class ActionCol extends DTColumnConfig {
-public class ActionCol implements PortableObject {
-
/**
* The header to be displayed.
*/
public String header;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- header = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(header);
- }
-
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionInsertFactCol.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionInsertFactCol.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionInsertFactCol.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -26,5 +26,10 @@
*/
public String type;
+ /**
+ * An optional comman separated list of values.
+ */
+ public String valueList;
+
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionSetFieldCol.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionSetFieldCol.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ActionSetFieldCol.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -19,4 +19,9 @@
* These values come from SuggestionCompletionEngine.
*/
public String type;
+
+ /**
+ * An optional comma separated list of values.
+ */
+ public String valueList;
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/AttributeCol.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/AttributeCol.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/AttributeCol.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,13 +1,12 @@
package org.drools.brms.client.modeldriven.dt;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
/**
* This is a rule attribute - eg salience, no-loop etc.
* @author Michael Neale
*
*/
-public class AttributeCol implements PortableObject {
+public class AttributeCol extends DTColumnConfig {
public String attr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ConditionCol.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ConditionCol.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/ConditionCol.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,9 +1,5 @@
package org.drools.brms.client.modeldriven.dt;
-import org.drools.brms.client.modeldriven.brl.PortableObject;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
/**
* This is the config for a condition column. Typically many of them have their constraints added.
@@ -11,7 +7,7 @@
* @author Michael Neale
*
*/
-public class ConditionCol implements PortableObject {
+public class ConditionCol extends DTColumnConfig {
/**
* What is displayed at the top
@@ -49,11 +45,9 @@
*/
public String operator;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- header = (String)in.readObject();
- }
+ /**
+ * A comma separated list of valid values. Optional.
+ */
+ public String valueList;
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(header);
- }
}
Copied: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/DTColumnConfig.java (from rev 19103, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/DTColumnConfig.java)
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/DTColumnConfig.java (rev 0)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/DTColumnConfig.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -0,0 +1,12 @@
+package org.drools.brms.client.modeldriven.dt;
+
+import org.drools.brms.client.modeldriven.brl.PortableObject;
+
+public class DTColumnConfig implements PortableObject {
+
+ /**
+ * If this is not -1, then this is the width which will be displayed.
+ */
+ public int width = -1;
+
+}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/GuidedDecisionTable.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/GuidedDecisionTable.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/dt/GuidedDecisionTable.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,11 +1,11 @@
package org.drools.brms.client.modeldriven.dt;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
import org.drools.brms.client.modeldriven.brl.PortableObject;
/**
@@ -15,6 +15,7 @@
*
* This works by taking the column definitions, and combining them with the table of data to produce rule models.
*
+ *
* @author Michael Neale
*/
public class GuidedDecisionTable implements PortableObject {
@@ -45,22 +46,117 @@
* Subsequent ones follow the above column definitions:
* attributeCols, then conditionCols, then actionCols, in that order, left to right.
*/
- public String[][] data;
+ public String[][] data = new String[0][0];
+ /**
+ * The width to display the description column.
+ */
+ public int descriptionWidth = -1;
+
//TODO: add in precondition(s)
public GuidedDecisionTable() {}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- conditionCols = (List)in.readObject();
- actionCols = (List)in.readObject();
- data = (String[][])in.readObject();
- }
+// /**
+// * Will return an attribute col, or condition or action, depending on what column is requested.
+// * This works through attributes, conditions and then actions, in left to right manner.
+// */
+// public DTColumnConfig getColumnConfiguration(int index) {
+// if (index < attributeCols.size()) {
+// return (DTColumnConfig) attributeCols.get(index);
+// } else if (index < attributeCols.size() + conditionCols.size()) {
+// return (DTColumnConfig) conditionCols.get(index - attributeCols.size());
+// } else {
+// return (DTColumnConfig) actionCols.get(index - attributeCols.size() - conditionCols.size());
+// }
+// }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(conditionCols);
- out.writeObject(actionCols);
- out.writeObject(data);
- }
+ /**
+ * This will return a list of valid values. if there is no such "enumeration" of values,
+ * then it will return an empty array.
+ */
+ public String[] getValueList(DTColumnConfig col, SuggestionCompletionEngine sce) {
+ if (col instanceof AttributeCol) {
+ AttributeCol at = (AttributeCol) col;
+ if (at.attr.equals("no-loop") || at.attr.equals("enabled")) {
+ return new String[] {"true", "false"};
+ }
+ } else if (col instanceof ConditionCol) {
+ //conditions: if its a formula etc, just return String[0], otherwise check with the sce
+ ConditionCol c = (ConditionCol) col;
+ if (c.constraintValueType == ISingleFieldConstraint.TYPE_RET_VALUE || c.constraintValueType == ISingleFieldConstraint.TYPE_PREDICATE) {
+ return new String[0];
+ } else {
+ if (c.valueList != null && !"".equals(c.valueList)) {
+ return c.valueList.split(",");
+ } else {
+ String[] r = sce.getEnumValues(c.factType, c.factField);
+ return (r != null)? r : new String[0];
+ }
+ }
+ } else if (col instanceof ActionSetFieldCol) {
+ ActionSetFieldCol c = (ActionSetFieldCol) col;
+ if (c.valueList != null && !"".equals(c.valueList)) {
+ return c.valueList.split(",");
+ } else {
+ String[] r = sce.getEnumValues(getBoundFactType(c.boundName), c.factField);
+ return (r != null)? r : new String[0];
+ }
+ } else if (col instanceof ActionInsertFactCol) {
+ ActionInsertFactCol c = (ActionInsertFactCol) col;
+ if (c.valueList != null && !"".equals(c.valueList)) {
+ return c.valueList.split(",");
+ } else {
+ String[] r = sce.getEnumValues(c.factType, c.factField);
+ return (r != null)? r : new String[0];
+ }
+ }
+
+ return new String[0];
+ }
+
+ private String getBoundFactType(String boundName) {
+ for (Iterator iterator = conditionCols.iterator(); iterator.hasNext();) {
+ ConditionCol c = (ConditionCol) iterator.next();
+ if (c.boundName.equals(boundName)) {
+ return c.factType;
+ }
+ }
+ return null;
+ }
+
+ public boolean isNumeric(DTColumnConfig col, SuggestionCompletionEngine sce) {
+ if (col instanceof AttributeCol) {
+ AttributeCol at = (AttributeCol) col;
+ if (at.attr.equals("salience")) {
+ return true;
+ } else {
+ return false;
+ }
+ } else if (col instanceof ConditionCol) {
+ ConditionCol c = (ConditionCol) col;
+ if (c.constraintValueType == ISingleFieldConstraint.TYPE_LITERAL) {
+ String ft = sce.getFieldType(c.factType, c.factField);
+ if (ft != null && ft.equals(SuggestionCompletionEngine.TYPE_NUMERIC)) {
+ return true;
+ }
+ }
+ } else if (col instanceof ActionSetFieldCol) {
+ ActionSetFieldCol c = (ActionSetFieldCol) col;
+ String ft = sce.getFieldType(getBoundFactType(c.boundName), c.factField);
+ if (ft != null && ft.equals(SuggestionCompletionEngine.TYPE_NUMERIC)) {
+ return true;
+ }
+ } else if (col instanceof ActionInsertFactCol) {
+ ActionInsertFactCol c = (ActionInsertFactCol) col;
+ String ft = sce.getFieldType(c.factType, c.factField);
+ if (ft != null && ft.equals(SuggestionCompletionEngine.TYPE_NUMERIC)) {
+ return true;
+ }
+ }
+ //we can reuse text filter from guided editor to enforce this for data entry.
+ return false;
+ }
+
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/ExecutionTrace.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,14 +1,6 @@
package org.drools.brms.client.modeldriven.testing;
-import java.io.Serializable;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* This contains lists of rules to include in the scenario (or exclude, as the case may be !).
@@ -38,16 +30,6 @@
public ExecutionTrace() {}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- scenarioSimulatedDate = (Date)in.readObject();
- executionTimeResult = in.readLong();
- numberOfRulesFired = in.readLong();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(scenarioSimulatedDate);
- out.writeLong(executionTimeResult);
- out.writeLong(numberOfRulesFired);
- }
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FactData.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FactData.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FactData.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,9 +2,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
public class FactData implements Fixture {
@@ -38,19 +35,7 @@
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- type = (String)in.readObject();
- name = (String)in.readObject();
- fieldData = (List)in.readObject();
- isModify = in.readBoolean();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(type);
- out.writeObject(name);
- out.writeObject(fieldData);
- out.writeBoolean(isModify);
- }
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FieldData.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FieldData.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/FieldData.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,10 +2,6 @@
import org.drools.brms.client.modeldriven.brl.PortableObject;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
public class FieldData implements PortableObject {
/** the name of the field */
@@ -24,14 +20,6 @@
this.value = value;
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- name = (String)in.readObject();
- value = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(name);
- out.writeObject(value);
- }
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/RetractFact.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/RetractFact.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/RetractFact.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.testing;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
/**
* Retract a named fact.
@@ -18,11 +15,5 @@
public String name;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- name = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(name);
- }
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/Scenario.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,9 +1,5 @@
package org.drools.brms.client.modeldriven.testing;
-import java.io.Serializable;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -58,23 +54,7 @@
public boolean inclusive = false;
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- maxRuleFirings = in.readInt();
- globals = (List)in.readObject();
- fixtures = (List)in.readObject();
- lastRunResult = (Date)in.readObject();
- rules = (List)in.readObject();
- }
-
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeInt(maxRuleFirings);
- out.writeObject(globals);
- out.writeObject(fixtures);
- out.writeObject(lastRunResult);
- out.writeObject(rules);
- }
-
/**
* Returns true if this was a totally successful scenario, based on the results contained.
*/
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyFact.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,9 +2,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
/**
* This is for making assertions over a specific facts value/state AFTER execution.
@@ -27,18 +24,7 @@
this.fieldValues = fieldValues;
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- fieldValues = (List)in.readObject();
- name = (String)in.readObject();
- description = (String)in.readObject();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(fieldValues);
- out.writeObject(name);
- out.writeObject(description);
- }
-
public boolean wasSuccessful() {
for (int i = 0; i < fieldValues.size(); i++) {
VerifyField vf = (VerifyField) fieldValues.get(i);
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyField.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyField.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyField.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,10 +2,6 @@
import org.drools.brms.client.modeldriven.brl.PortableObject;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
public class VerifyField implements PortableObject {
public String fieldName;
@@ -32,18 +28,4 @@
this.operator = operator;
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- fieldName = (String)in.readObject();
- expected = (String)in.readObject();
- actualResult = (String)in.readObject();
- successResult = in.readBoolean();
- }
-
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(fieldName);
- out.writeObject(expected);
- out.writeObject(actualResult);
- out.writeBoolean(successResult);
- }
-
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/testing/VerifyRuleFired.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools.brms.client.modeldriven.testing;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
public class VerifyRuleFired implements Expectation {
@@ -32,24 +29,7 @@
this.expectedFire = expectedFire;
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- ruleName = (String)in.readObject();
- expectedCount = in.readInt();
- explanation = (String)in.readObject();
- expectedFire = in.readBoolean();
- successResult = in.readBoolean();
- actualResult = in.readInt();
- }
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(ruleName);
- out.writeInt(expectedCount);
- out.writeObject(explanation);
- out.writeBoolean(expectedFire);
- out.writeBoolean(successResult);
- out.writeInt(actualResult);
- }
-
public boolean wasSuccessful() {
return successResult.booleanValue();
}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -6,7 +6,6 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/ActionError.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/ActionError.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/ActionError.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -18,7 +18,6 @@
import org.drools.commons.jci.problems.CompilationProblem;
import org.drools.lang.descr.BaseDescr;
-import org.drools.rule.Rule;
public class ActionError extends DroolsError {
private BaseDescr descr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/DescrBuildError.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/DescrBuildError.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/DescrBuildError.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -18,7 +18,6 @@
import org.drools.commons.jci.problems.CompilationProblem;
import org.drools.lang.descr.BaseDescr;
-import org.drools.rule.Rule;
public class DescrBuildError extends DroolsError {
private BaseDescr parentDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/RuleFlowLoadError.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/RuleFlowLoadError.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/compiler/RuleFlowLoadError.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,7 +1,5 @@
package org.drools.compiler;
-import java.io.PrintStream;
-import java.io.StringWriter;
/**
* This is used for reporting errors with loading a ruleflow.
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -3,12 +3,16 @@
package org.drools.lang;
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
import java.util.HashMap;
+
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.Lexer;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
public class DRLLexer extends Lexer {
public static final int ACCUMULATE=46;
public static final int PACKAGE=4;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DRLParser.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DRLParser.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,20 +1,68 @@
// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-03-10 18:35:53
package org.drools.lang;
- import java.util.List;
import java.util.ArrayList;
- import java.util.Iterator;
- import java.util.HashMap;
- import java.util.StringTokenizer;
- import org.drools.lang.descr.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedNotSetException;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.MismatchedTokenException;
+import org.antlr.runtime.MismatchedTreeNodeException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.ParserRuleReturnScope;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.drools.lang.descr.AccessorDescr;
+import org.drools.lang.descr.AccumulateDescr;
+import org.drools.lang.descr.AndDescr;
+import org.drools.lang.descr.AttributeDescr;
+import org.drools.lang.descr.BaseDescr;
+import org.drools.lang.descr.CollectDescr;
+import org.drools.lang.descr.ConditionalElementDescr;
+import org.drools.lang.descr.DeclarativeInvokerDescr;
+import org.drools.lang.descr.DescrFactory;
+import org.drools.lang.descr.EntryPointDescr;
+import org.drools.lang.descr.EvalDescr;
+import org.drools.lang.descr.ExistsDescr;
+import org.drools.lang.descr.FactTemplateDescr;
+import org.drools.lang.descr.FieldAccessDescr;
+import org.drools.lang.descr.FieldBindingDescr;
+import org.drools.lang.descr.FieldConstraintDescr;
+import org.drools.lang.descr.FieldTemplateDescr;
+import org.drools.lang.descr.ForallDescr;
+import org.drools.lang.descr.FromDescr;
+import org.drools.lang.descr.FunctionCallDescr;
+import org.drools.lang.descr.FunctionDescr;
+import org.drools.lang.descr.FunctionImportDescr;
+import org.drools.lang.descr.GlobalDescr;
+import org.drools.lang.descr.ImportDescr;
+import org.drools.lang.descr.LiteralRestrictionDescr;
+import org.drools.lang.descr.MethodAccessDescr;
+import org.drools.lang.descr.NotDescr;
+import org.drools.lang.descr.OrDescr;
+import org.drools.lang.descr.PackageDescr;
+import org.drools.lang.descr.PatternDescr;
+import org.drools.lang.descr.PatternSourceDescr;
+import org.drools.lang.descr.PredicateDescr;
+import org.drools.lang.descr.QualifiedIdentifierRestrictionDescr;
+import org.drools.lang.descr.QueryDescr;
+import org.drools.lang.descr.RestrictionConnectiveDescr;
+import org.drools.lang.descr.RestrictionDescr;
+import org.drools.lang.descr.ReturnValueRestrictionDescr;
+import org.drools.lang.descr.RuleDescr;
+import org.drools.lang.descr.TypeDeclarationDescr;
+import org.drools.lang.descr.VariableRestrictionDescr;
public class DRLParser extends Parser {
public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "PACKAGE", "IMPORT", "FUNCTION", "ID", "DOT", "GLOBAL", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "DECLARE", "LEFT_CURLY", "RIGHT_CURLY", "STRING", "QUERY", "END", "TEMPLATE", "RULE", "WHEN", "ATTRIBUTES", "DATE_EFFECTIVE", "DATE_EXPIRES", "ENABLED", "BOOL", "SALIENCE", "INT", "NO_LOOP", "AUTO_FOCUS", "ACTIVATION_GROUP", "RULEFLOW_GROUP", "AGENDA_GROUP", "DURATION", "DIALECT", "LOCK_ON_ACTIVE", "OR", "DOUBLE_PIPE", "AND", "DOUBLE_AMPER", "FROM", "EXISTS", "NOT", "EVAL", "FORALL", "ACCUMULATE", "INIT", "ACTION", "REVERSE", "RESULT", "COLLECT", "ENTRY_POINT", "CONTAINS", "EXCLUDES", "MATCHES", "SOUNDSLIKE", "MEMBEROF", "TILDE", "IN", "FLOAT", "NULL", "LEFT_SQUARE", "RIGHT_SQUARE", "THEN", "EVENT", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'.*'", "':'", "'->'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!!
='"
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -16,11 +16,9 @@
* limitations under the License.
*/
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.drools.lang.descr.AccumulateDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -16,14 +16,13 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-import org.drools.compiler.Dialect;
import org.drools.rule.Dialectable;
public class RuleDescr extends BaseDescr implements Dialectable {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/ReturnValueEvaluatorBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/ReturnValueEvaluatorBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/ReturnValueEvaluatorBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,6 @@
package org.drools.rule.builder;
import org.drools.compiler.ReturnValueDescr;
-import org.drools.lang.descr.ActionDescr;
-import org.drools.workflow.core.node.ActionNode;
import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
public interface ReturnValueEvaluatorBuilder {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -16,9 +16,7 @@
package org.drools.rule.builder;
-import java.util.ArrayList;
import java.util.Calendar;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -7,10 +7,7 @@
import java.util.Map;
import org.drools.lang.descr.BaseDescr;
-import org.drools.rule.Declaration;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.rule.builder.RuleBuildContext;
-import org.drools.rule.builder.dialect.mvel.MVELDialect;
import org.drools.util.StringUtils;
import org.mvel.MVEL;
import org.mvel.MVELTemplateRegistry;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaRuleBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaRuleBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaRuleBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -9,7 +9,6 @@
import org.drools.lang.descr.BaseDescr;
import org.drools.rule.Declaration;
import org.drools.rule.builder.RuleBuildContext;
-import org.drools.rule.builder.dialect.mvel.MVELDialect;
import org.drools.util.StringUtils;
import org.mvel.MVEL;
import org.mvel.MVELTemplateRegistry;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -16,24 +16,16 @@
package org.drools.rule.builder.dialect.java;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.drools.compiler.Dialect;
-import org.drools.compiler.DescrBuildError;
import org.drools.lang.descr.ActionDescr;
-import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.Declaration;
import org.drools.rule.builder.ActionBuilder;
-import org.drools.rule.builder.ConsequenceBuilder;
import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.rule.builder.RuleBuildContext;
-import org.drools.rule.builder.dialect.mvel.MVELDialect;
-import org.drools.spi.PatternExtractor;
import org.drools.workflow.core.node.ActionNode;
/**
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -12,7 +12,6 @@
import java.util.Map;
import java.util.Set;
-import org.drools.process.core.Process;
import org.drools.base.ClassFieldExtractorCache;
import org.drools.base.TypeResolver;
import org.drools.commons.jci.compilers.CompilationResult;
@@ -22,11 +21,13 @@
import org.drools.commons.jci.problems.CompilationProblem;
import org.drools.commons.jci.readers.MemoryResourceReader;
import org.drools.commons.jci.readers.ResourceReader;
+import org.drools.compiler.DescrBuildError;
import org.drools.compiler.Dialect;
import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.DescrBuildError;
import org.drools.compiler.PackageBuilder.ErrorHandler;
import org.drools.compiler.PackageBuilder.FunctionErrorHandler;
+import org.drools.compiler.PackageBuilder.ProcessErrorHandler;
+import org.drools.compiler.PackageBuilder.ProcessInvokerErrorHandler;
import org.drools.compiler.PackageBuilder.RuleErrorHandler;
import org.drools.compiler.PackageBuilder.RuleInvokerErrorHandler;
import org.drools.lang.descr.AccumulateDescr;
@@ -45,7 +46,7 @@
import org.drools.lang.descr.ProcessDescr;
import org.drools.lang.descr.QueryDescr;
import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.EntryPoint;
+import org.drools.process.core.Process;
import org.drools.rule.Function;
import org.drools.rule.JavaDialectData;
import org.drools.rule.LineMappings;
@@ -74,8 +75,6 @@
import org.drools.rule.builder.SalienceBuilder;
import org.drools.rule.builder.dialect.mvel.MVELFromBuilder;
import org.drools.rule.builder.dialect.mvel.MVELSalienceBuilder;
-import org.drools.compiler.PackageBuilder.ProcessInvokerErrorHandler;
-import org.drools.compiler.PackageBuilder.ProcessErrorHandler;
import org.drools.util.StringUtils;
public class JavaDialect
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueEvaluatorBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueEvaluatorBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueEvaluatorBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -16,27 +16,16 @@
package org.drools.rule.builder.dialect.java;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.drools.compiler.Dialect;
-import org.drools.compiler.DescrBuildError;
import org.drools.compiler.ReturnValueDescr;
-import org.drools.lang.descr.ActionDescr;
-import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.Declaration;
-import org.drools.rule.builder.ActionBuilder;
-import org.drools.rule.builder.ConsequenceBuilder;
import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.ProcessBuildContext;
import org.drools.rule.builder.ReturnValueEvaluatorBuilder;
-import org.drools.rule.builder.RuleBuildContext;
-import org.drools.rule.builder.dialect.mvel.MVELDialect;
-import org.drools.spi.PatternExtractor;
-import org.drools.workflow.core.node.ActionNode;
import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
/**
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaLexer.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaLexer.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaLexer.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -3,10 +3,15 @@
package org.drools.rule.builder.dialect.java.parser;
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.Lexer;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
public class JavaLexer extends Lexer {
public static final int T29=29;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParser.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParser.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParser.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,15 +1,26 @@
// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/semantics/java/parser/Java.g 2007-12-19 16:46:01
package org.drools.rule.builder.dialect.java.parser;
- import java.util.Iterator;
+ import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.MismatchedNotSetException;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.MismatchedTokenException;
+import org.antlr.runtime.MismatchedTreeNodeException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.ParserRuleReturnScope;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
/** A Java 1.5 grammar for ANTLR v3 derived from the spec
*
* This is a very close representation of the spec; the changes
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,24 +2,17 @@
import java.io.Serializable;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Set;
import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELAction;
-import org.drools.base.mvel.MVELConsequence;
-import org.drools.compiler.Dialect;
import org.drools.compiler.DescrBuildError;
+import org.drools.compiler.Dialect;
import org.drools.lang.descr.ActionDescr;
import org.drools.rule.MVELDialectData;
import org.drools.rule.builder.ActionBuilder;
-import org.drools.rule.builder.ConsequenceBuilder;
import org.drools.rule.builder.PackageBuildContext;
-import org.drools.rule.builder.RuleBuildContext;
import org.drools.workflow.core.node.ActionNode;
-import org.mvel.Macro;
-import org.mvel.MacroProcessor;
public class MVELActionBuilder
implements
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -7,9 +7,8 @@
import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELConsequence;
-import org.drools.compiler.Dialect;
import org.drools.compiler.DescrBuildError;
-import org.drools.rule.MVELDialectData;
+import org.drools.compiler.Dialect;
import org.drools.rule.builder.ConsequenceBuilder;
import org.drools.rule.builder.RuleBuildContext;
import org.mvel.Macro;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,10 +1,10 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
@@ -40,7 +40,6 @@
import org.drools.lang.descr.QueryDescr;
import org.drools.lang.descr.RuleDescr;
import org.drools.rule.Declaration;
-import org.drools.rule.JavaDialectData;
import org.drools.rule.LineMappings;
import org.drools.rule.MVELDialectData;
import org.drools.rule.Package;
@@ -73,7 +72,6 @@
import org.mvel.compiler.AbstractParser;
import org.mvel.compiler.CompiledExpression;
import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.debug.DebugTools;
import org.mvel.optimizers.OptimizerFactory;
import org.mvel.util.CompilerTools;
import org.mvel.util.ParseTools;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialectConfiguration.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialectConfiguration.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialectConfiguration.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,7 +2,6 @@
import org.drools.compiler.Dialect;
import org.drools.compiler.DialectConfiguration;
-import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
/**
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,15 +17,13 @@
package org.drools.rule.builder.dialect.mvel;
import java.io.Serializable;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELEvalExpression;
-import org.drools.compiler.Dialect;
import org.drools.compiler.DescrBuildError;
+import org.drools.compiler.Dialect;
import org.drools.lang.descr.BaseDescr;
import org.drools.lang.descr.EvalDescr;
import org.drools.rule.Declaration;
@@ -35,12 +33,6 @@
import org.drools.rule.RuleConditionElement;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.RuleConditionBuilder;
-import org.drools.spi.DeclarationScopeResolver;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.util.ParseTools;
/**
* @author etirelli
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -27,11 +27,8 @@
import org.antlr.runtime.RecognitionException;
import org.drools.rule.builder.PackageBuildContext;
-import org.drools.rule.builder.RuleBuildContext;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
import org.mvel.ParserContext;
-import org.mvel.integration.impl.MapVariableResolver;
+import org.mvel.compiler.ExpressionCompiler;
/**
* Expression analyzer.
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -21,8 +21,8 @@
import org.drools.base.dataproviders.MVELDataProvider;
import org.drools.base.mvel.DroolsMVELFactory;
-import org.drools.compiler.Dialect;
import org.drools.compiler.DescrBuildError;
+import org.drools.compiler.Dialect;
import org.drools.lang.descr.AccessorDescr;
import org.drools.lang.descr.BaseDescr;
import org.drools.lang.descr.FromDescr;
@@ -32,11 +32,6 @@
import org.drools.rule.builder.FromBuilder;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.spi.DataProvider;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.integration.impl.ClassImportResolverFactory;
/**
* A builder for "from" conditional element
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -24,18 +24,14 @@
import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELPredicateExpression;
-import org.drools.compiler.Dialect;
import org.drools.compiler.DescrBuildError;
+import org.drools.compiler.Dialect;
import org.drools.lang.descr.PredicateDescr;
import org.drools.rule.Declaration;
import org.drools.rule.MVELDialectData;
import org.drools.rule.PredicateConstraint;
import org.drools.rule.builder.PredicateBuilder;
import org.drools.rule.builder.RuleBuildContext;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
/**
* @author etirelli
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,7 +17,6 @@
package org.drools.rule.builder.dialect.mvel;
import java.io.Serializable;
-import java.io.Externalizable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,10 +31,6 @@
import org.drools.rule.ReturnValueRestriction;
import org.drools.rule.builder.ReturnValueBuilder;
import org.drools.rule.builder.RuleBuildContext;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
/**
* @author etirelli
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,29 +2,17 @@
import java.io.Serializable;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Set;
import org.drools.base.mvel.DroolsMVELFactory;
-import org.drools.base.mvel.MVELAction;
-import org.drools.base.mvel.MVELConsequence;
import org.drools.base.mvel.MVELReturnValueEvaluator;
-import org.drools.compiler.Dialect;
import org.drools.compiler.DescrBuildError;
+import org.drools.compiler.Dialect;
import org.drools.compiler.ReturnValueDescr;
-import org.drools.lang.descr.ActionDescr;
import org.drools.rule.MVELDialectData;
-import org.drools.rule.builder.ActionBuilder;
-import org.drools.rule.builder.ConsequenceBuilder;
import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.ReturnValueEvaluatorBuilder;
-import org.drools.rule.builder.RuleBuildContext;
-import org.drools.spi.ReturnValueEvaluator;
-import org.drools.workflow.core.node.ActionNode;
import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
-import org.mvel.Macro;
-import org.mvel.MacroProcessor;
public class MVELReturnValueEvaluatorBuilder
implements
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -5,16 +5,11 @@
import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELSalienceExpression;
-import org.drools.compiler.Dialect;
import org.drools.compiler.DescrBuildError;
+import org.drools.compiler.Dialect;
import org.drools.rule.MVELDialectData;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.SalienceBuilder;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.integration.impl.ClassImportResolverFactory;
public class MVELSalienceBuilder
implements
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,7 +2,6 @@
import static org.mvel.MVEL.eval;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
@@ -24,7 +23,6 @@
import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.TimeMachine;
-import org.mvel.integration.impl.BaseVariableResolverFactory;
/**
* This actually runs the test scenarios.
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,14 +1,12 @@
package org.drools.testframework;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import org.drools.RuleBase;
import org.drools.WorkingMemory;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
@@ -17,7 +15,6 @@
import org.drools.event.AgendaGroupPoppedEvent;
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
-import org.drools.rule.Package;
import org.drools.rule.Rule;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -3,36 +3,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.util.HashMap;
-import java.util.Map;
import javax.xml.parsers.SAXParser;
import org.drools.lang.descr.PackageDescr;
-import org.drools.xml.rules.AccumulateHandler;
-import org.drools.xml.rules.AccumulateHelperHandler;
-import org.drools.xml.rules.AndHandler;
-import org.drools.xml.rules.CollectHandler;
-import org.drools.xml.rules.EvalHandler;
-import org.drools.xml.rules.ExistsHandler;
-import org.drools.xml.rules.ExpressionHandler;
-import org.drools.xml.rules.FieldBindingHandler;
-import org.drools.xml.rules.FieldConstraintHandler;
-import org.drools.xml.rules.ForallHandler;
-import org.drools.xml.rules.FromHandler;
-import org.drools.xml.rules.FunctionHandler;
-import org.drools.xml.rules.LiteralRestrictionHandler;
-import org.drools.xml.rules.NotHandler;
-import org.drools.xml.rules.OrHandler;
-import org.drools.xml.rules.PackageHandler;
-import org.drools.xml.rules.PatternHandler;
-import org.drools.xml.rules.PredicateHandler;
-import org.drools.xml.rules.QualifiedIdentifierRestrictionHandler;
-import org.drools.xml.rules.QueryHandler;
-import org.drools.xml.rules.RestrictionConnectiveHandler;
-import org.drools.xml.rules.ReturnValueRestrictionHandler;
-import org.drools.xml.rules.RuleHandler;
-import org.drools.xml.rules.VariableRestrictionsHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -3,35 +3,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.util.Set;
import javax.xml.parsers.SAXParser;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.xml.rules.AccumulateHandler;
-import org.drools.xml.rules.AccumulateHelperHandler;
-import org.drools.xml.rules.AndHandler;
-import org.drools.xml.rules.CollectHandler;
-import org.drools.xml.rules.EvalHandler;
-import org.drools.xml.rules.ExistsHandler;
-import org.drools.xml.rules.ExpressionHandler;
-import org.drools.xml.rules.FieldBindingHandler;
-import org.drools.xml.rules.FieldConstraintHandler;
-import org.drools.xml.rules.ForallHandler;
-import org.drools.xml.rules.FromHandler;
-import org.drools.xml.rules.FunctionHandler;
-import org.drools.xml.rules.LiteralRestrictionHandler;
-import org.drools.xml.rules.NotHandler;
-import org.drools.xml.rules.OrHandler;
-import org.drools.xml.rules.PackageHandler;
-import org.drools.xml.rules.PatternHandler;
-import org.drools.xml.rules.PredicateHandler;
-import org.drools.xml.rules.QualifiedIdentifierRestrictionHandler;
-import org.drools.xml.rules.QueryHandler;
-import org.drools.xml.rules.RestrictionConnectiveHandler;
-import org.drools.xml.rules.ReturnValueRestrictionHandler;
-import org.drools.xml.rules.RuleHandler;
-import org.drools.xml.rules.VariableRestrictionsHandler;
import org.drools.process.core.Process;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AccumulateDescr;
import org.drools.lang.descr.ConditionalElementDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AccumulateDescr;
import org.drools.lang.descr.BaseDescr;
@@ -29,7 +27,6 @@
import org.drools.xml.Handler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* @author fernandomeyer
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AndHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AndHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/AndHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AccumulateDescr;
import org.drools.lang.descr.AndDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/CollectHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/CollectHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/CollectHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.CollectDescr;
import org.drools.lang.descr.ConditionalElementDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ConditionalElementDescr;
@@ -34,7 +32,6 @@
import org.drools.xml.Handler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* @author mproctor
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ExistsHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ExistsHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ExistsHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ConditionalElementDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.CharStream;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FieldBindingHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FieldBindingHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FieldBindingHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.FieldBindingDescr;
import org.drools.lang.descr.FieldConstraintDescr;
@@ -30,7 +28,6 @@
import org.drools.xml.Handler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* @author mproctor
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FieldConstraintHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FieldConstraintHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FieldConstraintHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ConditionalElementDescr;
@@ -33,7 +31,6 @@
import org.drools.xml.Handler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* @author mproctor
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ForallHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ForallHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ForallHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ConditionalElementDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FromHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FromHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/FromHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.ConditionalElementDescr;
import org.drools.lang.descr.FieldConstraintDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/LiteralRestrictionHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/LiteralRestrictionHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/LiteralRestrictionHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.FieldConstraintDescr;
import org.drools.lang.descr.LiteralRestrictionDescr;
@@ -32,7 +30,6 @@
import org.drools.xml.Handler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* @author mproctor
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/NotHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/NotHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/NotHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ConditionalElementDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/OrHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/OrHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/OrHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AccumulateDescr;
import org.drools.lang.descr.AndDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/PatternHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/PatternHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/PatternHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.AccumulateDescr;
import org.drools.lang.descr.AndDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.FieldBindingDescr;
import org.drools.lang.descr.FieldConstraintDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/RestrictionConnectiveHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/RestrictionConnectiveHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/RestrictionConnectiveHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.FieldConstraintDescr;
import org.drools.lang.descr.LiteralRestrictionDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.FieldConstraintDescr;
import org.drools.lang.descr.LiteralRestrictionDescr;
@@ -32,7 +30,6 @@
import org.drools.xml.Handler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* @author mproctor
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/VariableRestrictionsHandler.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/VariableRestrictionsHandler.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/main/java/org/drools/xml/rules/VariableRestrictionsHandler.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,8 +17,6 @@
*/
import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.ListIterator;
import org.drools.lang.descr.FieldConstraintDescr;
import org.drools.lang.descr.LiteralRestrictionDescr;
@@ -31,7 +29,6 @@
import org.drools.xml.Handler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
/**
* @author mproctor
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/Cheese.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/Cheese.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/Cheese.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,8 +1,5 @@
package org.drools;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.io.Serializable;
import java.util.Date;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/Person.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/Person.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/Person.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,9 +1,8 @@
package org.drools;
-import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngineTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngineTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngineTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -273,6 +273,16 @@
}
+ public void testSimpleEnums() {
+ final SuggestionCompletionEngine sce = new SuggestionCompletionEngine();
+ sce.dataEnumLists = new HashMap();
+ sce.dataEnumLists.put("Fact.type", new String[] {"sex", "colour"});
+ assertEquals(2, sce.getEnumValues("Fact", "type").length);
+ assertEquals("sex", sce.getEnumValues("Fact", "type")[0]);
+ assertEquals("colour", sce.getEnumValues("Fact", "type")[1]);
+
+ }
+
private void assertContains(final String string,
final String[] c) {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/DataEnumLoaderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -6,7 +6,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.StringTokenizer;
import junit.framework.TestCase;
Copied: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt (from rev 19103, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt)
Deleted: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java 2008-03-19 08:33:10 UTC (rev 19103)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,274 +0,0 @@
-package org.drools.brms.modeldriven.dt;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.dt.ActionCol;
-import org.drools.brms.client.modeldriven.dt.ActionInsertFactCol;
-import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
-import org.drools.brms.client.modeldriven.dt.AttributeCol;
-import org.drools.brms.client.modeldriven.dt.ConditionCol;
-import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
-
-import junit.framework.TestCase;
-
-public class GuidedDecisionTableTest extends TestCase {
-
-// public void testGetCol() {
-// GuidedDecisionTable dt = new GuidedDecisionTable();
-// AttributeCol at1 = new AttributeCol();
-// ConditionCol condition1 = new ConditionCol();
-// ActionCol action1 = new ActionInsertFactCol();
-// dt.attributeCols.add(at1);
-// dt.conditionCols.add(condition1);
-// dt.actionCols.add(action1);
-//
-// assertEquals(at1, dt.getColumnConfiguration(0));
-// assertEquals(condition1, dt.getColumnConfiguration(1));
-// assertEquals(action1, dt.getColumnConfiguration(2));
-//
-//
-// AttributeCol at2 = new AttributeCol();
-// dt.attributeCols.add(at2);
-// assertEquals(at1, dt.getColumnConfiguration(0));
-// assertEquals(at2, dt.getColumnConfiguration(1));
-// assertEquals(condition1, dt.getColumnConfiguration(2));
-// assertEquals(action1, dt.getColumnConfiguration(3));
-//
-// ConditionCol condition2 = new ConditionCol();
-// dt.conditionCols.add(condition2);
-//
-// assertEquals(at1, dt.getColumnConfiguration(0));
-// assertEquals(at2, dt.getColumnConfiguration(1));
-// assertEquals(condition1, dt.getColumnConfiguration(2));
-// assertEquals(condition2, dt.getColumnConfiguration(3));
-// assertEquals(action1, dt.getColumnConfiguration(4));
-//
-// ActionCol action2 = new ActionInsertFactCol();
-// dt.actionCols.add(action2);
-// assertEquals(at1, dt.getColumnConfiguration(0));
-// assertEquals(at2, dt.getColumnConfiguration(1));
-// assertEquals(condition1, dt.getColumnConfiguration(2));
-// assertEquals(condition2, dt.getColumnConfiguration(3));
-// assertEquals(action1, dt.getColumnConfiguration(4));
-// assertEquals(action2, dt.getColumnConfiguration(5));
-//
-//
-//
-// dt.attributeCols = new ArrayList();
-// assertEquals(condition1, dt.getColumnConfiguration(0));
-// assertEquals(condition2, dt.getColumnConfiguration(1));
-// assertEquals(action1, dt.getColumnConfiguration(2));
-// assertEquals(action2, dt.getColumnConfiguration(3));
-//
-// dt.conditionCols = new ArrayList();
-// assertEquals(action1, dt.getColumnConfiguration(0));
-// assertEquals(action2, dt.getColumnConfiguration(1));
-//
-//
-//
-//
-//
-//
-// }
-
- public void testValueLists() {
- GuidedDecisionTable dt = new GuidedDecisionTable();
-
- //add cols for LHS
- ConditionCol c1 = new ConditionCol();
- c1.boundName = "c1";
- c1.factType = "Driver";
- c1.factField = "name";
- c1.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
- dt.conditionCols.add(c1);
-
- ConditionCol c1_ = new ConditionCol();
- c1_.boundName = "c1";
- c1_.factType = "Driver";
- c1_.factField = "name";
- c1_.constraintValueType = ISingleFieldConstraint.TYPE_RET_VALUE;
-
- dt.conditionCols.add(c1_);
-
- ConditionCol c1__ = new ConditionCol();
- c1__.boundName = "c1";
- c1__.factType = "Driver";
- c1__.factField = "name";
- c1__.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
- c1__.valueList = "one,two,three";
- dt.conditionCols.add(c1__);
-
- ConditionCol c2 = new ConditionCol();
- c2.boundName = "c2";
- c2.factType = "Driver";
- c2.factField = "nothing";
- c2.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
- dt.conditionCols.add(c2);
-
-
- ActionSetFieldCol asf = new ActionSetFieldCol();
- asf.boundName = "c1";
- asf.factField = "name";
- dt.actionCols.add(asf);
-
- ActionInsertFactCol ins = new ActionInsertFactCol();
- ins.boundName = "x";
- ins.factField = "rating";
- ins.factType = "Person";
- dt.actionCols.add(ins);
-
- ActionInsertFactCol ins_ = new ActionInsertFactCol();
- ins_.boundName = "x";
- ins_.factField = "rating";
- ins_.factType = "Person";
- ins_.valueList = "one,two,three";
- dt.actionCols.add(ins_);
-
- ActionSetFieldCol asf_ = new ActionSetFieldCol();
- asf_.boundName = "c1";
- asf_.factField = "goo";
- dt.actionCols.add(asf_);
-
- ActionSetFieldCol asf__ = new ActionSetFieldCol();
- asf__.boundName = "c1";
- asf__.factField = "goo";
- asf__.valueList = "one,two,three";
- dt.actionCols.add(asf__);
-
-
- SuggestionCompletionEngine sce = new SuggestionCompletionEngine();
- sce.dataEnumLists.put("Driver.name", new String[] {"bob", "michael"});
- sce.dataEnumLists.put("Person.rating", new String[] {"1", "2"});
-
-
-
-
- String[] r = dt.getValueList(c1, sce);
- assertEquals(2, r.length);
- assertEquals("bob", r[0]);
- assertEquals("michael", r[1]);
-
- assertEquals(0, dt.getValueList(c1_, sce).length);
-
- r = dt.getValueList(c1__, sce);
- assertEquals(3, r.length);
- assertEquals("one", r[0]);
- assertEquals("two", r[1]);
- assertEquals("three", r[2]);
-
- assertEquals(0, dt.getValueList(c2, sce).length);
-
- r = dt.getValueList(asf, sce);
- assertEquals(2, r.length);
- assertEquals("bob", r[0]);
- assertEquals("michael", r[1]);
-
- r = dt.getValueList(ins, sce);
- assertEquals(2, r.length);
- assertEquals("1", r[0]);
- assertEquals("2", r[1]);
-
- r = dt.getValueList(ins_, sce);
- assertEquals(3, r.length);
- assertEquals("one", r[0]);
- assertEquals("two", r[1]);
- assertEquals("three", r[2]);
-
- assertEquals(0, dt.getValueList(asf_, sce).length);
-
-
- r = dt.getValueList(asf__, sce);
- assertEquals(3, r.length);
- assertEquals("one", r[0]);
- assertEquals("two", r[1]);
- assertEquals("three", r[2]);
-
- AttributeCol at = new AttributeCol();
- at.attr = "no-loop";
- dt.attributeCols.add(at);
-
- r = dt.getValueList(at, sce);
- assertEquals(2, r.length);
- assertEquals("true", r[0]);
- assertEquals("false", r[1]);
-
- at.attr = "enabled";
- assertEquals(2, dt.getValueList(at, sce).length);
-
- at.attr = "salience";
- assertEquals(0, dt.getValueList(at, sce).length);
-
- }
-
-
- public void testNumeric() {
- SuggestionCompletionEngine sce = new SuggestionCompletionEngine();
- sce.fieldTypes = new HashMap();
- sce.fieldTypes.put("Driver.age", SuggestionCompletionEngine.TYPE_NUMERIC);
- sce.fieldTypes.put("Driver.name", SuggestionCompletionEngine.TYPE_STRING);
-
- GuidedDecisionTable dt = new GuidedDecisionTable();
-
- AttributeCol at = new AttributeCol();
- at.attr = "salience";
- AttributeCol at_ = new AttributeCol();
- at_.attr = "enabled";
-
- dt.attributeCols.add(at);
- dt.attributeCols.add(at_);
-
- ConditionCol c1 = new ConditionCol();
- c1.boundName = "c1";
- c1.factType = "Driver";
- c1.factField = "name";
- c1.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
- dt.conditionCols.add(c1);
-
- ConditionCol c1_ = new ConditionCol();
- c1_.boundName = "c1";
- c1_.factType = "Driver";
- c1_.factField = "age";
- c1_.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
- dt.conditionCols.add(c1_);
-
- ActionSetFieldCol a = new ActionSetFieldCol();
- a.boundName = "c1";
- a.factField = "name";
- dt.actionCols.add(a);
-
- ActionSetFieldCol a2 = new ActionSetFieldCol();
- a2.boundName = "c1";
- a2.factField = "age";
- dt.actionCols.add(a2);
-
- ActionInsertFactCol ins = new ActionInsertFactCol();
- ins.boundName = "x";
- ins.factType = "Driver";
- ins.factField = "name";
- dt.actionCols.add(ins);
-
- ActionInsertFactCol ins_ = new ActionInsertFactCol();
- ins_.boundName = "x";
- ins_.factType = "Driver";
- ins_.factField = "age";
- dt.actionCols.add(ins_);
-
- assertTrue(dt.isNumeric(at, sce));
- assertFalse(dt.isNumeric(at_, sce));
- assertFalse(dt.isNumeric(c1, sce));
- assertTrue(dt.isNumeric(c1_, sce));
- assertFalse(dt.isNumeric(a, sce));
- assertTrue(dt.isNumeric(a2, sce));
- assertFalse(dt.isNumeric(ins, sce));
- assertTrue(dt.isNumeric(ins_, sce));
-
-
-
-
- }
-
-
-}
Copied: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java (from rev 19103, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java)
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java (rev 0)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/brms/modeldriven/dt/GuidedDecisionTableTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -0,0 +1,272 @@
+package org.drools.brms.modeldriven.dt;
+
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.brms.client.modeldriven.dt.ActionInsertFactCol;
+import org.drools.brms.client.modeldriven.dt.ActionSetFieldCol;
+import org.drools.brms.client.modeldriven.dt.AttributeCol;
+import org.drools.brms.client.modeldriven.dt.ConditionCol;
+import org.drools.brms.client.modeldriven.dt.GuidedDecisionTable;
+
+public class GuidedDecisionTableTest extends TestCase {
+
+// public void testGetCol() {
+// GuidedDecisionTable dt = new GuidedDecisionTable();
+// AttributeCol at1 = new AttributeCol();
+// ConditionCol condition1 = new ConditionCol();
+// ActionCol action1 = new ActionInsertFactCol();
+// dt.attributeCols.add(at1);
+// dt.conditionCols.add(condition1);
+// dt.actionCols.add(action1);
+//
+// assertEquals(at1, dt.getColumnConfiguration(0));
+// assertEquals(condition1, dt.getColumnConfiguration(1));
+// assertEquals(action1, dt.getColumnConfiguration(2));
+//
+//
+// AttributeCol at2 = new AttributeCol();
+// dt.attributeCols.add(at2);
+// assertEquals(at1, dt.getColumnConfiguration(0));
+// assertEquals(at2, dt.getColumnConfiguration(1));
+// assertEquals(condition1, dt.getColumnConfiguration(2));
+// assertEquals(action1, dt.getColumnConfiguration(3));
+//
+// ConditionCol condition2 = new ConditionCol();
+// dt.conditionCols.add(condition2);
+//
+// assertEquals(at1, dt.getColumnConfiguration(0));
+// assertEquals(at2, dt.getColumnConfiguration(1));
+// assertEquals(condition1, dt.getColumnConfiguration(2));
+// assertEquals(condition2, dt.getColumnConfiguration(3));
+// assertEquals(action1, dt.getColumnConfiguration(4));
+//
+// ActionCol action2 = new ActionInsertFactCol();
+// dt.actionCols.add(action2);
+// assertEquals(at1, dt.getColumnConfiguration(0));
+// assertEquals(at2, dt.getColumnConfiguration(1));
+// assertEquals(condition1, dt.getColumnConfiguration(2));
+// assertEquals(condition2, dt.getColumnConfiguration(3));
+// assertEquals(action1, dt.getColumnConfiguration(4));
+// assertEquals(action2, dt.getColumnConfiguration(5));
+//
+//
+//
+// dt.attributeCols = new ArrayList();
+// assertEquals(condition1, dt.getColumnConfiguration(0));
+// assertEquals(condition2, dt.getColumnConfiguration(1));
+// assertEquals(action1, dt.getColumnConfiguration(2));
+// assertEquals(action2, dt.getColumnConfiguration(3));
+//
+// dt.conditionCols = new ArrayList();
+// assertEquals(action1, dt.getColumnConfiguration(0));
+// assertEquals(action2, dt.getColumnConfiguration(1));
+//
+//
+//
+//
+//
+//
+// }
+
+ public void testValueLists() {
+ GuidedDecisionTable dt = new GuidedDecisionTable();
+
+ //add cols for LHS
+ ConditionCol c1 = new ConditionCol();
+ c1.boundName = "c1";
+ c1.factType = "Driver";
+ c1.factField = "name";
+ c1.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+ dt.conditionCols.add(c1);
+
+ ConditionCol c1_ = new ConditionCol();
+ c1_.boundName = "c1";
+ c1_.factType = "Driver";
+ c1_.factField = "name";
+ c1_.constraintValueType = ISingleFieldConstraint.TYPE_RET_VALUE;
+
+ dt.conditionCols.add(c1_);
+
+ ConditionCol c1__ = new ConditionCol();
+ c1__.boundName = "c1";
+ c1__.factType = "Driver";
+ c1__.factField = "name";
+ c1__.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+ c1__.valueList = "one,two,three";
+ dt.conditionCols.add(c1__);
+
+ ConditionCol c2 = new ConditionCol();
+ c2.boundName = "c2";
+ c2.factType = "Driver";
+ c2.factField = "nothing";
+ c2.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+ dt.conditionCols.add(c2);
+
+
+ ActionSetFieldCol asf = new ActionSetFieldCol();
+ asf.boundName = "c1";
+ asf.factField = "name";
+ dt.actionCols.add(asf);
+
+ ActionInsertFactCol ins = new ActionInsertFactCol();
+ ins.boundName = "x";
+ ins.factField = "rating";
+ ins.factType = "Person";
+ dt.actionCols.add(ins);
+
+ ActionInsertFactCol ins_ = new ActionInsertFactCol();
+ ins_.boundName = "x";
+ ins_.factField = "rating";
+ ins_.factType = "Person";
+ ins_.valueList = "one,two,three";
+ dt.actionCols.add(ins_);
+
+ ActionSetFieldCol asf_ = new ActionSetFieldCol();
+ asf_.boundName = "c1";
+ asf_.factField = "goo";
+ dt.actionCols.add(asf_);
+
+ ActionSetFieldCol asf__ = new ActionSetFieldCol();
+ asf__.boundName = "c1";
+ asf__.factField = "goo";
+ asf__.valueList = "one,two,three";
+ dt.actionCols.add(asf__);
+
+
+ SuggestionCompletionEngine sce = new SuggestionCompletionEngine();
+ sce.dataEnumLists.put("Driver.name", new String[] {"bob", "michael"});
+ sce.dataEnumLists.put("Person.rating", new String[] {"1", "2"});
+
+
+
+
+ String[] r = dt.getValueList(c1, sce);
+ assertEquals(2, r.length);
+ assertEquals("bob", r[0]);
+ assertEquals("michael", r[1]);
+
+ assertEquals(0, dt.getValueList(c1_, sce).length);
+
+ r = dt.getValueList(c1__, sce);
+ assertEquals(3, r.length);
+ assertEquals("one", r[0]);
+ assertEquals("two", r[1]);
+ assertEquals("three", r[2]);
+
+ assertEquals(0, dt.getValueList(c2, sce).length);
+
+ r = dt.getValueList(asf, sce);
+ assertEquals(2, r.length);
+ assertEquals("bob", r[0]);
+ assertEquals("michael", r[1]);
+
+ r = dt.getValueList(ins, sce);
+ assertEquals(2, r.length);
+ assertEquals("1", r[0]);
+ assertEquals("2", r[1]);
+
+ r = dt.getValueList(ins_, sce);
+ assertEquals(3, r.length);
+ assertEquals("one", r[0]);
+ assertEquals("two", r[1]);
+ assertEquals("three", r[2]);
+
+ assertEquals(0, dt.getValueList(asf_, sce).length);
+
+
+ r = dt.getValueList(asf__, sce);
+ assertEquals(3, r.length);
+ assertEquals("one", r[0]);
+ assertEquals("two", r[1]);
+ assertEquals("three", r[2]);
+
+ AttributeCol at = new AttributeCol();
+ at.attr = "no-loop";
+ dt.attributeCols.add(at);
+
+ r = dt.getValueList(at, sce);
+ assertEquals(2, r.length);
+ assertEquals("true", r[0]);
+ assertEquals("false", r[1]);
+
+ at.attr = "enabled";
+ assertEquals(2, dt.getValueList(at, sce).length);
+
+ at.attr = "salience";
+ assertEquals(0, dt.getValueList(at, sce).length);
+
+ }
+
+
+ public void testNumeric() {
+ SuggestionCompletionEngine sce = new SuggestionCompletionEngine();
+ sce.fieldTypes = new HashMap();
+ sce.fieldTypes.put("Driver.age", SuggestionCompletionEngine.TYPE_NUMERIC);
+ sce.fieldTypes.put("Driver.name", SuggestionCompletionEngine.TYPE_STRING);
+
+ GuidedDecisionTable dt = new GuidedDecisionTable();
+
+ AttributeCol at = new AttributeCol();
+ at.attr = "salience";
+ AttributeCol at_ = new AttributeCol();
+ at_.attr = "enabled";
+
+ dt.attributeCols.add(at);
+ dt.attributeCols.add(at_);
+
+ ConditionCol c1 = new ConditionCol();
+ c1.boundName = "c1";
+ c1.factType = "Driver";
+ c1.factField = "name";
+ c1.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+ dt.conditionCols.add(c1);
+
+ ConditionCol c1_ = new ConditionCol();
+ c1_.boundName = "c1";
+ c1_.factType = "Driver";
+ c1_.factField = "age";
+ c1_.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+ dt.conditionCols.add(c1_);
+
+ ActionSetFieldCol a = new ActionSetFieldCol();
+ a.boundName = "c1";
+ a.factField = "name";
+ dt.actionCols.add(a);
+
+ ActionSetFieldCol a2 = new ActionSetFieldCol();
+ a2.boundName = "c1";
+ a2.factField = "age";
+ dt.actionCols.add(a2);
+
+ ActionInsertFactCol ins = new ActionInsertFactCol();
+ ins.boundName = "x";
+ ins.factType = "Driver";
+ ins.factField = "name";
+ dt.actionCols.add(ins);
+
+ ActionInsertFactCol ins_ = new ActionInsertFactCol();
+ ins_.boundName = "x";
+ ins_.factType = "Driver";
+ ins_.factField = "age";
+ dt.actionCols.add(ins_);
+
+ assertTrue(dt.isNumeric(at, sce));
+ assertFalse(dt.isNumeric(at_, sce));
+ assertFalse(dt.isNumeric(c1, sce));
+ assertTrue(dt.isNumeric(c1_, sce));
+ assertFalse(dt.isNumeric(a, sce));
+ assertTrue(dt.isNumeric(a2, sce));
+ assertFalse(dt.isNumeric(ins, sce));
+ assertTrue(dt.isNumeric(ins_, sce));
+
+
+
+
+ }
+
+
+}
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -42,9 +42,7 @@
import org.drools.rule.builder.RuleClassBuilder;
import org.drools.rule.builder.RuleConditionBuilder;
import org.drools.rule.builder.SalienceBuilder;
-import org.drools.rule.builder.dialect.java.JavaDialect;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
-import org.drools.rule.builder.dialect.mvel.MVELDialect;
import org.drools.util.ChainedProperties;
public class PackageBuilderConfigurationTest extends TestCase {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/compiler/RuleErrorTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/compiler/RuleErrorTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/compiler/RuleErrorTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,12 +1,11 @@
package org.drools.compiler;
+import junit.framework.TestCase;
+
import org.drools.commons.jci.problems.CompilationProblem;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.Rule;
-import junit.framework.TestCase;
-
public class RuleErrorTest extends TestCase {
public void testNewLineInMessage() {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -9,10 +9,13 @@
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.io.Reader;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
import junit.framework.TestCase;
@@ -25,8 +28,11 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.WorkingMemory;
+import org.drools.common.DroolsObjectInputStream;
import org.drools.common.InternalFactHandle;
import org.drools.compiler.PackageBuilder;
+import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.rule.MapBackedClassLoader;
import org.drools.rule.Package;
import org.drools.rule.Rule;
@@ -850,6 +856,46 @@
}
+ /**
+ * In this case we are dealing with facts which are not on the systems classpath.
+ *
+ */
+ public void testSerializabilityWithJarFacts() throws Exception {
+ MapBackedClassLoader loader = new MapBackedClassLoader( this.getClass().getClassLoader() );
+
+ JarInputStream jis = new JarInputStream(this.getClass().getResourceAsStream("/billasurf.jar"));
+
+ JarEntry entry = null;
+ byte[] buf = new byte[1024];
+ int len = 0;
+ while ( (entry = jis.getNextJarEntry()) != null ) {
+ if ( !entry.isDirectory() ) {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ while ( (len = jis.read( buf )) >= 0 ) {
+ out.write( buf, 0, len );
+ }
+ loader.addResource( entry.getName() , out.toByteArray() );
+ }
+ }
+
+ String drl = "package foo.bar \n" +
+ "import com.billasurf.Board\n" +
+ "rule 'MyGoodRule' \n dialect 'mvel' \n when Board() then System.err.println(42); \n end\n";
+
+ PackageBuilder builder = new PackageBuilder(new PackageBuilderConfiguration(loader));
+ builder.addPackageFromDrl(new StringReader(drl));
+ assertFalse(builder.hasErrors());
+
+ Package p = builder.getPackage();
+ byte[] ser = SerializationHelper.serializeOut(p);
+
+ //now read it back
+ DroolsObjectInputStream in = new DroolsObjectInputStream(new ByteArrayInputStream(ser), loader);
+ Package p_ = (Package) in.readObject();
+ assertNotNull(p_);
+
+ }
+
protected RuleBase getRuleBase() throws Exception {
return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -21,7 +21,6 @@
*
*/
-import java.io.Serializable;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -5,7 +5,6 @@
import junit.framework.TestCase;
import org.drools.compiler.Dialect;
-import org.drools.compiler.DialectRegistry;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.AccumulateDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,54 +1,23 @@
package org.drools.rule.builder.dialect.java;
-import java.io.InputStreamReader;
-import java.io.Serializable;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import junit.framework.Assert;
import junit.framework.TestCase;
-import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
-import org.drools.base.ClassObjectType;
-import org.drools.base.DefaultKnowledgeHelper;
-import org.drools.base.mvel.MVELConsequence;
-import org.drools.base.mvel.MVELDebugHandler;
-import org.drools.common.AgendaItem;
-import org.drools.common.InternalFactHandle;
-import org.drools.common.PropagationContextImpl;
-import org.drools.compiler.Dialect;
-import org.drools.compiler.DialectConfiguration;
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.ActionDescr;
-import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.ProcessDescr;
-import org.drools.lang.descr.RuleDescr;
-import org.drools.reteoo.ReteTuple;
-import org.drools.rule.Declaration;
import org.drools.rule.Package;
-import org.drools.rule.Pattern;
-import org.drools.rule.Rule;
-import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.rule.builder.RuleBuildContext;
-import org.drools.rule.builder.RuleBuilder;
import org.drools.spi.Action;
-import org.drools.spi.ObjectType;
-import org.drools.spi.PatternExtractor;
import org.drools.workflow.core.impl.WorkflowProcessImpl;
import org.drools.workflow.core.node.ActionNode;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.ParserContext;
public class JavaActionBuilderTest extends TestCase {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -2,23 +2,20 @@
import java.util.Set;
+import junit.framework.TestCase;
+
import org.antlr.runtime.RecognitionException;
import org.drools.Cheese;
import org.drools.base.ClassObjectType;
-import org.drools.compiler.Dialect;
-import org.drools.compiler.DialectRegistry;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.builder.PackageBuildContext;
-import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.ImportDeclaration;
import org.drools.rule.Package;
import org.drools.rule.Pattern;
import org.drools.rule.Rule;
+import org.drools.rule.builder.RuleBuildContext;
-import junit.framework.TestCase;
-
public class JavaConsequenceBuilderTest extends TestCase {
private JavaConsequenceBuilder builder;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzerTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzerTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzerTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -17,7 +17,6 @@
*/
package org.drools.rule.builder.dialect.java;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -29,7 +29,6 @@
import org.drools.base.ClassTypeResolver;
import org.drools.base.TypeResolver;
import org.drools.compiler.Dialect;
-import org.drools.compiler.DialectRegistry;
import org.drools.compiler.DrlParser;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,51 +1,21 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.InputStreamReader;
-import java.io.Serializable;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import junit.framework.Assert;
import junit.framework.TestCase;
-import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
-import org.drools.base.ClassObjectType;
-import org.drools.base.DefaultKnowledgeHelper;
-import org.drools.base.mvel.MVELConsequence;
-import org.drools.base.mvel.MVELDebugHandler;
-import org.drools.common.AgendaItem;
-import org.drools.common.InternalFactHandle;
-import org.drools.common.PropagationContextImpl;
-import org.drools.compiler.Dialect;
-import org.drools.compiler.DialectConfiguration;
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.ActionDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.lang.descr.RuleDescr;
-import org.drools.reteoo.ReteTuple;
-import org.drools.rule.Declaration;
import org.drools.rule.Package;
-import org.drools.rule.Pattern;
-import org.drools.rule.Rule;
import org.drools.rule.builder.PackageBuildContext;
-import org.drools.rule.builder.RuleBuildContext;
-import org.drools.rule.builder.RuleBuilder;
import org.drools.spi.Action;
-import org.drools.spi.ObjectType;
-import org.drools.spi.PatternExtractor;
import org.drools.workflow.core.node.ActionNode;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.ParserContext;
public class MVELActionBuilderTest extends TestCase {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -21,12 +21,10 @@
import org.drools.common.InternalFactHandle;
import org.drools.common.PropagationContextImpl;
import org.drools.compiler.Dialect;
-import org.drools.compiler.DialectConfiguration;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.RuleDescr;
import org.drools.reteoo.ReteTuple;
@@ -38,8 +36,8 @@
import org.drools.rule.builder.RuleBuilder;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
-import org.mvel.compiler.ExpressionCompiler;
import org.mvel.ParserContext;
+import org.mvel.compiler.ExpressionCompiler;
public class MVELConsequenceBuilderTest extends TestCase {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,51 +1,21 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.InputStreamReader;
-import java.io.Serializable;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import junit.framework.Assert;
import junit.framework.TestCase;
-import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
-import org.drools.base.ClassObjectType;
-import org.drools.base.DefaultKnowledgeHelper;
-import org.drools.base.mvel.MVELConsequence;
-import org.drools.base.mvel.MVELDebugHandler;
-import org.drools.common.AgendaItem;
-import org.drools.common.InternalFactHandle;
-import org.drools.common.PropagationContextImpl;
-import org.drools.compiler.Dialect;
-import org.drools.compiler.DialectConfiguration;
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.ActionDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.lang.descr.RuleDescr;
-import org.drools.reteoo.ReteTuple;
-import org.drools.rule.Declaration;
import org.drools.rule.Package;
-import org.drools.rule.Pattern;
-import org.drools.rule.Rule;
import org.drools.rule.builder.PackageBuildContext;
-import org.drools.rule.builder.RuleBuildContext;
-import org.drools.rule.builder.RuleBuilder;
import org.drools.spi.Action;
-import org.drools.spi.ObjectType;
-import org.drools.spi.PatternExtractor;
import org.drools.workflow.core.node.ActionNode;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.ParserContext;
public class MVELDecisionBuilderTest extends TestCase {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -12,7 +12,6 @@
import org.drools.base.ClassFieldExtractorCache;
import org.drools.base.ClassObjectType;
import org.drools.common.InternalFactHandle;
-import org.drools.compiler.DialectConfiguration;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.EvalDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -11,8 +11,6 @@
import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.common.InternalFactHandle;
-import org.drools.compiler.DialectConfiguration;
-import org.drools.compiler.DialectRegistry;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.RuleDescr;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/FactPopulatorTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/FactPopulatorTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/FactPopulatorTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,17 +1,12 @@
package org.drools.testframework;
-import java.io.Serializable;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-
import junit.framework.TestCase;
+import org.mvel.MVEL;
+
public class FactPopulatorTest extends TestCase {
public void testMVELPopulate() throws Exception {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/ScenarioTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/ScenarioTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/ScenarioTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -4,17 +4,16 @@
import java.util.List;
import java.util.Map;
+import junit.framework.TestCase;
+
import org.drools.brms.client.modeldriven.testing.ExecutionTrace;
import org.drools.brms.client.modeldriven.testing.FactData;
-import org.drools.brms.client.modeldriven.testing.FieldData;
import org.drools.brms.client.modeldriven.testing.RetractFact;
import org.drools.brms.client.modeldriven.testing.Scenario;
import org.drools.brms.client.modeldriven.testing.VerifyFact;
import org.drools.brms.client.modeldriven.testing.VerifyField;
import org.drools.brms.client.modeldriven.testing.VerifyRuleFired;
-import junit.framework.TestCase;
-
public class ScenarioTest extends TestCase {
public void testInsertAfter() {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/TestingEventListenerTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/TestingEventListenerTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/testframework/TestingEventListenerTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -1,17 +1,11 @@
package org.drools.testframework;
-import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import org.drools.Cheese;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.compiler.PackageBuilder;
-import org.drools.spi.Activation;
-import org.drools.spi.AgendaFilter;
public class TestingEventListenerTest extends RuleUnit {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -10,8 +10,6 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.core.Process;
-import org.drools.xml.XmlProcessReader;
public class ActionNodeTest extends TestCase {
public void testSingleActionNode() throws Exception {
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/rules/DumperTestHelper.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/rules/DumperTestHelper.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/rules/DumperTestHelper.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -5,7 +5,6 @@
import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.StringReader;
import junit.framework.Assert;
@@ -13,7 +12,6 @@
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.DrlDumper;
import org.drools.lang.descr.PackageDescr;
-import org.drools.xml.SemanticModules;
import org.drools.xml.XmlDumper;
import org.drools.xml.XmlPackageReader;
Modified: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/rules/XmlPackageReaderTest.java
===================================================================
--- labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/rules/XmlPackageReaderTest.java 2008-03-19 13:41:22 UTC (rev 19115)
+++ labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/java/org/drools/xml/rules/XmlPackageReaderTest.java 2008-03-19 13:48:32 UTC (rev 19116)
@@ -13,7 +13,6 @@
import org.drools.lang.descr.AccumulateDescr;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.AttributeDescr;
-import org.drools.lang.descr.BaseDescr;
import org.drools.lang.descr.CollectDescr;
import org.drools.lang.descr.EvalDescr;
import org.drools.lang.descr.ExistsDescr;
@@ -35,7 +34,6 @@
import org.drools.lang.descr.ReturnValueRestrictionDescr;
import org.drools.lang.descr.RuleDescr;
import org.drools.lang.descr.VariableRestrictionDescr;
-import org.drools.xml.SemanticModules;
import org.drools.xml.XmlPackageReader;
public class XmlPackageReaderTest extends TestCase {
Copied: labs/jbossrules/branches/fixing_bad_merge/drools-compiler/src/test/resources/billasurf.jar (from rev 19048, labs/jbossrules/trunk/drools-compiler/src/test/resources/billasurf.jar)
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list