[jboss-svn-commits] JBL Code SVN: r32218 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util.

[jboss-svn-commits at lists.jboss.org]

Author: baunax
Date: 2010-03-25 15:36:48 -0400 (Thu, 25 Mar 2010)
New Revision: 32218

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
Log:
merge with https://svn.jboss.org/repos/labs/labs/jbossrules/branches/factsConstraints_baunax_esteban
- Added drools-factconstraint module to hosts constraints for facts' fields.
- Added 3 constraint impls  as an example.
- Added new WorkingSet Asset for configuring valid Facts and constraints over its fields.

Guvnor: 
- Show components as read-only for Facts not contained inside active WorkingSets.
- Use constraint rules during rule verification.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java	2010-03-25 19:26:29 UTC (rev 32217)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/VerifierRunner.java	2010-03-25 19:36:48 UTC (rev 32218)
@@ -1,6 +1,7 @@
 package org.drools.guvnor.server.util;
 
 import java.io.StringReader;
+import java.util.Collection;
 
 import org.drools.builder.ResourceType;
 import org.drools.guvnor.client.common.AssetFormats;
@@ -24,11 +25,15 @@
     private Verifier    verifier;
     private PackageItem packageItem;
 
-    public AnalysisReport verify(String drl,
-                                 String scope) {
+	public AnalysisReport verify(String drl, String scope) {
+		return verify(drl, scope, null);
+	}
 
-        initVerifier( scope );
+	public AnalysisReport verify(String drl, String scope,
+			Collection<String> additionalVerifierRules) {
 
+        initVerifier( scope, additionalVerifierRules );
+
         verifier.addResourcesToVerify( ResourceFactory.newReaderResource( new StringReader( drl ) ),
                                        ResourceType.DRL );
         verifier.fireAnalysis();
@@ -38,10 +43,10 @@
     }
 
     public AnalysisReport verify(PackageItem packageItem,
-                                 String scope) {
+                                 String scope, Collection<String> additionalVerifierRules) {
         this.packageItem = packageItem;
 
-        initVerifier( scope );
+        initVerifier( scope, additionalVerifierRules );
 
         addHeaderToVerifier();
 
@@ -66,11 +71,18 @@
         return VerifierReportCreator.doReport( report );
     }
 
-    private void initVerifier(String scope) {
+    private void initVerifier(String scope, Collection<String> additionalVerifierRules) {
         VerifierConfiguration conf = new DefaultVerifierConfiguration();
         conf.getVerifyingScopes().clear();
         conf.getVerifyingScopes().add( scope );
         conf.setAcceptRulesWithoutVerifiyingScope( true );
+		if (additionalVerifierRules != null) {
+			for (String rule : additionalVerifierRules) {
+				conf.getVerifyingResources().put(
+						ResourceFactory.newByteArrayResource(rule.getBytes()),
+						ResourceType.DRL);
+			}
+		}
         verifier = VerifierBuilderFactory.newVerifierBuilder().newVerifier( conf );
     }