[jboss-svn-commits] JBL Code SVN: r33746 - in labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier: components and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 6 08:31:57 EDT 2010
Author: Rikkola
Date: 2010-07-06 08:31:56 -0400 (Tue, 06 Jul 2010)
New Revision: 33746
Modified:
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/builder/VerifierImpl.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/EntryPoint.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Field.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Import.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/ObjectType.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/PackageComponent.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Pattern.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/PatternComponent.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Restriction.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RuleComponent.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RulePackage.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/SubPattern.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/SubRule.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/TextConsequence.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/VerifierComponentType.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/VerifierRule.java
labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/WorkingMemory.java
Log:
verifier paths to looks like xpaths
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/builder/VerifierImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/builder/VerifierImpl.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/builder/VerifierImpl.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -9,13 +9,6 @@
import org.drools.builder.KnowledgeBuilderError;
import org.drools.builder.ResourceType;
import org.drools.compiler.PackageBuilderErrors;
-import org.drools.event.rule.ActivationCancelledEvent;
-import org.drools.event.rule.ActivationCreatedEvent;
-import org.drools.event.rule.AfterActivationFiredEvent;
-import org.drools.event.rule.AgendaEventListener;
-import org.drools.event.rule.AgendaGroupPoppedEvent;
-import org.drools.event.rule.AgendaGroupPushedEvent;
-import org.drools.event.rule.BeforeActivationFiredEvent;
import org.drools.io.Resource;
import org.drools.lang.descr.PackageDescr;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -25,6 +18,7 @@
import org.drools.verifier.VerifierError;
import org.drools.verifier.components.RulePackage;
import org.drools.verifier.components.VerifierRule;
+import org.drools.verifier.data.VerifierComponent;
import org.drools.verifier.data.VerifierReport;
import org.drools.verifier.data.VerifierReportFactory;
import org.drools.verifier.misc.DrlPackageParser;
@@ -122,8 +116,8 @@
}
}
- for ( Object o : result.getVerifierData().getAll() ) {
- ksession.insert( o );
+ for ( Object object : result.getVerifierData().getAll() ) {
+ ksession.insert( object );
}
// Object that returns the results.
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/EntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/EntryPoint.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/EntryPoint.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -10,7 +10,7 @@
@Override
public String getPath() {
- return String.format( "source[type=%s entryPointName=%s]",
+ return String.format( "source[@type=%s @entryPointName=%s]",
getVerifierComponentType().getType(),
getEntryPointName() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Field.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Field.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Field.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -28,7 +28,7 @@
@Override
public String getPath() {
- return String.format( "%s.field[name=%s]",
+ return String.format( "%s/field[@name='%s']",
getObjectTypePath(),
getName() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Import.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Import.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Import.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -15,7 +15,7 @@
@Override
public String getPath() {
- return String.format( "%s.import[name=%s]",
+ return String.format( "%s/import[@name='%s']",
getPackagePath(),
getName() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/ObjectType.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/ObjectType.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/ObjectType.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -34,7 +34,7 @@
@Override
public String getPath() {
- return String.format( "objectType[name=%s]",
+ return String.format( "objectType[@name='%s']",
getName() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/PackageComponent.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/PackageComponent.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/PackageComponent.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -27,7 +27,7 @@
}
public String getPackagePath() {
- return String.format( "package[name=%s]",
+ return String.format( "package[@name='%s']",
getPackageName() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Pattern.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Pattern.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Pattern.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -30,13 +30,15 @@
String parentPath = getParentPath();
if ( parentPath == null ) {
- return String.format( "%s.pattern[%s]",
+ return String.format( "%s/ruleComponent[@type=%s @orderNumber=%s]",
getRulePath(),
+ getVerifierComponentType().getType(),
getOrderNumber() );
} else {
- return String.format( "%s.pattern[%s]",
+ return String.format( "%s/ruleComponent[@type=%s @orderNumber=%s]",
getParentPath(),
+ getVerifierComponentType().getType(),
getOrderNumber() );
}
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/PatternComponent.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/PatternComponent.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/PatternComponent.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -25,14 +25,15 @@
}
public String getPatternPath() {
- return String.format( "%s.pattern[%s]",
+ return String.format( "%s/ruleComponent[@type=%s @orderNumber=%s]",
getRulePath(),
+ VerifierComponentType.PATTERN.getType(),
patternOrderNumber );
}
@Override
public String getPath() {
- return String.format( "%s.patternComponent[%s]",
+ return String.format( "%s/patternComponent[%s]",
getPatternPath(),
getOrderNumber() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Restriction.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Restriction.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/Restriction.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -41,7 +41,7 @@
@Override
public String getPath() {
- return String.format( "%s.restriction[%s]",
+ return String.format( "%s/restriction[%s]",
getParentPath(),
getOrderNumber() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RuleComponent.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RuleComponent.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RuleComponent.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -31,7 +31,7 @@
* @return Rule package name + rule name.
*/
public String getFullRulePath() {
- return getPackageName() + "." + getRuleName();
+ return getPackageName() + "/" + getRuleName();
}
public String getRuleName() {
@@ -43,14 +43,14 @@
}
public String getRulePath() {
- return String.format( "%s.rule[name=%s]",
+ return String.format( "%s/rule[@name='%s']",
getPackagePath(),
getRuleName() );
}
@Override
public String getPath() {
- return String.format( "%s.ruleComponent[%s]",
+ return String.format( "%s/ruleComponent[%s]",
getRulePath(),
getOrderNumber() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RulePackage.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RulePackage.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/RulePackage.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -30,7 +30,7 @@
@Override
public String getPath() {
- return String.format( "package[name=%s]",
+ return String.format( "package[@name=%s]",
getName() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/SubPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/SubPattern.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/SubPattern.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -29,7 +29,7 @@
@Override
public String getPath() {
- return String.format( "%s.subPattern[%s]",
+ return String.format( "%s/subPattern[%s]",
getPatternPath(),
getOrderNumber() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/SubRule.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/SubRule.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/SubRule.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -33,7 +33,7 @@
@Override
public String getPath() {
- return String.format( "%s.subRule[%s]",
+ return String.format( "%s/subRule[%s]",
getRulePath(),
getOrderNumber() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/TextConsequence.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/TextConsequence.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/TextConsequence.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -12,7 +12,7 @@
@Override
public String getPath() {
- return getRulePath() + ".consequence";
+ return getRulePath() + "/consequence";
}
public ConsequenceType getConsequenceType() {
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/VerifierComponentType.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/VerifierComponentType.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/VerifierComponentType.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -7,34 +7,34 @@
public class VerifierComponentType
implements
Comparable<VerifierComponentType> {
- public static final VerifierComponentType UNKNOWN = new VerifierComponentType( "UNKNOWN" );
- public static final VerifierComponentType FIELD = new VerifierComponentType( "FIELD" );
- public static final VerifierComponentType RULE = new VerifierComponentType( "RULE" );
- public static final VerifierComponentType CONSTRAINT = new VerifierComponentType( "CONSTRAINT" );
- public static final VerifierComponentType VARIABLE = new VerifierComponentType( "VARIABLE" );
- public static final VerifierComponentType PATTERN = new VerifierComponentType( "PATTERN" );
- public static final VerifierComponentType SUB_PATTERN = new VerifierComponentType( "SUB_PATTERN" );
- public static final VerifierComponentType SUB_RULE = new VerifierComponentType( "SUB_RULE" );
- public static final VerifierComponentType RESTRICTION = new VerifierComponentType( "RESTRICTION" );
- public static final VerifierComponentType OPERATOR = new VerifierComponentType( "OPERATOR" );
- public static final VerifierComponentType FIELD_OBJECT_TYPE_LINK = new VerifierComponentType( "FIELD_CLASS_LINK" );
- public static final VerifierComponentType COLLECT = new VerifierComponentType( "COLLECT" );
- public static final VerifierComponentType ACCUMULATE = new VerifierComponentType( "ACCUMULATE" );
- public static final VerifierComponentType FROM = new VerifierComponentType( "FROM" );
- public static final VerifierComponentType EVAL = new VerifierComponentType( "EVAL" );
- public static final VerifierComponentType PREDICATE = new VerifierComponentType( "PREDICATE" );
- public static final VerifierComponentType METHOD_ACCESSOR = new VerifierComponentType( "METHOD_ACCESSOR" );
- public static final VerifierComponentType FIELD_ACCESSOR = new VerifierComponentType( "FIELD_ACCESSOR" );
- public static final VerifierComponentType FUNCTION_CALL = new VerifierComponentType( "FUNCTION_CALL" );
- public static final VerifierComponentType ACCESSOR = new VerifierComponentType( "ACCESSOR" );
- public static final VerifierComponentType RULE_PACKAGE = new VerifierComponentType( "RULE_PACKAGE" );
- public static final VerifierComponentType CONSEQUENCE = new VerifierComponentType( "CONSEQUENCE" );
- public static final VerifierComponentType OBJECT_TYPE = new VerifierComponentType( "OBJECT_TYPE" );
- public static final VerifierComponentType INLINE_EVAL_DESCR = new VerifierComponentType( "INLINE_EVAL_DESCR" );
- public static final VerifierComponentType RETURN_VALUE_FIELD_DESCR = new VerifierComponentType( "RETURN_VALUE_FIELD_DESCR" );
- public static final VerifierComponentType ENTRY_POINT_DESCR = new VerifierComponentType( "ENTRY_POINT_DESCR" );
- public static final VerifierComponentType WORKING_MEMORY = new VerifierComponentType( "WORKING_MEMORY" );
- public static final VerifierComponentType IMPORT = new VerifierComponentType( "IMPORT " );
+ public static final VerifierComponentType UNKNOWN = new VerifierComponentType( "unknown" );
+ public static final VerifierComponentType FIELD = new VerifierComponentType( "field" );
+ public static final VerifierComponentType RULE = new VerifierComponentType( "rule" );
+ public static final VerifierComponentType CONSTRAINT = new VerifierComponentType( "constraint" );
+ public static final VerifierComponentType VARIABLE = new VerifierComponentType( "variable" );
+ public static final VerifierComponentType PATTERN = new VerifierComponentType( "pattern" );
+ public static final VerifierComponentType SUB_PATTERN = new VerifierComponentType( "subPattern" );
+ public static final VerifierComponentType SUB_RULE = new VerifierComponentType( "subRule" );
+ public static final VerifierComponentType RESTRICTION = new VerifierComponentType( "restriction" );
+ public static final VerifierComponentType OPERATOR = new VerifierComponentType( "operator" );
+ public static final VerifierComponentType FIELD_OBJECT_TYPE_LINK = new VerifierComponentType( "fieldClassLink" );
+ public static final VerifierComponentType COLLECT = new VerifierComponentType( "collect" );
+ public static final VerifierComponentType ACCUMULATE = new VerifierComponentType( "accumulate" );
+ public static final VerifierComponentType FROM = new VerifierComponentType( "from" );
+ public static final VerifierComponentType EVAL = new VerifierComponentType( "eval" );
+ public static final VerifierComponentType PREDICATE = new VerifierComponentType( "predicate" );
+ public static final VerifierComponentType METHOD_ACCESSOR = new VerifierComponentType( "method_accessor" );
+ public static final VerifierComponentType FIELD_ACCESSOR = new VerifierComponentType( "fieldAccessor" );
+ public static final VerifierComponentType FUNCTION_CALL = new VerifierComponentType( "functionCall" );
+ public static final VerifierComponentType ACCESSOR = new VerifierComponentType( "accessor" );
+ public static final VerifierComponentType RULE_PACKAGE = new VerifierComponentType( "rulePackage" );
+ public static final VerifierComponentType CONSEQUENCE = new VerifierComponentType( "consequence" );
+ public static final VerifierComponentType OBJECT_TYPE = new VerifierComponentType( "objectType" );
+ public static final VerifierComponentType INLINE_EVAL_DESCR = new VerifierComponentType( "inlineEvalDescr" );
+ public static final VerifierComponentType RETURN_VALUE_FIELD_DESCR = new VerifierComponentType( "returnValueFieldDescr" );
+ public static final VerifierComponentType ENTRY_POINT_DESCR = new VerifierComponentType( "entryPointDescr" );
+ public static final VerifierComponentType WORKING_MEMORY = new VerifierComponentType( "workingMemory" );
+ public static final VerifierComponentType IMPORT = new VerifierComponentType( "import" );
private final String type;
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/VerifierRule.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/VerifierRule.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/VerifierRule.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -49,7 +49,7 @@
@Override
public String getPath() {
- return String.format( "%s.rule[name=%s]",
+ return String.format( "%s/rule[@name='%s']",
getPackagePath(),
getName() );
}
Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/WorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/WorkingMemory.java 2010-07-06 10:19:52 UTC (rev 33745)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/WorkingMemory.java 2010-07-06 12:31:56 UTC (rev 33746)
@@ -8,7 +8,7 @@
@Override
public String getPath() {
- return String.format( "source[type=%s]",
+ return String.format( "source[@type=%s]",
getVerifierComponentType().getType() );
}
More information about the jboss-svn-commits
mailing list