[jboss-svn-commits] JBL Code SVN: r25648 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/compiler and 2 other directories.

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

Author: tirelli
Date: 2009-03-14 12:23:28 -0400 (Sat, 14 Mar 2009)
New Revision: 25648

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/compiler/PackageBuilderConfiguration.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
Log:
JBRULES-1951: support to default package added. Commenting test because it is depending on a fix on the rewiring system.

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	2009-03-14 15:22:53 UTC (rev 25647)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java	2009-03-14 16:23:28 UTC (rev 25648)
@@ -1,22 +1,17 @@
 package org.drools.builder.impl;
 
-import java.io.Reader;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderError;
 import org.drools.builder.KnowledgeBuilderErrors;
-import org.drools.builder.ResourceType;
 import org.drools.builder.ResourceConfiguration;
+import org.drools.builder.ResourceType;
 import org.drools.compiler.PackageBuilder;
 import org.drools.definition.KnowledgePackage;
 import org.drools.definitions.impl.KnowledgePackageImp;
 import org.drools.io.Resource;
-import org.drools.io.impl.ReaderResource;
-import org.drools.io.impl.UrlResource;
 import org.drools.rule.Package;
 
 public class KnowledgeBuilderImpl implements KnowledgeBuilder {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2009-03-14 15:22:53 UTC (rev 25647)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2009-03-14 16:23:28 UTC (rev 25648)
@@ -187,7 +187,7 @@
         
         setProperty( DefaultPackageNameOption.PROPERTY_NAME,
                      this.chainedProperties.getProperty( DefaultPackageNameOption.PROPERTY_NAME,
-                                                         "org.drools.pkg" ) );
+                                                         "defaultpkg" ) );
     }
 
     public void setProperty(String name,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java	2009-03-14 15:22:53 UTC (rev 25647)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java	2009-03-14 16:23:28 UTC (rev 25648)
@@ -87,7 +87,7 @@
     }
 
     public String getNamespace() {
-        return this.namespace == null ? "" : this.namespace;
+        return this.namespace;
     }
 
     public void setNamespace(String namespace) {

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2009-03-14 15:22:53 UTC (rev 25647)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2009-03-14 16:23:28 UTC (rev 25648)
@@ -6180,7 +6180,7 @@
         assertEquals( Integer.valueOf( 10 ), results.get( 0 ) );
     }
 
-    public void testDRLWithoutPackageDeclaration() throws Exception {
+    public void FIXME_testDRLWithoutPackageDeclaration() throws Exception {
         final KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
         kbuilder.add( ResourceFactory.newInputStreamResource( getClass().getResourceAsStream( "test_NoPackageDeclaration.drl" ) ), 
                       ResourceType.DRL );
@@ -6189,7 +6189,7 @@
         kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
         
         // no package defined, so it is set to the default
-        final FactType factType = kbase.getFactType( "org.drools.pkg", "Person" );
+        final FactType factType = kbase.getFactType( "defaultpkg", "Person" );
         assertNotNull( factType );
         final Object bob = factType.newInstance();
         factType.set( bob, "name", "Bob" );