[jboss-svn-commits] JBL Code SVN: r20397 - in labs/jbossrules/trunk: drools-ant and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 10 05:51:28 EDT 2008
Author: Rikkola
Date: 2008-06-10 05:51:27 -0400 (Tue, 10 Jun 2008)
New Revision: 20397
Added:
labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsVerifierAntTask.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/VerifierRunner.java
Removed:
labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAnalyticsAntTask.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/AnalysisRunner.java
Modified:
labs/jbossrules/trunk/drools-ant/.classpath
labs/jbossrules/trunk/drools-ant/.project
labs/jbossrules/trunk/drools-ant/pom.xml
labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java
labs/jbossrules/trunk/drools-ant/src/test/resources/DroolsAntTask.xml
labs/jbossrules/trunk/drools-jbrms/.classpath
labs/jbossrules/trunk/drools-jbrms/.project
labs/jbossrules/trunk/drools-jbrms/pom.xml
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-1555: Change project name from analytics to verifier
Modified: labs/jbossrules/trunk/drools-ant/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-ant/.classpath 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-ant/.classpath 2008-06-10 09:51:27 UTC (rev 20397)
@@ -1,21 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-analytics"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="src" path="/drools-decisiontables"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/trunk/drools-ant/.project
===================================================================
--- labs/jbossrules/trunk/drools-ant/.project 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-ant/.project 2008-06-10 09:51:27 UTC (rev 20397)
@@ -1,18 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>drools-ant</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-analytics</project>
- <project>drools-compiler</project>
- <project>drools-core</project>
- <project>drools-decisiontables</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>drools-ant</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-verifier</project>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ <project>drools-decisiontables</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: labs/jbossrules/trunk/drools-ant/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-ant/pom.xml 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-ant/pom.xml 2008-06-10 09:51:27 UTC (rev 20397)
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-analytics</artifactId>
+ <artifactId>drools-verifier</artifactId>
</dependency>
<dependency>
Deleted: labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAnalyticsAntTask.java
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAnalyticsAntTask.java 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAnalyticsAntTask.java 2008-06-10 09:51:27 UTC (rev 20397)
@@ -1,148 +0,0 @@
-package org.drools.contrib;
-
-import java.io.File;
-import java.io.InputStreamReader;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
-import org.drools.verifier.Analyzer;
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
-import org.drools.lang.descr.PackageDescr;
-
-public class DroolsAnalyticsAntTask extends MatchingTask {
-
- public static final String DRLFILEEXTENSION = ".drl";
-
- private File srcdir;
- private File toFile;
- private Path classpath;
-
- /**
- * Source directory to read DRL files from
- *
- * @param directory
- */
- public void setSrcDir(File directory) {
- this.srcdir = directory;
- }
-
- /**
- * File to serialize the rulebase to
- *
- * @param toFile
- */
- public void setToFile(File toFile) {
- this.toFile = toFile;
- }
-
- /**
- * The classpath to use when compiling the rulebase
- *
- * @param classpath
- */
- public void setClasspath(Path classpath) {
- createClasspath().append(classpath);
- }
-
- /**
- * Classpath to use, by reference, when compiling the rulebase
- *
- * @param r
- * a reference to an existing classpath
- */
- public void setClasspathref(Reference r) {
- createClasspath().setRefid(r);
- }
-
- /**
- * Adds a path to the classpath.
- *
- * @return created classpath
- */
- public Path createClasspath() {
- if (this.classpath == null) {
- this.classpath = new Path(getProject());
- }
- return this.classpath.createPath();
- }
-
- /**
- * Task's main method
- */
- public void execute() throws BuildException {
- super.execute();
-
- // checking parameters are set
- if (toFile == null) {
- throw new BuildException(
- "Destination rulebase file does not specified.");
- }
-
- // checking parameters are set
- if (srcdir == null) {
- throw new BuildException("Source directory not specified.");
- }
-
- if (!srcdir.exists()) {
- throw new BuildException("Source directory does not exists."
- + srcdir.getAbsolutePath());
- }
-
- try {
-
- // create a specialized classloader
-
- Analyzer droolsanalyzer = new Analyzer();
-
- // get the list of files to be added to the rulebase
- String[] fileNames = getFileList();
-
- for (int i = 0; i < fileNames.length; i++) {
- compileAndAnalyzeFile(droolsanalyzer, fileNames[i]);
- }
-
- droolsanalyzer.fireAnalysis();
- droolsanalyzer.writeComponentsHTML(toFile.getAbsolutePath() + "/");
-
- System.out.println("Writing analytics report to " + toFile.getAbsolutePath() + "/report");
-
- } catch (Exception e) {
- throw new BuildException("RuleBaseTask failed: " + e.getMessage(),
- e);
- }
- }
- private void compileAndAnalyzeFile(Analyzer droolsanalyzer, String filename) throws DroolsParserException {
-
- // Analytics just works with drl files
- if ( !filename.endsWith(DroolsAnalyticsAntTask.DRLFILEEXTENSION) ) {
- throw new UnsupportedOperationException();
- }
-
- PackageDescr descr = new DrlParser()
- .parse(new InputStreamReader(Analyzer.class
- .getResourceAsStream(filename)));
-
- droolsanalyzer.addPackageDescr(descr);
- }
-
- /**
- * Returns the list of files to be added into the rulebase
- *
- * @return
- */
- private String[] getFileList() {
- // scan source directory for rule files
- DirectoryScanner directoryScanner = getDirectoryScanner(srcdir);
- String[] fileNames = directoryScanner.getIncludedFiles();
-
- if (fileNames == null || fileNames.length <= 0) {
- throw new BuildException(
- "No rule files found in include directory.");
- }
- return fileNames;
- }
-}
Copied: labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsVerifierAntTask.java (from rev 20250, labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAnalyticsAntTask.java)
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsVerifierAntTask.java (rev 0)
+++ labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsVerifierAntTask.java 2008-06-10 09:51:27 UTC (rev 20397)
@@ -0,0 +1,148 @@
+package org.drools.contrib;
+
+import java.io.File;
+import java.io.InputStreamReader;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
+import org.drools.verifier.Verifier;
+import org.drools.compiler.DrlParser;
+import org.drools.compiler.DroolsParserException;
+import org.drools.lang.descr.PackageDescr;
+
+public class DroolsVerifierAntTask extends MatchingTask {
+
+ public static final String DRLFILEEXTENSION = ".drl";
+
+ private File srcdir;
+ private File toFile;
+ private Path classpath;
+
+ /**
+ * Source directory to read DRL files from
+ *
+ * @param directory
+ */
+ public void setSrcDir(File directory) {
+ this.srcdir = directory;
+ }
+
+ /**
+ * File to serialize the rulebase to
+ *
+ * @param toFile
+ */
+ public void setToFile(File toFile) {
+ this.toFile = toFile;
+ }
+
+ /**
+ * The classpath to use when compiling the rulebase
+ *
+ * @param classpath
+ */
+ public void setClasspath(Path classpath) {
+ createClasspath().append(classpath);
+ }
+
+ /**
+ * Classpath to use, by reference, when compiling the rulebase
+ *
+ * @param r
+ * a reference to an existing classpath
+ */
+ public void setClasspathref(Reference r) {
+ createClasspath().setRefid(r);
+ }
+
+ /**
+ * Adds a path to the classpath.
+ *
+ * @return created classpath
+ */
+ public Path createClasspath() {
+ if (this.classpath == null) {
+ this.classpath = new Path(getProject());
+ }
+ return this.classpath.createPath();
+ }
+
+ /**
+ * Task's main method
+ */
+ public void execute() throws BuildException {
+ super.execute();
+
+ // checking parameters are set
+ if (toFile == null) {
+ throw new BuildException(
+ "Destination rulebase file does not specified.");
+ }
+
+ // checking parameters are set
+ if (srcdir == null) {
+ throw new BuildException("Source directory not specified.");
+ }
+
+ if (!srcdir.exists()) {
+ throw new BuildException("Source directory does not exists."
+ + srcdir.getAbsolutePath());
+ }
+
+ try {
+
+ // create a specialized classloader
+
+ Verifier droolsanalyzer = new Verifier();
+
+ // get the list of files to be added to the rulebase
+ String[] fileNames = getFileList();
+
+ for (int i = 0; i < fileNames.length; i++) {
+ compileAndAnalyzeFile(droolsanalyzer, fileNames[i]);
+ }
+
+ droolsanalyzer.fireAnalysis();
+ droolsanalyzer.writeComponentsHTML(toFile.getAbsolutePath() + "/");
+
+ System.out.println("Writing verifier report to " + toFile.getAbsolutePath() + "/report");
+
+ } catch (Exception e) {
+ throw new BuildException("RuleBaseTask failed: " + e.getMessage(),
+ e);
+ }
+ }
+ private void compileAndAnalyzeFile(Verifier droolsanalyzer, String filename) throws DroolsParserException {
+
+ // Verifier just works with drl files
+ if ( !filename.endsWith(DroolsVerifierAntTask.DRLFILEEXTENSION) ) {
+ throw new UnsupportedOperationException();
+ }
+
+ PackageDescr descr = new DrlParser()
+ .parse(new InputStreamReader(Verifier.class
+ .getResourceAsStream(filename)));
+
+ droolsanalyzer.addPackageDescr(descr);
+ }
+
+ /**
+ * Returns the list of files to be added into the rulebase
+ *
+ * @return
+ */
+ private String[] getFileList() {
+ // scan source directory for rule files
+ DirectoryScanner directoryScanner = getDirectoryScanner(srcdir);
+ String[] fileNames = directoryScanner.getIncludedFiles();
+
+ if (fileNames == null || fileNames.length <= 0) {
+ throw new BuildException(
+ "No rule files found in include directory.");
+ }
+ return fileNames;
+ }
+}
Modified: labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java 2008-06-10 09:51:27 UTC (rev 20397)
@@ -31,9 +31,9 @@
configureProject( "src/test/resources/DroolsAntTask.xml" );
}
- public void testAnalyticsReport() {
+ public void testVerifierReport() {
try {
- executeTarget( "analyticsreport" );
+ executeTarget( "verifierreport" );
} catch (Exception e) {
e.printStackTrace();
}
Modified: labs/jbossrules/trunk/drools-ant/src/test/resources/DroolsAntTask.xml
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/test/resources/DroolsAntTask.xml 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-ant/src/test/resources/DroolsAntTask.xml 2008-06-10 09:51:27 UTC (rev 20397)
@@ -17,16 +17,16 @@
</path>
<taskdef name="compiler" classname="org.drools.contrib.DroolsCompilerAntTask" classpathref="drools.classpath" />
- <taskdef name="analytics" classname="org.drools.contrib.DroolsAnalyticsAntTask" classpathref="drools.classpath" />
+ <taskdef name="verifier" classname="org.drools.contrib.DroolsVerifierAntTask" classpathref="drools.classpath" />
- <target name="analyticsreport">
- <analytics
- srcdir="${eclipsepath}src/test/resources/org/drools/analytics"
+ <target name="verifierreport">
+ <verifier
+ srcdir="${eclipsepath}src/test/resources/org/drools/verifier"
tofile="${eclipsepath}target/"
classpathref="cheese.classpath" >
<include name="*.drl" />
- </analytics>
+ </verifier>
</target>
Modified: labs/jbossrules/trunk/drools-jbrms/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/.classpath 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-jbrms/.classpath 2008-06-10 09:51:27 UTC (rev 20397)
@@ -1,79 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.4.60/gwt-servlet-1.4.60.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.1/gwtext-2.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/emma/emma/2.0.5312/emma-2.0.5312.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-analytics"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
- <classpathentry kind="src" path="/drools-decisiontables"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="src" path="/drools-repository"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.1/jackrabbit-core-1.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2-SNAPSHOT/jboss-security-acl-impl-2.0.2-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/acl-spi/2.0.2-SNAPSHOT/acl-spi-2.0.2-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.Beta5/identity-spi-2.0.2.Beta5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2-SNAPSHOT/authorization-spi-2.0.2-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.3.ga/javassist-3.3.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl/2.0.2-SNAPSHOT/jboss-security-acl-2.0.2-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.0.0.CR2/jboss-seam-2.0.0.CR2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-el/2.0.0.CR1/jboss-el-2.0.0.CR1.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>
+ <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/trunk/drools-jbrms/.project
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/.project 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-jbrms/.project 2008-06-10 09:51:27 UTC (rev 20397)
@@ -1,19 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>drools-jbrms</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-analytics</project>
- <project>drools-compiler</project>
- <project>drools-core</project>
- <project>drools-decisiontables</project>
- <project>drools-repository</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>drools-jbrms</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-verifier</project>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ <project>drools-decisiontables</project>
+ <project>drools-repository</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: labs/jbossrules/trunk/drools-jbrms/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/pom.xml 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-jbrms/pom.xml 2008-06-10 09:51:27 UTC (rev 20397)
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-analytics</artifactId>
+ <artifactId>drools-verifier</artifactId>
</dependency>
<!-- jackrabbit (this really should come from repository, not sure why not)
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/ServiceImplementation.java 2008-06-10 09:51:27 UTC (rev 20397)
@@ -1314,7 +1314,7 @@
public AnalysisReport analysePackage(String packageUUID)
throws SerializableException {
String drl = this.buildPackageSource(packageUUID);
- AnalysisRunner runner = new AnalysisRunner();
+ VerifierRunner runner = new VerifierRunner();
try {
return runner.analyse(drl);
} catch (DroolsParserException e) {
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/AnalysisRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/AnalysisRunner.java 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/AnalysisRunner.java 2008-06-10 09:51:27 UTC (rev 20397)
@@ -1,111 +0,0 @@
-package org.drools.brms.server.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.drools.brms.client.rpc.AnalysisFactUsage;
-import org.drools.brms.client.rpc.AnalysisFieldUsage;
-import org.drools.brms.client.rpc.AnalysisReport;
-import org.drools.brms.client.rpc.AnalysisReportLine;
-import org.drools.brms.client.rpc.DetailedSerializableException;
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.verifier.Analyzer;
-import org.drools.verifier.components.AnalyticsClass;
-import org.drools.verifier.components.AnalyticsRule;
-import org.drools.verifier.components.Field;
-import org.drools.verifier.dao.AnalyticsData;
-import org.drools.verifier.dao.AnalyticsResult;
-import org.drools.verifier.report.components.AnalyticsMessageBase;
-import org.drools.verifier.report.components.Severity;
-
-import com.google.gwt.user.client.rpc.SerializableException;
-
-public class AnalysisRunner {
-
- public AnalysisReport analyse(String drl) throws DroolsParserException, SerializableException {
- DrlParser p = new DrlParser();
- PackageDescr pkg = p.parse(drl);
- if (p.hasErrors()) {
- throw new DetailedSerializableException(
- "Unable to analyse rules due to syntax errors in the rules.",
- "Please correct syntax errors - build the package before trying the analysis again.");
- }
- Analyzer a = new Analyzer();
- a.addPackageDescr(pkg);
- a.fireAnalysis();
- AnalyticsResult res = a.getResult();
-
- AnalysisReport report = new AnalysisReport();
- report.errors = doLines(res.getBySeverity(Severity.ERROR));
- report.warnings = doLines(res.getBySeverity(Severity.WARNING));
- report.notes = doLines(res.getBySeverity(Severity.NOTE));
- report.factUsages = doFactUsage(res.getAnalyticsData());
- return report;
- }
-
- private AnalysisFactUsage[] doFactUsage(AnalyticsData analyticsData) {
-
- Map<String, String> interned = new HashMap<String, String>();
-
- List<AnalysisFactUsage> factUsage = new ArrayList<AnalysisFactUsage>();
- Collection<AnalyticsClass> classes = analyticsData.getAllClasses();
- for (AnalyticsClass c : classes) {
- AnalysisFactUsage fact = new AnalysisFactUsage();
- fact.name = c.getName();
- List<AnalysisFieldUsage> fieldUsage = new ArrayList<AnalysisFieldUsage>();
- Set<Field> flds = c.getFields();
- for (Field f : flds) {
- AnalysisFieldUsage fu = new AnalysisFieldUsage();
- fu.name = f.getName();
- Collection<AnalyticsRule> cr = analyticsData.getRulesByFieldId(f.getId());
- List<String> ruleNames = new ArrayList<String>();
- for (AnalyticsRule analyticsRule : cr) {
- ruleNames.add(intern(analyticsRule.getRuleName(), interned));
- }
- fu.rules = ruleNames.toArray(new String[ruleNames.size()]);
- fieldUsage.add(fu);
- }
- fact.fields = fieldUsage.toArray(new AnalysisFieldUsage[fieldUsage.size()]);
- factUsage.add(fact);
- }
- return factUsage.toArray(new AnalysisFactUsage[factUsage.size()]);
- }
-
- /**
- * Doing this to reuse refs to the one name (interning, but not putting in the VMs interned pool
- * as there could be quite a lot of rules).
- */
- private String intern(String ruleName, Map<String, String> interned) {
- if (interned.containsKey(ruleName)) {
- return interned.get(ruleName);
- } else {
- interned.put(ruleName, ruleName);
- return ruleName;
- }
- }
-
- private AnalysisReportLine[] doLines(
- Collection<AnalyticsMessageBase> msgs) {
- List<AnalysisReportLine> lines = new ArrayList<AnalysisReportLine>();
- for (AnalyticsMessageBase m : msgs) {
- AnalysisReportLine line = new AnalysisReportLine();
- line.description = m.getMessage();
- line.reason = m.getFaulty().toString();
- Collection<?> causes = m.getCauses();
- List<String> causeList = new ArrayList<String>();
- for (Object c : causes) {
- causeList.add(c.toString());
- }
- line.cause = causeList.toArray(new String[causeList.size()]);
- lines.add(line);
- }
- return lines.toArray(new AnalysisReportLine[lines.size()]);
- }
-
-}
Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/VerifierRunner.java (from rev 20250, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/AnalysisRunner.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/VerifierRunner.java (rev 0)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/VerifierRunner.java 2008-06-10 09:51:27 UTC (rev 20397)
@@ -0,0 +1,111 @@
+package org.drools.brms.server.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.drools.brms.client.rpc.AnalysisFactUsage;
+import org.drools.brms.client.rpc.AnalysisFieldUsage;
+import org.drools.brms.client.rpc.AnalysisReport;
+import org.drools.brms.client.rpc.AnalysisReportLine;
+import org.drools.brms.client.rpc.DetailedSerializableException;
+import org.drools.compiler.DrlParser;
+import org.drools.compiler.DroolsParserException;
+import org.drools.lang.descr.PackageDescr;
+import org.drools.verifier.Verifier;
+import org.drools.verifier.components.VerifierClass;
+import org.drools.verifier.components.VerifierRule;
+import org.drools.verifier.components.Field;
+import org.drools.verifier.dao.VerifierData;
+import org.drools.verifier.dao.VerifierResult;
+import org.drools.verifier.report.components.VerifierMessageBase;
+import org.drools.verifier.report.components.Severity;
+
+import com.google.gwt.user.client.rpc.SerializableException;
+
+public class VerifierRunner {
+
+ public AnalysisReport analyse(String drl) throws DroolsParserException, SerializableException {
+ DrlParser p = new DrlParser();
+ PackageDescr pkg = p.parse(drl);
+ if (p.hasErrors()) {
+ throw new DetailedSerializableException(
+ "Unable to verify rules due to syntax errors in the rules.",
+ "Please correct syntax errors - build the package before trying the verifier again.");
+ }
+ Verifier a = new Verifier();
+ a.addPackageDescr(pkg);
+ a.fireAnalysis();
+ VerifierResult res = a.getResult();
+
+ AnalysisReport report = new AnalysisReport();
+ report.errors = doLines(res.getBySeverity(Severity.ERROR));
+ report.warnings = doLines(res.getBySeverity(Severity.WARNING));
+ report.notes = doLines(res.getBySeverity(Severity.NOTE));
+ report.factUsages = doFactUsage(res.getVerifierData());
+ return report;
+ }
+
+ private AnalysisFactUsage[] doFactUsage(VerifierData verifierData) {
+
+ Map<String, String> interned = new HashMap<String, String>();
+
+ List<AnalysisFactUsage> factUsage = new ArrayList<AnalysisFactUsage>();
+ Collection<VerifierClass> classes = verifierData.getAllClasses();
+ for (VerifierClass c : classes) {
+ AnalysisFactUsage fact = new AnalysisFactUsage();
+ fact.name = c.getName();
+ List<AnalysisFieldUsage> fieldUsage = new ArrayList<AnalysisFieldUsage>();
+ Set<Field> flds = c.getFields();
+ for (Field f : flds) {
+ AnalysisFieldUsage fu = new AnalysisFieldUsage();
+ fu.name = f.getName();
+ Collection<VerifierRule> cr = verifierData.getRulesByFieldId(f.getId());
+ List<String> ruleNames = new ArrayList<String>();
+ for (VerifierRule verifierRule : cr) {
+ ruleNames.add(intern(verifierRule.getRuleName(), interned));
+ }
+ fu.rules = ruleNames.toArray(new String[ruleNames.size()]);
+ fieldUsage.add(fu);
+ }
+ fact.fields = fieldUsage.toArray(new AnalysisFieldUsage[fieldUsage.size()]);
+ factUsage.add(fact);
+ }
+ return factUsage.toArray(new AnalysisFactUsage[factUsage.size()]);
+ }
+
+ /**
+ * Doing this to reuse refs to the one name (interning, but not putting in the VMs interned pool
+ * as there could be quite a lot of rules).
+ */
+ private String intern(String ruleName, Map<String, String> interned) {
+ if (interned.containsKey(ruleName)) {
+ return interned.get(ruleName);
+ } else {
+ interned.put(ruleName, ruleName);
+ return ruleName;
+ }
+ }
+
+ private AnalysisReportLine[] doLines(
+ Collection<VerifierMessageBase> msgs) {
+ List<AnalysisReportLine> lines = new ArrayList<AnalysisReportLine>();
+ for (VerifierMessageBase m : msgs) {
+ AnalysisReportLine line = new AnalysisReportLine();
+ line.description = m.getMessage();
+ line.reason = m.getFaulty().toString();
+ Collection<?> causes = m.getCauses();
+ List<String> causeList = new ArrayList<String>();
+ for (Object c : causes) {
+ causeList.add(c.toString());
+ }
+ line.cause = causeList.toArray(new String[causeList.size()]);
+ lines.add(line);
+ }
+ return lines.toArray(new AnalysisReportLine[lines.size()]);
+ }
+
+}
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2008-06-10 09:50:11 UTC (rev 20396)
+++ labs/jbossrules/trunk/pom.xml 2008-06-10 09:51:27 UTC (rev 20397)
@@ -676,7 +676,7 @@
<module>drools-decisiontables</module>
<!-- TODO enable these or create a profile in which they are enabled (to avoid making the build slow) -->
<!--module>drools-server</module-->
- <module>drools-analytics</module>
+ <module>drools-verifier</module>
<module>drools-ant</module>
<module>drools-repository</module>
<module>drools-jbrms</module>
@@ -775,12 +775,12 @@
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-analytics</artifactId>
+ <artifactId>drools-verifier</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-analytics</artifactId>
+ <artifactId>drools-verifier</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope>
More information about the jboss-svn-commits
mailing list