[jboss-svn-commits] JBL Code SVN: r36177 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server: builder and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2010-12-02 23:05:51 -0500 (Thu, 02 Dec 2010)
New Revision: 36177

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
Log:
JBRULES-2813 Unify two Composite ClassLoader implementations
-Guvnor was expecting a parent classloader framework, instead of a composite one, so updated tests so they now work.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2010-12-03 03:41:58 UTC (rev 36176)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2010-12-03 04:05:51 UTC (rev 36177)
@@ -1773,10 +1773,10 @@
     private void updateBinaryPackage(PackageItem item,
                                      ContentPackageAssembler asm) throws SerializationException {
         item.updateBinaryUpToDate( true );
-        RuleBaseConfiguration conf = new RuleBaseConfiguration();
-        // setting the MapBackedClassloader that is the parent of the builder classloader as the parent
-        // of the rulebase classloader
-        conf.setClassLoader( asm.getBuilder().getRootClassLoader().getParent() );
+        
+        // adding the MapBackedClassloader that is the classloader from the rulebase classloader
+        Collection<ClassLoader> loaders = asm.getBuilder().getRootClassLoader().getClassLoaders();        
+        RuleBaseConfiguration conf = new RuleBaseConfiguration(loaders.toArray( new ClassLoader[loaders.size()] ));
         RuleBase rb = RuleBaseFactory.newRuleBase( conf );
         rb.addPackage( asm.getBinaryPackage() );
         // this.ruleBaseCache.put(item.getUUID(), rb);

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	2010-12-03 03:41:58 UTC (rev 36176)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java	2010-12-03 04:05:51 UTC (rev 36177)
@@ -95,10 +95,9 @@
         properties.setProperty( "drools.dialect.java.compiler",
                                 chainedProperties.getProperty( "drools.dialect.java.compiler", "ECLIPSE" ) );
         properties.putAll(buildProps);
-        PackageBuilderConfiguration pkgConf = new PackageBuilderConfiguration( properties );
+        PackageBuilderConfiguration pkgConf = new PackageBuilderConfiguration( properties,  loader);
         
         pkgConf.setAllowMultipleNamespaces(false);
-        pkgConf.setClassLoader( loader );
         pkgConf.addSemanticModule(new BPMNSemanticModule());
 
         return new BRMSPackageBuilder( pkgConf );