[jboss-svn-commits] JBL Code SVN: r25697 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder.

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

Author: tirelli
Date: 2009-03-17 20:16:35 -0400 (Tue, 17 Mar 2009)
New Revision: 25697

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
Log:
JBRULES-1951: fixing package name assignment

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java	2009-03-17 23:38:03 UTC (rev 25696)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java	2009-03-18 00:16:35 UTC (rev 25697)
@@ -82,7 +82,6 @@
         properties.putAll(buildProps);
         PackageBuilderConfiguration pkgConf = new PackageBuilderConfiguration( properties );
 
-        pkgConf.setOption( DefaultPackageNameOption.get( "org.package.name" ) );
         pkgConf.setAllowMultipleNamespaces(false);
         pkgConf.setClassLoader( loader );
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2009-03-17 23:38:03 UTC (rev 25696)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2009-03-18 00:16:35 UTC (rev 25697)
@@ -24,6 +24,7 @@
 import java.util.Properties;
 import java.util.jar.JarInputStream;
 
+import org.drools.builder.conf.DefaultPackageNameOption;
 import org.drools.compiler.DroolsError;
 import org.drools.compiler.DroolsParserException;
 import org.drools.guvnor.client.common.AssetFormats;
@@ -137,6 +138,7 @@
         } catch (IOException e) {
             throw new RulesRepositoryException("Unable to load configuration properties for package.", e);            
         }
+        ps.setProperty( DefaultPackageNameOption.PROPERTY_NAME, this.pkg.getName() );
         builder = BRMSPackageBuilder.getInstance(jars, ps);
 	}