Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4016 - in labs/jbossrules/trunk: . drools-compiler drools-core drools-decisiontables drools-examples/src/main/java/org/drools/benchmark drools-examples/src/main/java/org/drools/benchmark/manners drools-examples/src/main/java/org/drools/benchmark/models drools-examples/src/main/java/org/drools/benchmark/waltz drools-examples/src/main/java/org/drools/examples/conway drools-examples/src/main/java/org/drools/examples/conway/ui drools-examples/src/main/resources drools-examples/src/main/resources/org/drools drools-examples/src/main/resources/org/drools/examples drools-examples/src/main/resources/org/drools/examples/conway drools-examples/src/test/java/org/drools/examples/conway drools-jsr94
Author: mar...@jb...
Date: 2006-04-30 19:26:57 -0400 (Sun, 30 Apr 2006)
New Revision: 4016
Added:
labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/
labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/
labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/conway.properties
labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/liveCellImage.gif
Removed:
labs/jbossrules/trunk/drools-examples/src/main/resources/conway/
labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/conway.properties
labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/liveCellImage.gif
Modified:
labs/jbossrules/trunk/drools-compiler/.classpath
labs/jbossrules/trunk/drools-core/.classpath
labs/jbossrules/trunk/drools-decisiontables/.classpath
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/RuleSetLoadTest.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/RuleSetPerformanceTest.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/SharedNode2CEPerformanceTest.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/SharedNodePerformanceTest.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/manners/MannersBenchmark.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Account.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Address.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/GroupTransaction.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/SubTransaction.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Transaction.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ConwayApplicationProperties.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ConwayRuleBaseFactory.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ui/CellGridCanvas.java
labs/jbossrules/trunk/drools-examples/src/test/java/org/drools/examples/conway/CellGridTest.java
labs/jbossrules/trunk/drools-examples/src/test/java/org/drools/examples/conway/CellTest.java
labs/jbossrules/trunk/drools-jsr94/.classpath
labs/jbossrules/trunk/drools-jsr94/.project
labs/jbossrules/trunk/pom.xml
Log:
-removed erroneous junit imports, as they are now java examples.
-fixed paths on conways unit tests
Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-compiler/.classpath 2006-04-30 23:26:57 UTC (rev 4016)
@@ -5,24 +5,24 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-core/.classpath 2006-04-30 23:26:57 UTC (rev 4016)
@@ -5,11 +5,11 @@
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
<classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/.classpath 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-decisiontables/.classpath 2006-04-30 23:26:57 UTC (rev 4016)
@@ -5,26 +5,26 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/>
- <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/RuleSetLoadTest.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/RuleSetLoadTest.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/RuleSetLoadTest.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import junit.framework.TestCase;
-
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/RuleSetPerformanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/RuleSetPerformanceTest.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/RuleSetPerformanceTest.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import junit.framework.TestCase;
-
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
@@ -26,6 +24,7 @@
import org.drools.RuleBase;
import org.drools.RuleIntegrationException;
import org.drools.WorkingMemory;
+import org.drools.benchmark.models.Account;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
@@ -34,8 +33,6 @@
import org.drools.rule.InvalidPatternException;
import org.drools.rule.Package;
-import org.drools.benchmark.models.Account;
-
/**
* @author Peter Lin
*
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/SharedNode2CEPerformanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/SharedNode2CEPerformanceTest.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/SharedNode2CEPerformanceTest.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import junit.framework.TestCase;
-
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
@@ -26,6 +24,8 @@
import org.drools.RuleBase;
import org.drools.RuleIntegrationException;
import org.drools.WorkingMemory;
+import org.drools.benchmark.models.Account;
+import org.drools.benchmark.models.Address;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
@@ -34,9 +34,6 @@
import org.drools.rule.InvalidPatternException;
import org.drools.rule.Package;
-import org.drools.benchmark.models.Account;
-import org.drools.benchmark.models.Address;
-
/**
* @author Peter Lin
*
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/SharedNodePerformanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/SharedNodePerformanceTest.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/SharedNodePerformanceTest.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import junit.framework.TestCase;
-
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
@@ -26,6 +24,7 @@
import org.drools.RuleBase;
import org.drools.RuleIntegrationException;
import org.drools.WorkingMemory;
+import org.drools.benchmark.models.Address;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
@@ -34,8 +33,6 @@
import org.drools.rule.InvalidPatternException;
import org.drools.rule.Package;
-import org.drools.benchmark.models.Address;
-
/**
* @author Peter Lin
*
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/manners/MannersBenchmark.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/manners/MannersBenchmark.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/manners/MannersBenchmark.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -15,7 +15,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
-import org.drools.benchmark.waltz.WaltzBenchmark;
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Account.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Account.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Account.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -1,7 +1,7 @@
package org.drools.benchmark.models;
+import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
import java.io.Serializable;
import java.util.ArrayList;
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Address.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Address.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Address.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -1,7 +1,7 @@
package org.drools.benchmark.models;
+import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
import java.io.Serializable;
import java.util.ArrayList;
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/GroupTransaction.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/GroupTransaction.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/GroupTransaction.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -2,7 +2,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.Serializable;
import java.util.ArrayList;
/**
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/SubTransaction.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/SubTransaction.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/SubTransaction.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -2,7 +2,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.Serializable;
import java.util.ArrayList;
/**
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Transaction.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Transaction.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/models/Transaction.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -2,7 +2,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.Serializable;
import java.util.ArrayList;
/**
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -18,27 +18,15 @@
import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.Reader;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.TestCase;
-
-import org.drools.PackageIntegrationException;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.RuleIntegrationException;
import org.drools.WorkingMemory;
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.reteoo.RuleBaseImpl;
-import org.drools.rule.InvalidPatternException;
import org.drools.rule.Package;
/**
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ConwayApplicationProperties.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ConwayApplicationProperties.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ConwayApplicationProperties.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -17,7 +17,7 @@
private final ResourceBundle resources;
private ConwayApplicationProperties() {
- this.resources = ResourceBundle.getBundle( "conway.conway" );
+ this.resources = ResourceBundle.getBundle( "org.drools.examples.conway.conway" );
}
public static String getProperty(final String propertyName) {
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ConwayRuleBaseFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ConwayRuleBaseFactory.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ConwayRuleBaseFactory.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -30,10 +30,10 @@
*/
// private static RuleBase readRule() throws Exception {
// read in the source
- final Reader source = new InputStreamReader( ConwayRuleBaseFactory.class.getResourceAsStream( "/conway/conway.drl" ) );
+ final Reader source = new InputStreamReader( ConwayRuleBaseFactory.class.getResourceAsStream( "/org/drools/examples/conway/conway.drl" ) );
// optionally read in the DSL (if you are using it).
- final Reader dsl = new InputStreamReader( ConwayRuleBaseFactory.class.getResourceAsStream( "/conway/conway.dsl" ) );
+ final Reader dsl = new InputStreamReader( ConwayRuleBaseFactory.class.getResourceAsStream( "/org/drools/examples/conway/conway.dsl" ) );
// Use package builder to build up a rule package.
// An alternative lower level class called "DrlParser" can also be
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ui/CellGridCanvas.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ui/CellGridCanvas.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/ui/CellGridCanvas.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -23,7 +23,7 @@
private Image backgroundImage;
private final int cellSize;
private final CellGrid cellGrid;
- private final Image liveCellImage = new ImageIcon( CellGridCanvas.class.getResource( "/conway/liveCellImage.gif" ) ).getImage();
+ private final Image liveCellImage = new ImageIcon( CellGridCanvas.class.getResource( "/org/drools/examples/conway/liveCellImage.gif" ) ).getImage();
private static final Color BACKGROUND_COLOR = Color.gray;
private static final Color GRID_COLOR = CellGridCanvas.BACKGROUND_COLOR.brighter();
Copied: labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway (from rev 4014, labs/jbossrules/trunk/drools-examples/src/main/resources/conway)
Deleted: labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/conway.properties
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/resources/conway/conway.properties 2006-04-30 14:43:45 UTC (rev 4014)
+++ labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/conway.properties 2006-04-30 23:26:57 UTC (rev 4016)
@@ -1,24 +0,0 @@
-app.title=Conway's Game Of Life
-next.generation.label=Next Generation
-start.label=Start
-stop.label=Stop
-clear.label=Clear
-pattern.label=Pattern :
-app.description=<html>\
-Conway's Game Of Life is a cellular automaton originally<br>\
-conceived by John Conway in the early 1970's. This particular<br>\
-implemenation happens to use the Drools Java Rules Engine<br>\
-to impose the "business rules" that constrain the game.<br><br>\
-Select a predefined pattern from the list below or use the mouse<br>\
-to interactively define a starting grid by clicking on cells in<br>\
-the grid to bring them to life.<br><br>\
-Click the "Next Generation" button to iterate through generations<br>\
-one at a time or click the "Start" button to let the system evolve<br>\
-itself.</html>
-
-conway.pattern.classnames= \
- org.drools.examples.conway.patterns.Border \
- org.drools.examples.conway.patterns.Hi \
- org.drools.examples.conway.patterns.Pentadecathalon \
- org.drools.examples.conway.patterns.Pulsar \
- org.drools.examples.conway.patterns.SimpleGlider
Copied: labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/conway.properties (from rev 4015, labs/jbossrules/trunk/drools-examples/src/main/resources/conway/conway.properties)
Deleted: labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/liveCellImage.gif
===================================================================
(Binary files differ)
Copied: labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/examples/conway/liveCellImage.gif (from rev 4015, labs/jbossrules/trunk/drools-examples/src/main/resources/conway/liveCellImage.gif)
Modified: labs/jbossrules/trunk/drools-examples/src/test/java/org/drools/examples/conway/CellGridTest.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/test/java/org/drools/examples/conway/CellGridTest.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/test/java/org/drools/examples/conway/CellGridTest.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -1,9 +1,5 @@
package org.drools.examples.conway;
-import org.drools.examples.conway.Cell;
-import org.drools.examples.conway.CellGrid;
-import org.drools.examples.conway.CellState;
-
import junit.framework.TestCase;
/**
Modified: labs/jbossrules/trunk/drools-examples/src/test/java/org/drools/examples/conway/CellTest.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/test/java/org/drools/examples/conway/CellTest.java 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-examples/src/test/java/org/drools/examples/conway/CellTest.java 2006-04-30 23:26:57 UTC (rev 4016)
@@ -1,8 +1,5 @@
package org.drools.examples.conway;
-import org.drools.examples.conway.Cell;
-import org.drools.examples.conway.CellState;
-
import junit.framework.TestCase;
/**
Modified: labs/jbossrules/trunk/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.classpath 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-jsr94/.classpath 2006-04-30 23:26:57 UTC (rev 4016)
@@ -4,29 +4,29 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.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/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
<classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/jung/jung/1.7.2/jung-1.7.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
<classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/stringtemplate/2.3b6/stringtemplate-2.3b6.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.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/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-eclipse/3.2.0.658/commons-jci-eclipse-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.4.1/janino-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.658/core-3.2.0.658.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-core/1.0-SNAPSHOT/commons-jci-core-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0ea8/antlr-3.0ea8.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jci-janino/2.4.1/commons-jci-janino-2.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jsr94/.project
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.project 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/drools-jsr94/.project 2006-04-30 23:26:57 UTC (rev 4016)
@@ -2,8 +2,8 @@
<name>drools-jsr94</name>
<comment/>
<projects>
+ <project>drools-core</project>
<project>drools-compiler</project>
- <project>drools-core</project>
</projects>
<buildSpec>
<buildCommand>
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2006-04-30 22:41:53 UTC (rev 4015)
+++ labs/jbossrules/trunk/pom.xml 2006-04-30 23:26:57 UTC (rev 4016)
@@ -241,13 +241,7 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.1.3</version>
- <scope>runtime</scope>
- </dependency>
+ </dependency>
</dependencies>
<reporting>
|
