[jboss-svn-commits] JBL Code SVN: r23787 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/builder/impl and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Nov 9 01:58:52 EST 2008
Author: mark.proctor at jboss.com
Date: 2008-11-09 01:58:51 -0500 (Sun, 09 Nov 2008)
New Revision: 23787
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/ProcessBuilder.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/RuleBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
Log:
JBRULES-1734 Drools API
-KnowledgeBuilder.addResource now works
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -7,7 +7,7 @@
import org.drools.definition.KnowledgePackage;
public interface KnowledgeBuilder extends RuleBuilder, ProcessBuilder {
- public void addResorce(URL url, KnowledgeType type);
+ public void addResource(URL url, KnowledgeType type);
public void addResource(Reader reader, KnowledgeType type);
Collection<KnowledgePackage> getKnowledgePackages();
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/ProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/ProcessBuilder.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/ProcessBuilder.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -4,7 +4,5 @@
import java.net.URL;
public interface ProcessBuilder {
- void addProcessFromXml(URL url);
- void addProcessFromXml(Reader reader);
-
+
}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/RuleBuilder.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/RuleBuilder.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -4,9 +4,5 @@
import java.net.URL;
public interface RuleBuilder {
-
- public void addPackageFromDrl(URL url);
- public void addPackageFromDrl(Reader reader);
- public void addPackageFromXml(URL url);
- public void addPackageFromXml(Reader reader);
+
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -15,106 +15,20 @@
public class KnowledgeBuilderImpl implements KnowledgeBuilder {
private PackageBuilder pkgBuilder;
-
- private StringBuilder dslStore;
-
+
public KnowledgeBuilderImpl(PackageBuilder pkgBuilder) {
this.pkgBuilder = pkgBuilder;
}
public void addResource(URL url, KnowledgeType type) {
- try {
- switch ( type ) {
- case DRL : {
- pkgBuilder.addPackageFromDrl( url );
- break;
- }
- case DSLR : {
- break;
- }
- case DSL : {
- if ( dslStore == null ) {
- dslStore = new StringBuilder();
- }
- break;
- }
- case XDRL : {
- pkgBuilder.addPackageFromXml( url );
- break;
- }
- case DRF : {
- pkgBuilder.addProcessFromXml( url );
- break;
- }
- case XLS : {
- //pkgBuilder.
- }
- }
- } catch (Exception e) {
- throw new RuntimeException( e );
- }
- }
+ pkgBuilder.addResource( url, type ) ;
+ }
- public void processDsl() {
-
- }
-
- public void X() {
- try {
- Class compiler = Class.forName( "org.drools.decisiontable.SpreadsheetCompiler" );
- } catch ( ClassNotFoundException e ) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
+ public void addResource(Reader reader,
+ KnowledgeType type) {
+ pkgBuilder.addResource( reader, type ) ;
+ }
- public void addPackageFromDrl(URL url) {
- try {
- pkgBuilder.addPackageFromDrl(url);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void addPackageFromDrl(Reader reader) {
- try {
- pkgBuilder.addPackageFromDrl(reader);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void addPackageFromXml(URL url) {
- try {
- pkgBuilder.addPackageFromXml( url );
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void addPackageFromXml(Reader reader) {
- try {
- pkgBuilder.addPackageFromXml(reader);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- public void addProcessFromXml(URL url) {
- try {
- pkgBuilder.addProcessFromXml(url);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void addProcessFromXml(Reader reader) {
- try {
- pkgBuilder.addProcessFromXml(reader);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
public Collection<KnowledgePackage> getKnowledgePackages() {
Package[] pkgs = pkgBuilder.getPackages();
List<KnowledgePackage> list = new ArrayList<KnowledgePackage>( pkgs.length );
@@ -122,18 +36,5 @@
list.add( new KnowledgePackageImp( pkg ) );
}
return list;
- }
-
- public void addResorce(URL url,
- KnowledgeType type) {
- // TODO Auto-generated method stub
-
- }
-
- public void addResource(Reader reader,
- KnowledgeType type) {
- // TODO Auto-generated method stub
-
- }
-
+ }
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -34,6 +34,7 @@
import org.drools.base.ClassFieldAccessor;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
+import org.drools.builder.KnowledgeType;
import org.drools.common.InternalRuleBase;
import org.drools.commons.jci.problems.CompilationProblem;
import org.drools.definition.process.Process;
@@ -57,6 +58,9 @@
import org.drools.lang.descr.RuleDescr;
import org.drools.lang.descr.TypeDeclarationDescr;
import org.drools.lang.descr.TypeFieldDescr;
+import org.drools.lang.dsl.DSLMappingFile;
+import org.drools.lang.dsl.DSLTokenizedMappingFile;
+import org.drools.lang.dsl.DefaultExpander;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.rule.CompositeClassLoader;
import org.drools.rule.JavaDialectRuntimeData;
@@ -85,35 +89,37 @@
//private DialectRegistry dialectRegistry;
- private Map<String, PackageRegistry> pkgRegistryMap;
+ private Map<String, PackageRegistry> pkgRegistryMap;
- private List<DroolsError> results;
+ private List<DroolsError> results;
- private PackageBuilderConfiguration configuration;
+ private PackageBuilderConfiguration configuration;
- public static final RuleBuilder ruleBuilder = new RuleBuilder();
+ public static final RuleBuilder ruleBuilder = new RuleBuilder();
/**
* Optional RuleBase for incremental live building
*/
- private ReteooRuleBase ruleBase;
+ private ReteooRuleBase ruleBase;
/**
* Current default package
*/
- private String defaultNamespace;
+ private String defaultNamespace;
/**
* default dialect
*/
- private final String defaultDialect;
+ private final String defaultDialect;
- private CompositeClassLoader rootClassLoader;
+ private CompositeClassLoader rootClassLoader;
- private Map<String, Class> globals;
+ private Map<String, Class> globals;
- private String url;
+ private String url;
+ private List<DSLTokenizedMappingFile> dslFiles;
+
/**
* Use this when package is starting from scratch.
*/
@@ -290,6 +296,7 @@
IOException {
this.url = url.toExternalForm();
addPackageFromXml( new InputStreamReader( url.openStream() ) );
+ this.url = null;
}
/**
@@ -313,6 +320,56 @@
addPackage( pkg );
}
}
+
+ public void addPackageFromDslr(final Reader source) {
+ final DrlParser parser = new DrlParser();
+ DefaultExpander expander = getDslExpander();
+
+ try {
+ String str = expander.expand( source );
+ if ( expander.hasErrors() ) {
+ this.results.addAll( expander.getErrors() );
+ }
+
+ final PackageDescr pkg = parser.parse( str );
+ this.results.addAll( parser.getErrors() );
+ if ( !parser.hasErrors() ) {
+ addPackage( pkg );
+ }
+ } catch (Exception e) {
+ throw new RuntimeException( e );
+ }
+ }
+
+ public void addPackageFromDslr(final URL url) {
+ this.url = url.toExternalForm();
+ try {
+ addPackageFromDslr( new InputStreamReader( url.openStream() ) );
+ } catch ( IOException e ) {
+ throw new RuntimeException( e );
+ }
+ this.url = null;
+ }
+
+ public void addDsl(Reader dsl) {
+ try {
+ DSLTokenizedMappingFile file = new DSLTokenizedMappingFile();
+ file.parseAndLoad( dsl );
+ this.dslFiles.add( file );
+ } catch ( Exception e ) {
+ throw new RuntimeException( e );
+ }
+ }
+
+ public void addDsl(URL url) {
+ this.url = url.toExternalForm();
+ try {
+ addDsl( new InputStreamReader( url.openStream() ) );
+ } catch ( IOException e ) {
+ throw new RuntimeException( e );
+ }
+ this.url = null;
+ }
/**
* Add a ruleflow (.rfm) asset to this package.
@@ -330,11 +387,12 @@
}
this.url = null;
}
-
+
public void addProcessFromXml(Reader processSource) {
ProcessBuilder processBuilder = new ProcessBuilder( this );
try {
- processBuilder.addProcessFromFile( processSource, url );
+ processBuilder.addProcessFromFile( processSource,
+ url );
this.results.addAll( processBuilder.getErrors() );
} catch ( Exception e ) {
if ( e instanceof RuntimeException ) {
@@ -346,6 +404,47 @@
this.results = getResults( this.results );
}
+
+ public void addResource(URL url, KnowledgeType type) {
+ try {
+ addResource( new InputStreamReader( url.openStream() ), type );
+ } catch ( IOException e ) {
+ throw new RuntimeException( e );
+ }
+ }
+
+ public void addResource(Reader reader,
+ KnowledgeType type) {
+ try {
+ switch ( type ) {
+ case DRL : {
+ addPackageFromDrl( reader );
+ break;
+ }
+ case DSLR : {
+ addPackageFromDrl( reader );
+ break;
+ }
+ case DSL : {
+ addDsl( reader );
+ break;
+ }
+ case XDRL : {
+ addPackageFromXml( reader );
+ break;
+ }
+ case DRF : {
+ addProcessFromXml( reader );
+ break;
+ }
+ case XLS : {
+ //pkgBuilder.
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException( e );
+ }
+ }
private void addSemanticModules() {
// this.configuration.getSemanticModules();
@@ -909,6 +1008,20 @@
return this.pkgRegistryMap;
}
+ /**
+ * Returns an expander for DSLs (only if there is a DSL configured for this package).
+ */
+ public DefaultExpander getDslExpander() {
+ DefaultExpander expander = new DefaultExpander();
+ if ( this.dslFiles == null || this.dslFiles.isEmpty() ) {
+ return expander;
+ }
+ for ( DSLMappingFile file : this.dslFiles ) {
+ expander.addDSLMapping( file.getMapping() );
+ }
+ return expander;
+ }
+
public Map<String, Class> getGlobals() {
return this.globals;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -7,6 +7,7 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
+import org.drools.builder.KnowledgeType;
import org.drools.definition.KnowledgePackage;
import org.drools.definition.process.Process;
import org.drools.definition.rule.Rule;
@@ -31,7 +32,7 @@
str += "when\n";
str += "then\n";
str += "end\n";
- builder.addPackageFromDrl( new StringReader( str ) );
+ builder.addResource( new StringReader( str ), KnowledgeType.DRL );
str = "package org.test2\n";
str += "rule rule3\n";
@@ -42,7 +43,7 @@
str += "when\n";
str += "then\n";
str += "end\n";
- builder.addPackageFromDrl( new StringReader( str ) );
+ builder.addResource( new StringReader( str ), KnowledgeType.DRL );
Collection<KnowledgePackage> pkgs = builder.getKnowledgePackages();
assertNotNull( pkgs );
@@ -76,7 +77,7 @@
str += " <nodes><start id=\"1\" name=\"Start\" /><end id=\"2\" name=\"End\" /></nodes>\n";
str += " <connections><connection from=\"1\" to=\"2\"/></connections>";
str += "</process>";
- builder.addProcessFromXml( new StringReader( str ) );
+ builder.addResource( new StringReader( str ), KnowledgeType.DRF );
str = "";
str += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
@@ -86,7 +87,7 @@
str += " <nodes><start id=\"1\" name=\"Start\" /><end id=\"2\" name=\"End\" /></nodes>\n";
str += " <connections><connection from=\"1\" to=\"2\"/></connections>";
str += "</process>";
- builder.addProcessFromXml( new StringReader( str ) );
+ builder.addResource( new StringReader( str ), KnowledgeType.DRF );
Collection<KnowledgePackage> pkgs = builder.getKnowledgePackages();
assertNotNull( pkgs );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -7,6 +7,7 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
+import org.drools.builder.KnowledgeType;
import org.drools.definition.KnowledgePackage;
public class KnowledgeSessionTest extends TestCase {
@@ -23,7 +24,7 @@
str += "when\n";
str += "then\n";
str += "end\n";
- builder.addPackageFromDrl( new StringReader( str ) );
+ builder.addResource( new StringReader( str ), KnowledgeType.DRL );
str = "package org.test2\n";
str += "rule rule3\n";
@@ -34,7 +35,7 @@
str += "when\n";
str += "then\n";
str += "end\n";
- builder.addPackageFromDrl( new StringReader( str ) );
+ builder.addResource( new StringReader( str ), KnowledgeType.DRL );
Collection<KnowledgePackage> pkgs = builder.getKnowledgePackages();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -12,6 +12,7 @@
import org.drools.KnowledgeBaseFactory;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
+import org.drools.builder.KnowledgeType;
import org.drools.definition.KnowledgePackage;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.instance.context.variable.VariableScopeInstance;
@@ -78,7 +79,7 @@
" </connections>\n" +
"\n" +
"</process>");
- kbuilder.addProcessFromXml(source);
+ kbuilder.addResource(source, KnowledgeType.DRF );
Collection<KnowledgePackage> kpkgs = kbuilder.getKnowledgePackages();
KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -32,6 +32,7 @@
import org.drools.StockTick;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
+import org.drools.builder.KnowledgeType;
import org.drools.common.InternalFactHandle;
import org.drools.compiler.DroolsParserException;
import org.drools.runtime.KnowledgeSessionConfiguration;
@@ -64,7 +65,7 @@
DroolsParserException,
Exception {
KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.addPackageFromDrl( reader );
+ kbuilder.addResource( reader, KnowledgeType.DRL );
KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2008-11-08 06:57:27 UTC (rev 23786)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2008-11-09 06:58:51 UTC (rev 23787)
@@ -21,6 +21,7 @@
import org.drools.WorkingMemory;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
+import org.drools.builder.KnowledgeType;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.TruthMaintenanceSystem;
import org.drools.compiler.PackageBuilder;
@@ -59,7 +60,7 @@
public void testLogicalInsertionsDynamicRule() throws Exception {
KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.addPackageFromDrl( getClass().getResource( "test_LogicalInsertionsDynamicRule.drl" ) );
+ kbuilder.addResource( getClass().getResource( "test_LogicalInsertionsDynamicRule.drl" ), KnowledgeType.DRL );
Collection<KnowledgePackage> kpkgs = kbuilder.getKnowledgePackages();
KnowledgeBase kbase = getKnowledgeBase();
@@ -89,7 +90,7 @@
// this rule will make a logical assertion for c1 too
kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.addPackageFromDrl( getClass().getResource( "test_LogicalInsertionsDynamicRule2.drl" ) );
+ kbuilder.addResource( getClass().getResource( "test_LogicalInsertionsDynamicRule2.drl" ), KnowledgeType.DRL );
Collection<KnowledgePackage> kpkgs2 = kbuilder.getKnowledgePackages();
kbase.addKnowledgePackages( kpkgs2 );
kbase = SerializationHelper.serializeObject( kbase );
@@ -172,7 +173,7 @@
public void testLogicalInsertions() throws Exception {
final KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.addPackageFromDrl( getClass().getResource( "test_LogicalInsertions.drl" ) );
+ kbuilder.addResource( getClass().getResource( "test_LogicalInsertions.drl" ), KnowledgeType.DRL );
Collection<KnowledgePackage> kpkgs = kbuilder.getKnowledgePackages();
KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
@@ -213,7 +214,7 @@
public void testLogicalInsertionsBacking() throws Exception {
final KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.addPackageFromDrl( getClass().getResource( "test_LogicalInsertionsBacking.drl" ) );
+ kbuilder.addResource( getClass().getResource( "test_LogicalInsertionsBacking.drl" ), KnowledgeType.DRL );
Collection<KnowledgePackage> kpkgs = kbuilder.getKnowledgePackages();
KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
@@ -267,7 +268,7 @@
public void testLogicalInsertionsSelfreferencing() throws Exception {
final KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.addPackageFromDrl( getClass().getResource( "test_LogicalInsertionsSelfreferencing.drl" ) );
+ kbuilder.addResource( getClass().getResource( "test_LogicalInsertionsSelfreferencing.drl" ), KnowledgeType.DRL );
Collection<KnowledgePackage> kpkgs = kbuilder.getKnowledgePackages();
KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
@@ -309,7 +310,7 @@
public void testLogicalInsertionsLoop() throws Exception {
final KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.addPackageFromDrl( getClass().getResource( "test_LogicalInsertionsLoop.drl" ) );
+ kbuilder.addResource( getClass().getResource( "test_LogicalInsertionsLoop.drl" ), KnowledgeType.DRL );
Collection<KnowledgePackage> kpkgs = kbuilder.getKnowledgePackages();
KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
@@ -789,7 +790,7 @@
// TODO JBRULES-1804
KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl" ) ) );
+ kbuilder.addResource( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl" ) ), KnowledgeType.DRL );
Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
KnowledgeBase kbase = getKnowledgeBase();
More information about the jboss-svn-commits
mailing list