[jboss-svn-commits] JBL Code SVN: r32279 - in labs/jbossrules/trunk/drools-factconstraint/src: main/java/org/drools/factconstraint and 15 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Mar 29 13:33:18 EDT 2010


Author: baunax
Date: 2010-03-29 13:33:15 -0400 (Mon, 29 Mar 2010)
New Revision: 32279

Added:
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/ArgumentNotSetException.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/Constraint.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/DefaultConstraintImpl.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/ValidationResult.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/FieldDataProvider.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/predefined/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/predefined/DefaultFieldDataProviderImpl.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/
   labs/jbossrules/trunk/drools-factconstraint/src/main/resources/org/
   labs/jbossrules/trunk/drools-factconstraint/src/main/resources/org/drools/
   labs/jbossrules/trunk/drools-factconstraint/src/main/resources/org/drools/factconstraints/
   labs/jbossrules/trunk/drools-factconstraint/src/main/resources/org/drools/factconstraints/FactConstraints.gwt.xml
Removed:
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraint/dataprovider/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/dataprovider/predefined/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/helper/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/predefined/
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ArgumentNotSetException.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/Constraint.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/DefaultConstraintImpl.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ValidationResult.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/dataprovider/
Modified:
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/IntegerConstraint.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/NotNullConstraint.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/RangeConstraint.java
   labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/IntegerConstraintTest.java
   labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/NotNullConstraintTest.java
   labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/RangeConstraintTest.java
   labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/helper/ConstraintsConstrainerTest.java
