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

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

Author: fmeyer
Date: 2007-08-19 21:30:51 -0400 (Sun, 19 Aug 2007)
New Revision: 14377

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java
Log:
JBRULES-1100- Refactoring constructors to load deps 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java	2007-08-20 01:30:21 UTC (rev 14376)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java	2007-08-20 01:30:51 UTC (rev 14377)
@@ -29,7 +29,6 @@
 import org.drools.brms.server.contenthandler.IRuleAsset;
 import org.drools.compiler.DroolsError;
 import org.drools.compiler.DroolsParserException;
-import org.drools.compiler.PackageBuilderConfiguration;
 import org.drools.lang.descr.PackageDescr;
 import org.drools.repository.AssetItem;
 import org.drools.repository.AssetItemIterator;
@@ -64,14 +63,10 @@
      */
     public ContentPackageAssembler(PackageItem assetPackage, boolean compile) {
         this.pkg = assetPackage;
+        createBuilder(); 
         
-        List<JarInputStream> jars = BRMSPackageBuilder.getJars( pkg );
-        builder = BRMSPackageBuilder.getInstance( jars );
-
         if (compile && preparePackage()) {
             buildPackage();
-        } else {
-            builder = BRMSPackageBuilder.getInstance( jars );
         }
     }
     
@@ -87,11 +82,19 @@
      */
     public ContentPackageAssembler(AssetItem assetToBuild) {
         this.pkg = assetToBuild.getPackage();
+        createBuilder();
+        
         if (preparePackage()) {
             buildAsset( assetToBuild );
         }
     }
     
+    
+    public void createBuilder( ) {
+        List<JarInputStream> jars = BRMSPackageBuilder.getJars( pkg );
+        builder = BRMSPackageBuilder.getInstance( jars );
+    }
+    
     /**
      * This will build the package. 
      */
@@ -135,8 +138,6 @@
     private boolean preparePackage() {
         
         //firstly we loadup the classpath
-        List<JarInputStream> jars = BRMSPackageBuilder.getJars( pkg );
-        builder = BRMSPackageBuilder.getInstance( jars );
         builder.addPackage( new PackageDescr(pkg.getName()) );
         
         //now we deal with the header (imports, templates, globals).