[jboss-svn-commits] JBL Code SVN: r12938 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/brms/client/modeldriven/brl and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 28 17:20:34 EDT 2007
Author: fmeyer
Date: 2007-06-28 17:20:34 -0400 (Thu, 28 Jun 2007)
New Revision: 12938
Added:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brl.xml
Removed:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brxml.xml
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldList.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldValue.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertLogicalFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionRetractFact.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionSetField.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionUpdateField.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFactPattern.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFieldConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ConnectiveConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/DSLSentence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FactPattern.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FieldConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/IAction.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/IPattern.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ISingleFieldConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/PortableObject.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleModel.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/SingleFieldConstraint.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/package.html
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFieldConstraintTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
Log:
JBRULES-956 - Rename ALL occurences of BRXML to BRL
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -5,8 +5,8 @@
import java.util.Map;
import java.util.Set;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
-import org.drools.brms.client.modeldriven.brxml.PortableObject;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.PortableObject;
/**
* An suggestion completion processor. This should be usable in both GWT/Web and the IDE.
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl (from rev 12931, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml)
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldList.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldList.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldList.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This class is the parent for field setting or assertion actions.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldValue.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionFieldValue.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* Holds field and value for "action" parts of the rule.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertFact.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertFact.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This is used when asserting a new fact.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertLogicalFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionInsertLogicalFact.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionInsertLogicalFact.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* Logical assertions are used as part of "truth maintenance".
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionRetractFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionRetractFact.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionRetractFact.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This is used to specify that the bound fact should be retracted
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionSetField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionSetField.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionSetField.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* For setting a field on a bound LHS variable or a global.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionUpdateField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionUpdateField.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ActionUpdateField.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* Basically the same as setting fields, EXCEPT that
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/CompositeFactPattern.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFactPattern.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* Represents first order logic like Or, Not, Exists.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFieldConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/CompositeFieldConstraint.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/CompositeFieldConstraint.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This is a field constraint that may span multiple fields.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ConnectiveConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ConnectiveConstraint.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ConnectiveConstraint.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This is for a connective constraint that adds more options to a field constraint.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/DSLSentence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/DSLSentence.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This represents a DSL sentence.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/FactPattern.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FactPattern.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* A fact pattern is a declaration of a fact type, and its constraint,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FieldConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/FieldConstraint.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/FieldConstraint.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This is the top level interface for all field constraints.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/IAction.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IAction.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/IAction.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
public interface IAction
extends
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/IPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IPattern.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/IPattern.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
public interface IPattern
extends
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ISingleFieldConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ISingleFieldConstraint.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/ISingleFieldConstraint.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* Represents a constraint, which may be part of a direct field constraint or a connective.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/PortableObject.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/PortableObject.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/PortableObject.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This is the marker interface for portable Ajaxy type objects.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleAttribute.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
* This holds values for rule attributes (eg salience, agenda-group etc).
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleModel.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleModel.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleModel.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
import java.util.ArrayList;
import java.util.List;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/SingleFieldConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/SingleFieldConstraint.java 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/SingleFieldConstraint.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,4 +1,4 @@
-package org.drools.brms.client.modeldriven.brxml;
+package org.drools.brms.client.modeldriven.brl;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/package.html
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/package.html 2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/package.html 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,6 +1,6 @@
<body>
This package holds classes that are used as RPC classes for the rule modeller,
- as well as the DOM for the BRXML rule format that the rule modeller uses.
+ as well as the DOM for the BRL rule format that the rule modeller uses.
IMPORTANT:
Do not change these unless you are adding fields or removing fields, not refactoring
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,24 +1,24 @@
package org.drools.brms.server.util;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertLogicalFact;
-import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brxml.ActionSetField;
-import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.FieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.IAction;
-import org.drools.brms.client.modeldriven.brxml.IPattern;
-import org.drools.brms.client.modeldriven.brxml.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
+import org.drools.brms.client.modeldriven.brl.ActionSetField;
+import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.FieldConstraint;
+import org.drools.brms.client.modeldriven.brl.IAction;
+import org.drools.brms.client.modeldriven.brl.IPattern;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.RuleAttribute;
+import org.drools.brms.client.modeldriven.brl.RuleModel;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
import org.drools.util.ReflectiveVisitor;
/**
@@ -40,7 +40,7 @@
}
/* (non-Javadoc)
- * @see org.drools.brms.server.util.BRLPersistence#marshal(org.drools.brms.client.modeldriven.brxml.RuleModel)
+ * @see org.drools.brms.server.util.BRLPersistence#marshal(org.drools.brms.client.modeldriven.brl.RuleModel)
*/
public String marshal(RuleModel model) {
boolean isDSLEnhanced = false;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,11 +1,9 @@
package org.drools.brms.server.util;
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
+import org.drools.brms.client.modeldriven.brl.RuleModel;
public interface BRLPersistence {
public String marshal(final RuleModel model);
-
public RuleModel unmarshal(final String str);
-
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRXMLPersistence.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,19 +1,19 @@
package org.drools.brms.server.util;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertLogicalFact;
-import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brxml.ActionSetField;
-import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
+import org.drools.brms.client.modeldriven.brl.ActionSetField;
+import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.RuleAttribute;
+import org.drools.brms.client.modeldriven.brl.RuleModel;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
@@ -21,7 +21,7 @@
/**
* This class persists the rule model to XML and back.
*
- * This is the 'brxml' xml format (Business Rule Language).
+ * This is the 'brl' xml format (Business Rule Language).
*
* @author Michael Neale
*/
@@ -72,7 +72,7 @@
}
/* (non-Javadoc)
- * @see org.drools.brms.server.util.BRLPersistence#toXML(org.drools.brms.client.modeldriven.brxml.RuleModel)
+ * @see org.drools.brms.server.util.BRLPersistence#toXML(org.drools.brms.client.modeldriven.brl.RuleModel)
*/
public String marshal(final RuleModel model) {
return this.xt.toXML( model );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -22,7 +22,7 @@
import java.util.Map;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
/**
* A builder to incrementally populate a SuggestionCompletionEngine
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -3,7 +3,7 @@
import junit.framework.TestCase;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
public class ActionFieldValueTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -3,8 +3,8 @@
import junit.framework.TestCase;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionSetField;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionSetField;
public class ActionSetFieldTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -2,8 +2,8 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
public class CompositeFactPatternTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFieldConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFieldConstraintTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFieldConstraintTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -2,8 +2,8 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
public class CompositeFieldConstraintTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
public class ConstraintTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
public class DSLSentenceTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -2,9 +2,9 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
public class FactPatternTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -4,18 +4,18 @@
import junit.framework.TestCase;
-import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brxml.ActionSetField;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.IAction;
-import org.drools.brms.client.modeldriven.brxml.IPattern;
-import org.drools.brms.client.modeldriven.brxml.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
+import org.drools.brms.client.modeldriven.brl.ActionSetField;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.IAction;
+import org.drools.brms.client.modeldriven.brl.IPattern;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.RuleAttribute;
+import org.drools.brms.client.modeldriven.brl.RuleModel;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
import com.thoughtworks.xstream.XStream;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -3,20 +3,20 @@
import junit.framework.TestCase;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertLogicalFact;
-import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
+import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.RuleAttribute;
+import org.drools.brms.client.modeldriven.brl.RuleModel;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
public class BRDRLPersistenceTest extends TestCase {
Copied: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java (from rev 12931, labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -0,0 +1,257 @@
+package org.drools.brms.server.util;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import junit.framework.TestCase;
+
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
+import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.RuleAttribute;
+import org.drools.brms.client.modeldriven.brl.RuleModel;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
+
+public class BRLPersitenceTest extends TestCase {
+
+ public void testGenerateEmptyXML() {
+ final BRLPersistence p = BRXMLPersistence.getInstance();
+ final String xml = p.marshal( new RuleModel() );
+ assertNotNull( xml );
+ assertFalse( xml.equals( "" ) );
+
+ assertTrue( xml.startsWith( "<rule>" ) );
+ assertTrue( xml.endsWith( "</rule>" ) );
+ }
+
+ public void testBasics() {
+ final BRLPersistence p = BRXMLPersistence.getInstance();
+ final RuleModel m = new RuleModel();
+ m.addLhsItem( new FactPattern( "Person" ) );
+ m.addLhsItem( new FactPattern( "Accident" ) );
+ m.addAttribute( new RuleAttribute( "no-loop",
+ "true" ) );
+
+ m.addRhsItem( new ActionInsertFact( "Report" ) );
+ m.name = "my rule";
+ final String xml = p.marshal( m );
+ //System.out.println(xml);
+ assertTrue( xml.indexOf( "Person" ) > -1 );
+ assertTrue( xml.indexOf( "Accident" ) > -1 );
+ assertTrue( xml.indexOf( "no-loop" ) > -1 );
+ assertTrue( xml.indexOf( "org.drools" ) == -1 );
+
+ }
+
+ public void testMoreComplexRendering() {
+ final BRLPersistence p = BRXMLPersistence.getInstance();
+ final RuleModel m = getComplexModel();
+
+ final String xml = p.marshal( m );
+ //System.out.println( xml );
+
+ assertTrue( xml.indexOf( "org.drools" ) == -1 );
+
+ }
+
+ public void testRoundTrip() {
+ final RuleModel m = getComplexModel();
+
+ final String xml = BRXMLPersistence.getInstance().marshal( m );
+
+ final RuleModel m2 = BRXMLPersistence.getInstance().unmarshal( xml );
+ assertNotNull( m2 );
+ assertEquals( m.name,
+ m2.name );
+ assertEquals( m.lhs.length,
+ m2.lhs.length );
+ assertEquals( m.rhs.length,
+ m2.rhs.length );
+ assertEquals( 1,
+ m.attributes.length );
+
+ final RuleAttribute at = m.attributes[0];
+ assertEquals( "no-loop",
+ at.attributeName );
+ assertEquals( "true",
+ at.value );
+
+ final String newXML = BRXMLPersistence.getInstance().marshal( m2 );
+ assertEquals( xml,
+ newXML );
+
+ }
+
+ public void testCompositeConstraintsRoundTrip() throws Exception {
+ RuleModel m = new RuleModel();
+ m.name = "with composite";
+
+ FactPattern p1 = new FactPattern("Person");
+ p1.boundName = "p1";
+ m.addLhsItem( p1 );
+
+ FactPattern p = new FactPattern("Goober");
+ m.addLhsItem( p );
+ CompositeFieldConstraint comp = new CompositeFieldConstraint();
+ comp.compositeJunctionType = CompositeFieldConstraint.COMPOSITE_TYPE_OR;
+ p.addConstraint( comp );
+
+ final SingleFieldConstraint X = new SingleFieldConstraint();
+ X.fieldName = "goo";
+ X.constraintValueType = SingleFieldConstraint.TYPE_LITERAL;
+ X.value = "foo";
+ X.operator = "==";
+ X.connectives = new ConnectiveConstraint[1];
+ X.connectives[0] = new ConnectiveConstraint();
+ X.connectives[0].constraintValueType = ConnectiveConstraint.TYPE_LITERAL;
+ X.connectives[0].operator = "|| ==";
+ X.connectives[0].value = "bar";
+ comp.addConstraint( X );
+
+ final SingleFieldConstraint Y = new SingleFieldConstraint();
+ Y.fieldName = "goo2";
+ Y.constraintValueType = SingleFieldConstraint.TYPE_LITERAL;
+ Y.value = "foo";
+ Y.operator = "==";
+ comp.addConstraint( Y );
+
+ CompositeFieldConstraint comp2 = new CompositeFieldConstraint();
+ comp2.compositeJunctionType = CompositeFieldConstraint.COMPOSITE_TYPE_AND;
+ final SingleFieldConstraint Q1 = new SingleFieldConstraint();
+ Q1.fieldName = "goo";
+ Q1.operator = "==";
+ Q1.value = "whee";
+ Q1.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+
+ comp2.addConstraint( Q1 );
+
+ final SingleFieldConstraint Q2 = new SingleFieldConstraint();
+ Q2.fieldName = "gabba";
+ Q2.operator = "==";
+ Q2.value = "whee";
+ Q2.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
+
+ comp2.addConstraint( Q2 );
+
+ //now nest it
+ comp.addConstraint( comp2 );
+
+
+
+ final SingleFieldConstraint Z = new SingleFieldConstraint();
+ Z.fieldName = "goo3";
+ Z.constraintValueType = SingleFieldConstraint.TYPE_LITERAL;
+ Z.value = "foo";
+ Z.operator = "==";
+
+ p.addConstraint( Z );
+
+ ActionInsertFact ass = new ActionInsertFact("Whee");
+ m.addRhsItem( ass );
+
+
+ String xml = BRXMLPersistence.getInstance().marshal( m );
+ //System.err.println(xml);
+
+ RuleModel m2 = BRXMLPersistence.getInstance().unmarshal( xml );
+ assertNotNull(m2);
+ assertEquals("with composite", m2.name);
+
+ assertEquals(m2.lhs.length, m.lhs.length);
+ assertEquals(m2.rhs.length, m.rhs.length);
+
+
+
+
+ }
+
+ /**
+ * This will verify that we can load an old BRXML change. If this fails,
+ * then backwards compatability is broken.
+ */
+ public void testBackwardsCompat() throws Exception {
+ RuleModel m2 = BRXMLPersistence.getInstance().unmarshal( loadResource( "existing_brl.xml" ) );
+
+ assertNotNull(m2);
+ assertEquals(3, m2.rhs.length);
+ }
+
+ private String loadResource(final String name) throws Exception {
+
+ // System.err.println( getClass().getResource( name ) );
+ final InputStream in = getClass().getResourceAsStream( name );
+
+
+ final Reader reader = new InputStreamReader( in );
+
+ final StringBuffer text = new StringBuffer();
+
+ final char[] buf = new char[1024];
+ int len = 0;
+
+ while ( (len = reader.read( buf )) >= 0 ) {
+ text.append( buf,
+ 0,
+ len );
+ }
+
+ return text.toString();
+ }
+
+ private RuleModel getComplexModel() {
+ final RuleModel m = new RuleModel();
+
+ m.addAttribute( new RuleAttribute( "no-loop",
+ "true" ) );
+
+ final FactPattern pat = new FactPattern();
+ pat.boundName = "p1";
+ pat.factType = "Person";
+ final SingleFieldConstraint con = new SingleFieldConstraint();
+ con.fieldBinding = "f1";
+ con.fieldName = "age";
+ con.operator = "<";
+ con.value = "42";
+ pat.addConstraint( con );
+
+ m.addLhsItem( pat );
+
+ final CompositeFactPattern comp = new CompositeFactPattern( "not" );
+ comp.addFactPattern( new FactPattern( "Cancel" ) );
+ m.addLhsItem( comp );
+
+ final ActionUpdateField set = new ActionUpdateField();
+ set.variable = "p1";
+ set.addFieldValue( new ActionFieldValue( "status",
+ "rejected",
+ SuggestionCompletionEngine.TYPE_STRING ) );
+ m.addRhsItem( set );
+
+ final ActionRetractFact ret = new ActionRetractFact( "p1" );
+ m.addRhsItem( ret );
+
+ final DSLSentence sen = new DSLSentence();
+ sen.sentence = "Send an email to {administrator}";
+
+ m.addRhsItem( sen );
+ return m;
+ }
+
+ public void testLoadEmpty() {
+ RuleModel m = BRXMLPersistence.getInstance().unmarshal( null );
+ assertNotNull( m );
+
+ m = BRXMLPersistence.getInstance().unmarshal( "" );
+ assertNotNull( m );
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,257 +0,0 @@
-package org.drools.brms.server.util;
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
-
-public class BRXMLPersitenceTest extends TestCase {
-
- public void testGenerateEmptyXML() {
- final BRLPersistence p = BRXMLPersistence.getInstance();
- final String xml = p.marshal( new RuleModel() );
- assertNotNull( xml );
- assertFalse( xml.equals( "" ) );
-
- assertTrue( xml.startsWith( "<rule>" ) );
- assertTrue( xml.endsWith( "</rule>" ) );
- }
-
- public void testBasics() {
- final BRLPersistence p = BRXMLPersistence.getInstance();
- final RuleModel m = new RuleModel();
- m.addLhsItem( new FactPattern( "Person" ) );
- m.addLhsItem( new FactPattern( "Accident" ) );
- m.addAttribute( new RuleAttribute( "no-loop",
- "true" ) );
-
- m.addRhsItem( new ActionInsertFact( "Report" ) );
- m.name = "my rule";
- final String xml = p.marshal( m );
- //System.out.println(xml);
- assertTrue( xml.indexOf( "Person" ) > -1 );
- assertTrue( xml.indexOf( "Accident" ) > -1 );
- assertTrue( xml.indexOf( "no-loop" ) > -1 );
- assertTrue( xml.indexOf( "org.drools" ) == -1 );
-
- }
-
- public void testMoreComplexRendering() {
- final BRLPersistence p = BRXMLPersistence.getInstance();
- final RuleModel m = getComplexModel();
-
- final String xml = p.marshal( m );
- //System.out.println( xml );
-
- assertTrue( xml.indexOf( "org.drools" ) == -1 );
-
- }
-
- public void testRoundTrip() {
- final RuleModel m = getComplexModel();
-
- final String xml = BRXMLPersistence.getInstance().marshal( m );
-
- final RuleModel m2 = BRXMLPersistence.getInstance().unmarshal( xml );
- assertNotNull( m2 );
- assertEquals( m.name,
- m2.name );
- assertEquals( m.lhs.length,
- m2.lhs.length );
- assertEquals( m.rhs.length,
- m2.rhs.length );
- assertEquals( 1,
- m.attributes.length );
-
- final RuleAttribute at = m.attributes[0];
- assertEquals( "no-loop",
- at.attributeName );
- assertEquals( "true",
- at.value );
-
- final String newXML = BRXMLPersistence.getInstance().marshal( m2 );
- assertEquals( xml,
- newXML );
-
- }
-
- public void testCompositeConstraintsRoundTrip() throws Exception {
- RuleModel m = new RuleModel();
- m.name = "with composite";
-
- FactPattern p1 = new FactPattern("Person");
- p1.boundName = "p1";
- m.addLhsItem( p1 );
-
- FactPattern p = new FactPattern("Goober");
- m.addLhsItem( p );
- CompositeFieldConstraint comp = new CompositeFieldConstraint();
- comp.compositeJunctionType = CompositeFieldConstraint.COMPOSITE_TYPE_OR;
- p.addConstraint( comp );
-
- final SingleFieldConstraint X = new SingleFieldConstraint();
- X.fieldName = "goo";
- X.constraintValueType = SingleFieldConstraint.TYPE_LITERAL;
- X.value = "foo";
- X.operator = "==";
- X.connectives = new ConnectiveConstraint[1];
- X.connectives[0] = new ConnectiveConstraint();
- X.connectives[0].constraintValueType = ConnectiveConstraint.TYPE_LITERAL;
- X.connectives[0].operator = "|| ==";
- X.connectives[0].value = "bar";
- comp.addConstraint( X );
-
- final SingleFieldConstraint Y = new SingleFieldConstraint();
- Y.fieldName = "goo2";
- Y.constraintValueType = SingleFieldConstraint.TYPE_LITERAL;
- Y.value = "foo";
- Y.operator = "==";
- comp.addConstraint( Y );
-
- CompositeFieldConstraint comp2 = new CompositeFieldConstraint();
- comp2.compositeJunctionType = CompositeFieldConstraint.COMPOSITE_TYPE_AND;
- final SingleFieldConstraint Q1 = new SingleFieldConstraint();
- Q1.fieldName = "goo";
- Q1.operator = "==";
- Q1.value = "whee";
- Q1.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
-
- comp2.addConstraint( Q1 );
-
- final SingleFieldConstraint Q2 = new SingleFieldConstraint();
- Q2.fieldName = "gabba";
- Q2.operator = "==";
- Q2.value = "whee";
- Q2.constraintValueType = ISingleFieldConstraint.TYPE_LITERAL;
-
- comp2.addConstraint( Q2 );
-
- //now nest it
- comp.addConstraint( comp2 );
-
-
-
- final SingleFieldConstraint Z = new SingleFieldConstraint();
- Z.fieldName = "goo3";
- Z.constraintValueType = SingleFieldConstraint.TYPE_LITERAL;
- Z.value = "foo";
- Z.operator = "==";
-
- p.addConstraint( Z );
-
- ActionInsertFact ass = new ActionInsertFact("Whee");
- m.addRhsItem( ass );
-
-
- String xml = BRXMLPersistence.getInstance().marshal( m );
- //System.err.println(xml);
-
- RuleModel m2 = BRXMLPersistence.getInstance().unmarshal( xml );
- assertNotNull(m2);
- assertEquals("with composite", m2.name);
-
- assertEquals(m2.lhs.length, m.lhs.length);
- assertEquals(m2.rhs.length, m.rhs.length);
-
-
-
-
- }
-
- /**
- * This will verify that we can load an old BRXML change. If this fails,
- * then backwards compatability is broken.
- */
- public void testBackwardsCompat() throws Exception {
- RuleModel m2 = BRXMLPersistence.getInstance().unmarshal( loadResource( "existing_brxml.xml" ) );
-
- assertNotNull(m2);
- assertEquals(3, m2.rhs.length);
- }
-
- private String loadResource(final String name) throws Exception {
-
- // System.err.println( getClass().getResource( name ) );
- final InputStream in = getClass().getResourceAsStream( name );
-
-
- final Reader reader = new InputStreamReader( in );
-
- final StringBuffer text = new StringBuffer();
-
- final char[] buf = new char[1024];
- int len = 0;
-
- while ( (len = reader.read( buf )) >= 0 ) {
- text.append( buf,
- 0,
- len );
- }
-
- return text.toString();
- }
-
- private RuleModel getComplexModel() {
- final RuleModel m = new RuleModel();
-
- m.addAttribute( new RuleAttribute( "no-loop",
- "true" ) );
-
- final FactPattern pat = new FactPattern();
- pat.boundName = "p1";
- pat.factType = "Person";
- final SingleFieldConstraint con = new SingleFieldConstraint();
- con.fieldBinding = "f1";
- con.fieldName = "age";
- con.operator = "<";
- con.value = "42";
- pat.addConstraint( con );
-
- m.addLhsItem( pat );
-
- final CompositeFactPattern comp = new CompositeFactPattern( "not" );
- comp.addFactPattern( new FactPattern( "Cancel" ) );
- m.addLhsItem( comp );
-
- final ActionUpdateField set = new ActionUpdateField();
- set.variable = "p1";
- set.addFieldValue( new ActionFieldValue( "status",
- "rejected",
- SuggestionCompletionEngine.TYPE_STRING ) );
- m.addRhsItem( set );
-
- final ActionRetractFact ret = new ActionRetractFact( "p1" );
- m.addRhsItem( ret );
-
- final DSLSentence sen = new DSLSentence();
- sen.sentence = "Send an email to {administrator}";
-
- m.addRhsItem( sen );
- return m;
- }
-
- public void testLoadEmpty() {
- RuleModel m = BRXMLPersistence.getInstance().unmarshal( null );
- assertNotNull( m );
-
- m = BRXMLPersistence.getInstance().unmarshal( "" );
- assertNotNull( m );
- }
-
-}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brl.xml (from rev 12931, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brxml.xml)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brl.xml (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brl.xml 2007-06-28 21:20:34 UTC (rev 12938)
@@ -0,0 +1,52 @@
+<rule>
+ <modelVersion>1.0</modelVersion>
+ <attributes>
+ <attribute>
+ <attributeName>no-loop</attributeName>
+ <value>true</value>
+ </attribute>
+ </attributes>
+ <lhs>
+ <fact>
+ <constraintList>
+ <constraints>
+ <fieldConstraint>
+ <fieldBinding>f1</fieldBinding>
+ <fieldName>age</fieldName>
+ <operator><</operator>
+ <value>42</value>
+ <constraintValueType>0</constraintValueType>
+ </fieldConstraint>
+ </constraints>
+ </constraintList>
+ <factType>Person</factType>
+ <boundName>p1</boundName>
+ </fact>
+ <compositePattern>
+ <type>not</type>
+ <patterns>
+ <fact>
+ <factType>Cancel</factType>
+ </fact>
+ </patterns>
+ </compositePattern>
+ </lhs>
+ <rhs>
+ <modify>
+ <variable>p1</variable>
+ <fieldValues>
+ <fieldValue>
+ <field>status</field>
+ <value>rejected</value>
+ <type>String</type>
+ </fieldValue>
+ </fieldValues>
+ </modify>
+ <retract>
+ <variableName>p1</variableName>
+ </retract>
+ <dslSentence>
+ <sentence>Send an email to {administrator}</sentence>
+ </dslSentence>
+ </rhs>
+</rule>
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brxml.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brxml.xml 2007-06-28 21:20:07 UTC (rev 12937)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/brms/server/util/existing_brxml.xml 2007-06-28 21:20:34 UTC (rev 12938)
@@ -1,52 +0,0 @@
-<rule>
- <modelVersion>1.0</modelVersion>
- <attributes>
- <attribute>
- <attributeName>no-loop</attributeName>
- <value>true</value>
- </attribute>
- </attributes>
- <lhs>
- <fact>
- <constraintList>
- <constraints>
- <fieldConstraint>
- <fieldBinding>f1</fieldBinding>
- <fieldName>age</fieldName>
- <operator><</operator>
- <value>42</value>
- <constraintValueType>0</constraintValueType>
- </fieldConstraint>
- </constraints>
- </constraintList>
- <factType>Person</factType>
- <boundName>p1</boundName>
- </fact>
- <compositePattern>
- <type>not</type>
- <patterns>
- <fact>
- <factType>Cancel</factType>
- </fact>
- </patterns>
- </compositePattern>
- </lhs>
- <rhs>
- <modify>
- <variable>p1</variable>
- <fieldValues>
- <fieldValue>
- <field>status</field>
- <value>rejected</value>
- <type>String</type>
- </fieldValue>
- </fieldValues>
- </modify>
- <retract>
- <variableName>p1</variableName>
- </retract>
- <dslSentence>
- <sentence>Send an email to {administrator}</sentence>
- </dslSentence>
- </rhs>
-</rule>
More information about the jboss-svn-commits
mailing list