[jboss-svn-commits] JBL Code SVN: r35853 - in labs/jbossrules/trunk: osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2010-11-03 13:37:02 -0400 (Wed, 03 Nov 2010)
New Revision: 35853

Modified:
   labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java
   labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java
   labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2351 OSGi ready
-updated to latest bundles plugin
-fixed TCCL

Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java	2010-11-03 17:32:18 UTC (rev 35852)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java	2010-11-03 17:37:02 UTC (rev 35853)
@@ -31,8 +31,9 @@
 
 public class BPMN2OsgiTest extends AbstractDroolsSpringDMTest {
 
-    protected void onSetUp() throws Exception {
-        
+    protected void onSetUp() throws Exception {               
+        ServiceReference kbuilderRef = bundleContext.getServiceReference( KnowledgeBuilderFactoryService.class.getName() );        
+        Thread.currentThread().setContextClassLoader(  bundleContext.getService( kbuilderRef ).getClass().getClassLoader()  );
     }
 
     protected void onTearDown() throws Exception {

Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java	2010-11-03 17:32:18 UTC (rev 35852)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java	2010-11-03 17:37:02 UTC (rev 35853)
@@ -39,8 +39,9 @@
 
 public class SimpleOsgiTest extends AbstractDroolsSpringDMTest {
 
-    protected void onSetUp() throws Exception {
-        
+    protected void onSetUp() throws Exception {               
+        ServiceReference kbuilderRef = bundleContext.getServiceReference( KnowledgeBuilderFactoryService.class.getName() );        
+        Thread.currentThread().setContextClassLoader(  bundleContext.getService( kbuilderRef ).getClass().getClassLoader()  );
     }
 
     protected void onTearDown() throws Exception {
@@ -65,7 +66,7 @@
 
     public void testCompiler() {        
         ServiceReference serviceRef = bundleContext.getServiceReference( ServiceRegistry.class.getName() );
-        ServiceRegistry registry = (ServiceRegistry) bundleContext.getService( serviceRef );
+        ServiceRegistry registry = (ServiceRegistry) bundleContext.getService( serviceRef );              
 
         KnowledgeBuilderFactoryService knowledgeBuilderFactoryService = registry.get( KnowledgeBuilderFactoryService.class );
         
@@ -96,7 +97,7 @@
             throw new RuntimeException( kbuilder.getErrors().toString() );
         }
 
-        KnowledgeBaseConfiguration kbaseConf = knowledgeBaseFactoryService.newKnowledgeBaseConfiguration( null,
+        KnowledgeBaseConfiguration kbaseConf = knowledgeBaseFactoryService.newKnowledgeBaseConfiguration( null,                                                                                                          
                                                                                                           getClass().getClassLoader() );
 
         KnowledgeBase kbase = knowledgeBaseFactoryService.newKnowledgeBase( kbaseConf );
@@ -107,7 +108,8 @@
                             list );
 
         ksession.insert( new Person( "name",
-                                     34 ) );
+                                     34 ) );      
+        
         ksession.fireAllRules();
         ksession.dispose();
 

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2010-11-03 17:32:18 UTC (rev 35852)
+++ labs/jbossrules/trunk/pom.xml	2010-11-03 17:37:02 UTC (rev 35853)
@@ -527,7 +527,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.0.1</version>
+          <version>2.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>