[jboss-svn-commits] JBL Code SVN: r20817 - in labs/jbossrules/trunk/drools-core/src: test/java/org/drools/agent and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2008-06-26 13:59:41 -0400 (Thu, 26 Jun 2008)
New Revision: 20817

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/DirectoryScannerTest.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleBaseAssemblerTest.java
Log:
JBRULES-720 Clips Parser 
-We now set the ContextClassLoader for MVEL, so it can see Drools specific classes.

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java	2008-06-26 17:59:33 UTC (rev 20816)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java	2008-06-26 17:59:41 UTC (rev 20817)
@@ -67,6 +67,9 @@
 
         //Receive breakpoints from debugger
         MVELDebugHandler.prepare();
+        
+        ClassLoader tempClassLoader = Thread.currentThread().getContextClassLoader();
+        Thread.currentThread().setContextClassLoader( pkg.getPackageScopeClassLoader() );
 
         if ( MVELDebugHandler.isDebugMode() ) {
             if ( MVELDebugHandler.verbose ) {
@@ -80,6 +83,8 @@
                                     null,
                                     factory );
         }
+        
+        Thread.currentThread().setContextClassLoader( tempClassLoader );
 
     }
 

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/DirectoryScannerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/DirectoryScannerTest.java	2008-06-26 17:59:33 UTC (rev 20816)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/DirectoryScannerTest.java	2008-06-26 17:59:41 UTC (rev 20817)
@@ -14,12 +14,12 @@
 public class DirectoryScannerTest extends TestCase {
 
     public void testScan() throws Exception {
-        File dir = RuleBaseAssemblerTest.getTempDirectory();
+        File dir = RuleBaseAssemblerTest.getTempDirectory();       
         
         Package p1 = new Package("p1");
         Package p2 = new Package("p2");
         File p1f = new File(dir, "p1.pkg");
-        File p2f = new File(dir, "p2.pkg");
+        File p2f = new File(dir, "p2.pkg");        
         
         RuleBaseAssemblerTest.writePackage( p1, p1f );
         RuleBaseAssemblerTest.writePackage( p2, p2f);
@@ -33,7 +33,7 @@
         
         RuleBase rb = RuleBaseFactory.newRuleBase();
         PackageProvider.applyChanges( rb, true, scan.loadPackageChanges(), new MockListener() );
-
+        
         assertEquals(2, rb.getPackages().length);
                 
         Package p3 = new Package("p3");

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleBaseAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleBaseAssemblerTest.java	2008-06-26 17:59:33 UTC (rev 20816)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleBaseAssemblerTest.java	2008-06-26 17:59:41 UTC (rev 20817)
@@ -77,7 +77,7 @@
             String[] children = dir.list();
             for (String child : children) {
                 boolean success = deleteDir(new File(dir, child));
-                if (!success) {
+                if (!success) {                    
                     //throw new RuntimeException("Unable to delete !");
                     return false;
                 }