Log:
transform this project into a gwt module. 

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/ArgumentNotSetException.java (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ArgumentNotSetException.java)
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/ArgumentNotSetException.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/ArgumentNotSetException.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -0,0 +1,16 @@
+package org.drools.factconstraints.client;
+
+/**
+ *
+ * @author esteban.aliverti at gmail.com
+ */
+public class ArgumentNotSetException extends Exception {
+
+    public ArgumentNotSetException(String message) {
+        super(message);
+    }
+
+    public ArgumentNotSetException() {
+    }
+
+}

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/Constraint.java (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/Constraint.java)
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/Constraint.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/Constraint.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -0,0 +1,23 @@
+package org.drools.factconstraints.client;
+
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ *
+ * @author esteban.aliverti at gmail.com
+ * @author baunax at gmail.com
+ */
+public interface Constraint extends Serializable {
+	public String getFactType();
+    public void setFactType(String factType);
+    public String getFieldName();
+    public void setFieldName(String fieldName);
+    public Set<String> getArgumentKeys();
+    public Object getArgumentValue(String key);
+    public void setArgumentValue(String key, String value);
+
+    public ValidationResult validate(Object value);
+    public String getVerifierRule();
+	public String getConstraintName();
+}

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/DefaultConstraintImpl.java (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/DefaultConstraintImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/DefaultConstraintImpl.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/DefaultConstraintImpl.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -0,0 +1,305 @@
+package org.drools.factconstraints.client;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ *
+ * @author esteban.aliverti at gmail.com
+ * @author baunax at gmail.com
+ */
+public abstract class DefaultConstraintImpl implements Constraint {
+	private long ruleNum = 0;
+    private String factType;
+    private String fieldName;
+    private Map<String, String> arguments = new HashMap<String, String>();
+    /*
+    private String verifierPackageTemplate = "";
+    private String verifierImportsTemplate = "";
+    private String verifierGlobalsTemplate = "";
+    private String verifierRuleNameTemplate = "";
+    private String verifierRuleWhenTemplate = "";
+    private String verifierFieldPatternTemplate = "";
+    private String verifierRestrictionPatternTemplate = "";
+    private String verifierRuleThenTemplate = "";
+    private String verifierActionTemplate = "";
+    private String verifierRuleEndTemplate = "";
+    */
+
+    public DefaultConstraintImpl() {
+
+    }
+
+    private String concatRule() {
+        StringBuilder rule = new StringBuilder();
+
+        rule.append(this.getVerifierPackagePrefixTemplate());
+        rule.append(this.getVerifierPackageTemplate());
+        rule.append(this.getVerifierPackageSufixTemplate());
+
+        rule.append(this.getVerifierImportsPrefixTemplate());
+        rule.append(this.getVerifierImportsTemplate());
+        rule.append(this.getVerifierImportsSufixTemplate());
+
+        rule.append(this.getVerifierGlobalsPrefixTemplate());
+        rule.append(this.getVerifierGlobalsTemplate());
+        rule.append(this.getVerifierGlobalsSufixTemplate());
+
+        rule.append(this.getVerifierRuleNamePrefixTemplate());
+        rule.append(this.getVerifierRuleNameTemplate());
+        rule.append(this.getVerifierRuleNameSufixTemplate());
+
+        rule.append(this.getVerifierRuleWhenTemplate());
+
+        rule.append(this.getVerifierFieldPatternPrefixTemplate());
+        rule.append(this.getVerifierFieldPatternTemplate());
+        rule.append(this.getVerifierFieldPatternSufixTemplate());
+
+        rule.append(this.getVerifierRestrictionPatternPrefixTemplate());
+        rule.append(this.getVerifierRestrictionPatternTemplate());
+        rule.append(this.getVerifierRestrictionPatternSufixTemplate());
+
+        rule.append(this.getVerifierRuleThenTemplate());
+
+        rule.append(this.getVerifierActionPrefixTemplate());
+        rule.append(this.getVerifierActionTemplate());
+        rule.append(this.getVerifierActionSufixTemplate());
+
+        rule.append(this.getVerifierRuleEndTemplate());
+        rule.append(this.getVerifierRuleEndSufixTemplate());
+
+
+        return rule.toString();
+
+    }
+
+    protected String createVerifierRuleTemplate(String ruleName, List<String> constraints, String message) {
+        if (ruleName == null) {
+            ruleName = "Constraint_rule";
+            
+        }
+        ruleName += "_" + ruleNum++; 
+        String rule = this.concatRule().replace("${ruleName}", ruleName);
+        rule = rule.replace("${factType}", this.getFactType());
+        rule = rule.replace("${fieldName}", this.getFieldName());
+        if (constraints != null && !constraints.isEmpty()) {
+            String constraintsTxt = "";
+            String delimiter = "";
+            for (String c : constraints) {
+                constraintsTxt += delimiter + c + "\n";
+                if (delimiter.equals("")) {
+                    delimiter = ",";
+                }
+            }
+            rule = rule.replace("${constraints}", constraintsTxt);
+        }
+        rule = rule.replace("${message}", (message == null || message.equals("")) ? "Invalid Value" : message);
+
+        return rule;
+    }
+
+    protected Object getMandatoryArgument(String key) throws ArgumentNotSetException {
+        if (!this.arguments.containsKey(key)) {
+            throw new ArgumentNotSetException("The argument " + key + " doesn't exist.");
+        }
+
+        Object value = this.getArgumentValue(key);
+
+        if (value == null) {
+            throw new ArgumentNotSetException("The argument " + key + " is null.");
+        }
+
+        return value;
+    }
+
+    public void setFactType(String factType) {
+        this.factType = factType;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getFactType() {
+        return factType;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public Set<String> getArgumentKeys() {
+        return this.arguments.keySet();
+    }
+
+    public Object getArgumentValue(String key) {
+        return this.arguments.get(key);
+    }
+
+    public void setArgumentValue(String key, String value) {
+        this.arguments.put(key, value);
+    }
+
+    public ValidationResult validate(Object value) {
+        ValidationResult result = new ValidationResult();
+        result.setSuccess(true);
+
+        return result;
+    }
+
+    public String getVerifierRule() {
+        return null;
+    }
+
+    public String getConstraintName() {
+    	return getClass().getName().substring(getClass().getName().lastIndexOf('.') + 1);
+    }
+    
+    /* Action */
+    protected String getVerifierActionTemplate() {
+        StringBuilder verifierActionTemplate = new StringBuilder();
+        verifierActionTemplate.append("      Map<String,String> impactedRules = new HashMap<String,String>();\n");
+//        verifierActionTemplate.append("      impactedRules.put( $restriction.getPath(), $restriction.getRuleName());\n");
+//        verifierActionTemplate.append("      impactedRules.put( $r.getPath(), $r.getName());\n");
+        verifierActionTemplate.append("      result.add(new VerifierMessage(\n");
+        verifierActionTemplate.append("                        impactedRules,\n");
+        verifierActionTemplate.append("                        Severity.ERROR,\n");
+        verifierActionTemplate.append("                        MessageType.NOT_SPECIFIED,\n");
+        verifierActionTemplate.append("                        $restriction,\n");
+        verifierActionTemplate.append("                        \"${message}\" ) );\n");
+
+//        verifierActionTemplate.append("      System.out.println(\"doubleValue= \"+$restriction.getDoubleValue());\n");
+//        verifierActionTemplate.append("      System.out.println(\"intValue= \"+$restriction.getIntValue());\n");
+
+        return verifierActionTemplate.toString();
+    }
+
+    protected String getVerifierActionPrefixTemplate() {
+        return "";
+    }
+
+    protected String getVerifierActionSufixTemplate() {
+        return "";
+    }
+
+    /* Field Pattern */
+    protected String getVerifierFieldPatternTemplate() {
+        StringBuilder verifierFieldPatternTemplate = new StringBuilder();
+        verifierFieldPatternTemplate.append("      $field :Field(\n");
+        verifierFieldPatternTemplate.append("          objectTypeName == \"${factType}\",\n");
+        verifierFieldPatternTemplate.append("          name == \"${fieldName}\"\n");
+        verifierFieldPatternTemplate.append("      )\n");
+        return verifierFieldPatternTemplate.toString();
+    }
+
+    protected String getVerifierFieldPatternPrefixTemplate() {
+        return "";
+    }
+
+    protected String getVerifierFieldPatternSufixTemplate() {
+        return "";
+    }
+
+    /* Globals*/
+    protected String getVerifierGlobalsTemplate() {
+        return "global VerifierReport result;\n";
+    }
+
+    protected String getVerifierGlobalsPrefixTemplate() {
+        return "";
+    }
+
+    protected String getVerifierGlobalsSufixTemplate() {
+        return "";
+    }
+
+    /* Imports */
+    protected String getVerifierImportsTemplate() {
+        StringBuilder verifierImportsTemplate = new StringBuilder();
+        verifierImportsTemplate.append("import org.drools.verifier.components.*;\n");
+        verifierImportsTemplate.append("import java.util.Map;\n");
+        verifierImportsTemplate.append("import java.util.HashMap;\n");
+        verifierImportsTemplate.append("import org.drools.verifier.report.components.VerifierMessage;\n");
+        verifierImportsTemplate.append("import org.drools.verifier.data.VerifierReport;\n");
+        verifierImportsTemplate.append("import org.drools.verifier.report.components.Severity;\n");
+        verifierImportsTemplate.append("import org.drools.verifier.report.components.MessageType;\n");
+
+        return verifierImportsTemplate.toString();
+
+    }
+
+    protected String getVerifierImportsPrefixTemplate() {
+        return "";
+    }
+
+    protected String getVerifierImportsSufixTemplate() {
+        return "";
+    }
+
+    protected String getVerifierPackageTemplate() {
+        return "package org.drools.verifier.consequence\n";
+    }
+
+    protected String getVerifierPackagePrefixTemplate() {
+        return "";
+    }
+
+    protected String getVerifierPackageSufixTemplate() {
+        return "";
+    }
+
+    /* Restriction Pattern */
+    protected String getVerifierRestrictionPatternTemplate() {
+        StringBuilder verifierRestrictionPatternTemplate = new StringBuilder();
+        verifierRestrictionPatternTemplate.append("      $restriction :LiteralRestriction(\n");
+        verifierRestrictionPatternTemplate.append("            fieldPath == $field.path,\n");
+        verifierRestrictionPatternTemplate.append("            ${constraints}\n");
+        verifierRestrictionPatternTemplate.append("      )\n");
+        
+        return verifierRestrictionPatternTemplate.toString();
+    }
+
+    protected String getVerifierRestrictionPatternPrefixTemplate() {
+        return "";
+    }
+
+    protected String getVerifierRestrictionPatternSufixTemplate() {
+        return "";
+    }
+
+    /* end */
+    protected String getVerifierRuleEndTemplate() {
+        return "end\n";
+    }
+
+    protected String getVerifierRuleEndSufixTemplate() {
+        return "";
+    }
+
+    /* Rule Name */
+    protected String getVerifierRuleNameTemplate() {
+        return "rule \"${ruleName}\"\n";
+    }
+
+    protected String getVerifierRuleNamePrefixTemplate() {
+        return "";
+    }
+
+    protected String getVerifierRuleNameSufixTemplate() {
+        return "";
+    }
+
+    /* then */
+    protected String getVerifierRuleThenTemplate() {
+        return "  then\n";
+    }
+
+    /* when */
+    protected String getVerifierRuleWhenTemplate() {
+        return "  when\n";
+    }
+
+    
+}

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/ValidationResult.java (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ValidationResult.java)
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/ValidationResult.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/ValidationResult.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -0,0 +1,30 @@
+package org.drools.factconstraints.client;
+
+/**
+ *
+ * @author esteban.aliverti at gmail.com
+ */
+public class ValidationResult {
+    private boolean success;
+    private String message;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    
+
+    
+}

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/FieldDataProvider.java (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/dataprovider/FieldDataProvider.java)
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/FieldDataProvider.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/FieldDataProvider.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -0,0 +1,19 @@
+package org.drools.factconstraints.client.dataprovider;
+
+import java.util.Map;
+
+/**
+ *
+ * @author esteban.aliverti at gmail.com
+ */
+public interface FieldDataProvider {
+    public void setFactTYpe(String factType);
+    public void setFieldName(String fieldName);
+    
+    public String[] getArgumentKeys();
+    public Object getArgumentValue(String key);
+    public void setArgumentValue(String key, Object value);
+
+    public Map<Object,String> getData();
+    public Object getDefault();
+}

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/predefined (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/dataprovider/predefined)

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/predefined/DefaultFieldDataProviderImpl.java (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/dataprovider/DefaultFieldDataProviderImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/predefined/DefaultFieldDataProviderImpl.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/dataprovider/predefined/DefaultFieldDataProviderImpl.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -0,0 +1,65 @@
+package org.drools.factconstraints.client.dataprovider.predefined;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.drools.factconstraints.client.ArgumentNotSetException;
+import org.drools.factconstraints.client.dataprovider.FieldDataProvider;
+
+/**
+ *
+ * @author esteban.aliverti at gmail.com
+ */
+public abstract class DefaultFieldDataProviderImpl implements FieldDataProvider {
+
+    private String factType;
+    private String fieldName;
+    private Map<String, Object> arguments = new HashMap<String, Object>();
+
+    public DefaultFieldDataProviderImpl() {
+
+    }
+
+    protected Object getMandatoryArgument(String key) throws ArgumentNotSetException {
+        if (!this.arguments.containsKey(key)) {
+            throw new ArgumentNotSetException("The argument " + key + " doesn't exist.");
+        }
+
+        Object value = this.getArgumentValue(key);
+
+        if (value == null) {
+            throw new ArgumentNotSetException("The argument " + key + " is null.");
+        }
+
+        return value;
+    }
+
+    public void setFactType(String factType) {
+        this.factType = factType;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getFactType() {
+        return factType;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public String[] getArgumentKeys() {
+        return this.arguments.keySet().toArray(new String[this.arguments.size()]);
+    }
+
+    public Object getArgumentValue(String key) {
+        return this.arguments.get(key);
+    }
+
+    public void setArgumentValue(String key, Object value) {
+        this.arguments.put(key, value);
+    }
+
+}

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/helper)

Deleted: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/helper/ConstraintsContainer.java	2010-03-26 16:27:46 UTC (rev 32246)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -1,63 +0,0 @@
-package org.drools.guvnor.client.factconstraints.helper;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.drools.guvnor.client.factcontraints.Constraint;
-
-public class ConstraintsContainer {
-	Map<String, List<Constraint>> constraints = new HashMap<String, List<Constraint>>();
-	
-	public ConstraintsContainer(Constraint[] constraints) {
-		this(Arrays.asList(constraints));
-	}
-	
-	public ConstraintsContainer(Collection<Constraint> constraints) {
-		if (constraints != null && !constraints.isEmpty()) {
-			for (Constraint c : constraints) {
-				addConstraint(c);
-			}
-		}
-	}
-
-	public ConstraintsContainer() {
-		
-	}
-	
-	public  void addConstraint(Constraint c) {
-		List<Constraint> list = constraints.get(c.getFactType());
-		if (list == null) {
-			list = new LinkedList<Constraint>();
-			constraints.put(c.getFactType(), list);
-		}
-		list.add(c);
-	}
-
-	public List<Constraint> getConstraints(String factType) {
-		return Collections.unmodifiableList(constraints.get(factType));
-	}
-	
-	public List<Constraint> getConstraints(String factType, String fieldName) {
-		
-		List<Constraint> list = constraints.get(factType);
-		if (list == null || list.isEmpty()) {
-			return Collections.emptyList();
-		}
-		List<Constraint> res = new LinkedList<Constraint>();
-		for (Constraint c : list) {
-			if (fieldName.equals(c.getFieldName())) {
-				res.add(c);
-			}
-		} 
-		return res;
-	}
-	
-	public boolean hasConstraints(String FactType) {
-		return constraints.containsKey(FactType);
-	}
-}

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java (from rev 32249, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/helper/ConstraintsContainer.java)
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -0,0 +1,70 @@
+package org.drools.factconstraints.client.helper;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.factconstraints.client.Constraint;
+
+public class ConstraintsContainer {
+	Map<String, List<Constraint>> constraints = new HashMap<String, List<Constraint>>();
+	
+	public ConstraintsContainer(Constraint[] constraints) {
+		this(Arrays.asList(constraints));
+	}
+	
+	public ConstraintsContainer(Collection<Constraint> constraints) {
+		if (constraints != null && !constraints.isEmpty()) {
+			for (Constraint c : constraints) {
+				addConstraint(c);
+			}
+		}
+	}
+
+	public ConstraintsContainer() {
+		
+	}
+	
+	public void removeConstraint(Constraint c) {
+		List<Constraint> list = constraints.get(c.getFactType());
+		if (list != null) {
+			list.remove(c);
+		}
+	}
+	
+	public void addConstraint(Constraint c) {
+		List<Constraint> list = constraints.get(c.getFactType());
+		if (list == null) {
+			list = new LinkedList<Constraint>();
+			constraints.put(c.getFactType(), list);
+		}
+		list.add(c);
+	}
+
+	public List<Constraint> getConstraints(String factType) {
+		return Collections.unmodifiableList(constraints.get(factType));
+	}
+	
+	public List<Constraint> getConstraints(String factType, String fieldName) {
+		
+		List<Constraint> list = constraints.get(factType);
+		if (list == null || list.isEmpty()) {
+			return Collections.emptyList();
+		}
+		List<Constraint> res = new LinkedList<Constraint>();
+		for (Constraint c : list) {
+			if (fieldName.equals(c.getFieldName())) {
+				res.add(c);
+			}
+		} 
+		return res;
+	}
+	
+	public boolean hasConstraints(String FactType) {
+		return constraints.containsKey(FactType);
+	}
+}

Copied: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined (from rev 32246, labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/predefined)

Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/IntegerConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/predefined/IntegerConstraint.java	2010-03-26 16:27:46 UTC (rev 32246)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/IntegerConstraint.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -1,10 +1,10 @@
-package org.drools.guvnor.client.factconstraints.predefined;
+package org.drools.factconstraints.client.predefined;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.drools.guvnor.client.factcontraints.DefaultConstraintImpl;
-import org.drools.guvnor.client.factcontraints.ValidationResult;
+import org.drools.factconstraints.client.DefaultConstraintImpl;
+import org.drools.factconstraints.client.ValidationResult;
 
 /**
  *

Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/NotNullConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/predefined/NotNullConstraint.java	2010-03-26 16:27:46 UTC (rev 32246)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/NotNullConstraint.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -1,10 +1,10 @@
-package org.drools.guvnor.client.factconstraints.predefined;
+package org.drools.factconstraints.client.predefined;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.drools.guvnor.client.factcontraints.DefaultConstraintImpl;
-import org.drools.guvnor.client.factcontraints.ValidationResult;
+import org.drools.factconstraints.client.DefaultConstraintImpl;
+import org.drools.factconstraints.client.ValidationResult;
 
 /**
  *

Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/RangeConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factconstraints/predefined/RangeConstraint.java	2010-03-26 16:27:46 UTC (rev 32246)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/predefined/RangeConstraint.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -1,8 +1,8 @@
-package org.drools.guvnor.client.factconstraints.predefined;
+package org.drools.factconstraints.client.predefined;
 
-import org.drools.guvnor.client.factcontraints.ArgumentNotSetException;
-import org.drools.guvnor.client.factcontraints.DefaultConstraintImpl;
-import org.drools.guvnor.client.factcontraints.ValidationResult;
+import org.drools.factconstraints.client.ArgumentNotSetException;
+import org.drools.factconstraints.client.DefaultConstraintImpl;
+import org.drools.factconstraints.client.ValidationResult;
 
 /**
  *

Deleted: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ArgumentNotSetException.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ArgumentNotSetException.java	2010-03-29 15:41:57 UTC (rev 32278)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ArgumentNotSetException.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -1,16 +0,0 @@
-package org.drools.guvnor.client.factcontraints;
-
-/**
- *
- * @author esteban.aliverti at gmail.com
- */
-public class ArgumentNotSetException extends Exception {
-
-    public ArgumentNotSetException(String message) {
-        super(message);
-    }
-
-    public ArgumentNotSetException() {
-    }
-
-}

Deleted: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/Constraint.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/Constraint.java	2010-03-29 15:41:57 UTC (rev 32278)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/Constraint.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -1,23 +0,0 @@
-package org.drools.guvnor.client.factcontraints;
-
-import java.io.Serializable;
-import java.util.Set;
-
-/**
- *
- * @author esteban.aliverti at gmail.com
- * @author baunax at gmail.com
- */
-public interface Constraint extends Serializable {
-	public String getFactType();
-    public void setFactType(String factType);
-    public String getFieldName();
-    public void setFieldName(String fieldName);
-    public Set<String> getArgumentKeys();
-    public Object getArgumentValue(String key);
-    public void setArgumentValue(String key, String value);
-
-    public ValidationResult validate(Object value);
-    public String getVerifierRule();
-	public String getConstraintName();
-}

Deleted: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/DefaultConstraintImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/DefaultConstraintImpl.java	2010-03-29 15:41:57 UTC (rev 32278)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/DefaultConstraintImpl.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -1,305 +0,0 @@
-package org.drools.guvnor.client.factcontraints;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- *
- * @author esteban.aliverti at gmail.com
- * @author baunax at gmail.com
- */
-public abstract class DefaultConstraintImpl implements Constraint {
-	private long ruleNum = 0;
-    private String factType;
-    private String fieldName;
-    private Map<String, String> arguments = new HashMap<String, String>();
-    /*
-    private String verifierPackageTemplate = "";
-    private String verifierImportsTemplate = "";
-    private String verifierGlobalsTemplate = "";
-    private String verifierRuleNameTemplate = "";
-    private String verifierRuleWhenTemplate = "";
-    private String verifierFieldPatternTemplate = "";
-    private String verifierRestrictionPatternTemplate = "";
-    private String verifierRuleThenTemplate = "";
-    private String verifierActionTemplate = "";
-    private String verifierRuleEndTemplate = "";
-    */
-
-    public DefaultConstraintImpl() {
-
-    }
-
-    private String concatRule() {
-        StringBuilder rule = new StringBuilder();
-
-        rule.append(this.getVerifierPackagePrefixTemplate());
-        rule.append(this.getVerifierPackageTemplate());
-        rule.append(this.getVerifierPackageSufixTemplate());
-
-        rule.append(this.getVerifierImportsPrefixTemplate());
-        rule.append(this.getVerifierImportsTemplate());
-        rule.append(this.getVerifierImportsSufixTemplate());
-
-        rule.append(this.getVerifierGlobalsPrefixTemplate());
-        rule.append(this.getVerifierGlobalsTemplate());
-        rule.append(this.getVerifierGlobalsSufixTemplate());
-
-        rule.append(this.getVerifierRuleNamePrefixTemplate());
-        rule.append(this.getVerifierRuleNameTemplate());
-        rule.append(this.getVerifierRuleNameSufixTemplate());
-
-        rule.append(this.getVerifierRuleWhenTemplate());
-
-        rule.append(this.getVerifierFieldPatternPrefixTemplate());
-        rule.append(this.getVerifierFieldPatternTemplate());
-        rule.append(this.getVerifierFieldPatternSufixTemplate());
-
-        rule.append(this.getVerifierRestrictionPatternPrefixTemplate());
-        rule.append(this.getVerifierRestrictionPatternTemplate());
-        rule.append(this.getVerifierRestrictionPatternSufixTemplate());
-
-        rule.append(this.getVerifierRuleThenTemplate());
-
-        rule.append(this.getVerifierActionPrefixTemplate());
-        rule.append(this.getVerifierActionTemplate());
-        rule.append(this.getVerifierActionSufixTemplate());
-
-        rule.append(this.getVerifierRuleEndTemplate());
-        rule.append(this.getVerifierRuleEndSufixTemplate());
-
-
-        return rule.toString();
-
-    }
-
-    protected String createVerifierRuleTemplate(String ruleName, List<String> constraints, String message) {
-        if (ruleName == null) {
-            ruleName = "Constraint_rule";
-            
-        }
-        ruleName += "_" + ruleNum++; 
-        String rule = this.concatRule().replace("${ruleName}", ruleName);
-        rule = rule.replace("${factType}", this.getFactType());
-        rule = rule.replace("${fieldName}", this.getFieldName());
-        if (constraints != null && !constraints.isEmpty()) {
-            String constraintsTxt = "";
-            String delimiter = "";
-            for (String c : constraints) {
-                constraintsTxt += delimiter + c + "\n";
-                if (delimiter.equals("")) {
-                    delimiter = ",";
-                }
-            }
-            rule = rule.replace("${constraints}", constraintsTxt);
-        }
-        rule = rule.replace("${message}", (message == null || message.equals("")) ? "Invalid Value" : message);
-
-        return rule;
-    }
-
-    protected Object getMandatoryArgument(String key) throws ArgumentNotSetException {
-        if (!this.arguments.containsKey(key)) {
-            throw new ArgumentNotSetException("The argument " + key + " doesn't exist.");
-        }
-
-        Object value = this.getArgumentValue(key);
-
-        if (value == null) {
-            throw new ArgumentNotSetException("The argument " + key + " is null.");
-        }
-
-        return value;
-    }
-
-    public void setFactType(String factType) {
-        this.factType = factType;
-    }
-
-    public void setFieldName(String fieldName) {
-        this.fieldName = fieldName;
-    }
-
-    public String getFactType() {
-        return factType;
-    }
-
-    public String getFieldName() {
-        return fieldName;
-    }
-
-    public Set<String> getArgumentKeys() {
-        return this.arguments.keySet();
-    }
-
-    public Object getArgumentValue(String key) {
-        return this.arguments.get(key);
-    }
-
-    public void setArgumentValue(String key, String value) {
-        this.arguments.put(key, value);
-    }
-
-    public ValidationResult validate(Object value) {
-        ValidationResult result = new ValidationResult();
-        result.setSuccess(true);
-
-        return result;
-    }
-
-    public String getVerifierRule() {
-        return null;
-    }
-
-    public String getConstraintName() {
-    	return getClass().getName().substring(getClass().getName().lastIndexOf('.') + 1);
-    }
-    
-    /* Action */
-    protected String getVerifierActionTemplate() {
-        StringBuilder verifierActionTemplate = new StringBuilder();
-        verifierActionTemplate.append("      Map<String,String> impactedRules = new HashMap<String,String>();\n");
-//        verifierActionTemplate.append("      impactedRules.put( $restriction.getPath(), $restriction.getRuleName());\n");
-//        verifierActionTemplate.append("      impactedRules.put( $r.getPath(), $r.getName());\n");
-        verifierActionTemplate.append("      result.add(new VerifierMessage(\n");
-        verifierActionTemplate.append("                        impactedRules,\n");
-        verifierActionTemplate.append("                        Severity.ERROR,\n");
-        verifierActionTemplate.append("                        MessageType.NOT_SPECIFIED,\n");
-        verifierActionTemplate.append("                        $restriction,\n");
-        verifierActionTemplate.append("                        \"${message}\" ) );\n");
-
-//        verifierActionTemplate.append("      System.out.println(\"doubleValue= \"+$restriction.getDoubleValue());\n");
-//        verifierActionTemplate.append("      System.out.println(\"intValue= \"+$restriction.getIntValue());\n");
-
-        return verifierActionTemplate.toString();
-    }
-
-    protected String getVerifierActionPrefixTemplate() {
-        return "";
-    }
-
-    protected String getVerifierActionSufixTemplate() {
-        return "";
-    }
-
-    /* Field Pattern */
-    protected String getVerifierFieldPatternTemplate() {
-        StringBuilder verifierFieldPatternTemplate = new StringBuilder();
-        verifierFieldPatternTemplate.append("      $field :Field(\n");
-        verifierFieldPatternTemplate.append("          objectTypeName == \"${factType}\",\n");
-        verifierFieldPatternTemplate.append("          name == \"${fieldName}\"\n");
-        verifierFieldPatternTemplate.append("      )\n");
-        return verifierFieldPatternTemplate.toString();
-    }
-
-    protected String getVerifierFieldPatternPrefixTemplate() {
-        return "";
-    }
-
-    protected String getVerifierFieldPatternSufixTemplate() {
-        return "";
-    }
-
-    /* Globals*/
-    protected String getVerifierGlobalsTemplate() {
-        return "global VerifierReport result;\n";
-    }
-
-    protected String getVerifierGlobalsPrefixTemplate() {
-        return "";
-    }
-
-    protected String getVerifierGlobalsSufixTemplate() {
-        return "";
-    }
-
-    /* Imports */
-    protected String getVerifierImportsTemplate() {
-        StringBuilder verifierImportsTemplate = new StringBuilder();
-        verifierImportsTemplate.append("import org.drools.verifier.components.*;\n");
-        verifierImportsTemplate.append("import java.util.Map;\n");
-        verifierImportsTemplate.append("import java.util.HashMap;\n");
-        verifierImportsTemplate.append("import org.drools.verifier.report.components.VerifierMessage;\n");
-        verifierImportsTemplate.append("import org.drools.verifier.data.VerifierReport;\n");
-        verifierImportsTemplate.append("import org.drools.verifier.report.components.Severity;\n");
-        verifierImportsTemplate.append("import org.drools.verifier.report.components.MessageType;\n");
-
-        return verifierImportsTemplate.toString();
-
-    }
-
-    protected String getVerifierImportsPrefixTemplate() {
-        return "";
-    }
-
-    protected String getVerifierImportsSufixTemplate() {
-        return "";
-    }
-
-    protected String getVerifierPackageTemplate() {
-        return "package org.drools.verifier.consequence\n";
-    }
-
-    protected String getVerifierPackagePrefixTemplate() {
-        return "";
-    }
-
-    protected String getVerifierPackageSufixTemplate() {
-        return "";
-    }
-
-    /* Restriction Pattern */
-    protected String getVerifierRestrictionPatternTemplate() {
-        StringBuilder verifierRestrictionPatternTemplate = new StringBuilder();
-        verifierRestrictionPatternTemplate.append("      $restriction :LiteralRestriction(\n");
-        verifierRestrictionPatternTemplate.append("            fieldPath == $field.path,\n");
-        verifierRestrictionPatternTemplate.append("            ${constraints}\n");
-        verifierRestrictionPatternTemplate.append("      )\n");
-        
-        return verifierRestrictionPatternTemplate.toString();
-    }
-
-    protected String getVerifierRestrictionPatternPrefixTemplate() {
-        return "";
-    }
-
-    protected String getVerifierRestrictionPatternSufixTemplate() {
-        return "";
-    }
-
-    /* end */
-    protected String getVerifierRuleEndTemplate() {
-        return "end\n";
-    }
-
-    protected String getVerifierRuleEndSufixTemplate() {
-        return "";
-    }
-
-    /* Rule Name */
-    protected String getVerifierRuleNameTemplate() {
-        return "rule \"${ruleName}\"\n";
-    }
-
-    protected String getVerifierRuleNamePrefixTemplate() {
-        return "";
-    }
-
-    protected String getVerifierRuleNameSufixTemplate() {
-        return "";
-    }
-
-    /* then */
-    protected String getVerifierRuleThenTemplate() {
-        return "  then\n";
-    }
-
-    /* when */
-    protected String getVerifierRuleWhenTemplate() {
-        return "  when\n";
-    }
-
-    
-}

Deleted: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ValidationResult.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ValidationResult.java	2010-03-29 15:41:57 UTC (rev 32278)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/guvnor/client/factcontraints/ValidationResult.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -1,30 +0,0 @@
-package org.drools.guvnor.client.factcontraints;
-
-/**
- *
- * @author esteban.aliverti at gmail.com
- */
-public class ValidationResult {
-    private boolean success;
-    private String message;
-
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    
-
-    
-}

Added: labs/jbossrules/trunk/drools-factconstraint/src/main/resources/org/drools/factconstraints/FactConstraints.gwt.xml
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/resources/org/drools/factconstraints/FactConstraints.gwt.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/resources/org/drools/factconstraints/FactConstraints.gwt.xml	2010-03-29 17:33:15 UTC (rev 32279)
@@ -0,0 +1,3 @@
+<module>
+	<set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" />
+</module>


Property changes on: labs/jbossrules/trunk/drools-factconstraint/src/main/resources/org/drools/factconstraints/FactConstraints.gwt.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/IntegerConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/IntegerConstraintTest.java	2010-03-29 15:41:57 UTC (rev 32278)
+++ labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/IntegerConstraintTest.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -3,9 +3,9 @@
 import java.util.Collection;
 
 import org.drools.builder.ResourceType;
-import org.drools.guvnor.client.factconstraints.predefined.IntegerConstraint;
-import org.drools.guvnor.client.factcontraints.Constraint;
-import org.drools.guvnor.client.factcontraints.ValidationResult;
+import org.drools.factconstraints.client.Constraint;
+import org.drools.factconstraints.client.ValidationResult;
+import org.drools.factconstraints.client.predefined.IntegerConstraint;
 import org.drools.io.ResourceFactory;
 import org.drools.verifier.Verifier;
 import org.drools.verifier.VerifierConfiguration;

Modified: labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/NotNullConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/NotNullConstraintTest.java	2010-03-29 15:41:57 UTC (rev 32278)
+++ labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/NotNullConstraintTest.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -2,9 +2,9 @@
 
 import java.util.Collection;
 import org.drools.builder.ResourceType;
-import org.drools.guvnor.client.factconstraints.predefined.NotNullConstraint;
-import org.drools.guvnor.client.factcontraints.Constraint;
-import org.drools.guvnor.client.factcontraints.ValidationResult;
+import org.drools.factconstraints.client.Constraint;
+import org.drools.factconstraints.client.ValidationResult;
+import org.drools.factconstraints.client.predefined.NotNullConstraint;
 import org.drools.io.ResourceFactory;
 import org.drools.verifier.Verifier;
 import org.drools.verifier.VerifierConfiguration;

Modified: labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/RangeConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/RangeConstraintTest.java	2010-03-29 15:41:57 UTC (rev 32278)
+++ labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/RangeConstraintTest.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -2,9 +2,9 @@
 
 import java.util.Collection;
 import org.drools.builder.ResourceType;
-import org.drools.guvnor.client.factconstraints.predefined.RangeConstraint;
-import org.drools.guvnor.client.factcontraints.Constraint;
-import org.drools.guvnor.client.factcontraints.ValidationResult;
+import org.drools.factconstraints.client.Constraint;
+import org.drools.factconstraints.client.ValidationResult;
+import org.drools.factconstraints.client.predefined.RangeConstraint;
 import org.drools.io.ResourceFactory;
 import org.drools.verifier.Verifier;
 import org.drools.verifier.VerifierConfiguration;

Modified: labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/helper/ConstraintsConstrainerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/helper/ConstraintsConstrainerTest.java	2010-03-29 15:41:57 UTC (rev 32278)
+++ labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraint/helper/ConstraintsConstrainerTest.java	2010-03-29 17:33:15 UTC (rev 32279)
@@ -2,10 +2,10 @@
 
 import java.util.LinkedList;
 
-import org.drools.guvnor.client.factconstraints.helper.ConstraintsContainer;
-import org.drools.guvnor.client.factconstraints.predefined.IntegerConstraint;
-import org.drools.guvnor.client.factconstraints.predefined.NotNullConstraint;
-import org.drools.guvnor.client.factcontraints.Constraint;
+import org.drools.factconstraints.client.Constraint;
+import org.drools.factconstraints.client.helper.ConstraintsContainer;
+import org.drools.factconstraints.client.predefined.IntegerConstraint;
+import org.drools.factconstraints.client.predefined.NotNullConstraint;
 
 import static org.junit.Assert.*;
 import org.junit.Test;



More information about the jboss-svn-commits mailing list