[jboss-svn-commits] JBL Code SVN: r31119 - in labs/jbossrules/trunk: drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence and 3 other directories.

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

Author: mark.proctor at jboss.com
Date: 2010-01-18 03:11:55 -0500 (Mon, 18 Jan 2010)
New Revision: 31119

Modified:
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/JPAKnowledgeServiceBean.java
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java
   labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
   labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/pipeline/camel/CamelPipelineTest.java
Log:
JBRULES-2351 OSGi Ready
-Getting things compiling again.

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java	2010-01-18 05:56:21 UTC (rev 31118)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java	2010-01-18 08:11:55 UTC (rev 31119)
@@ -39,7 +39,7 @@
 		if (serviceManager == null) {
 			serviceManager = new ServiceManagerLocalClient();
 		}
-		KnowledgeBuilder kbuilder = getServiceManager().getKnowledgeBuilderFactory().newKnowledgeBuilder();
+		KnowledgeBuilder kbuilder = getServiceManager().getKnowledgeBuilderFactoryService().newKnowledgeBuilder();
 		for (DroolsResourceAdapter res: resources) {
 			if (res.getResourceConfiguration() == null) {
 				kbuilder.add(res.getDroolsResource(), res.getResourceType());
@@ -54,7 +54,7 @@
 		}
 		
 //		kbase = getServiceManager().getKnowledgeBaseFactory().newKnowledgeBase(getName());
-		kbase = getServiceManager().getKnowledgeBaseFactory().newKnowledgeBase();
+		kbase = getServiceManager().getKnowledgeBaseFactoryService().newKnowledgeBase();
 		kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
 		
 		///

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/JPAKnowledgeServiceBean.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/JPAKnowledgeServiceBean.java	2010-01-18 05:56:21 UTC (rev 31118)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/JPAKnowledgeServiceBean.java	2010-01-18 08:11:55 UTC (rev 31119)
@@ -68,7 +68,7 @@
 			serviceManager = new ServiceManagerLocalClient();
 		}
 		if (environment == null) {
-			environment = serviceManager.getKnowledgeBaseFactory().newEnvironment();
+			environment = serviceManager.getKnowledgeBaseFactoryService().newEnvironment();
 		}
 
 		if (environment.get(EnvironmentName.ENTITY_MANAGER_FACTORY) != null) {

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java	2010-01-18 05:56:21 UTC (rev 31118)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java	2010-01-18 08:11:55 UTC (rev 31119)
@@ -4,7 +4,7 @@
 
 import org.drools.builder.DecisionTableInputType;
 import org.drools.builder.ResourceType;
-import org.drools.builder.impl.DecisionTableConfigurationImpl;
+import org.drools.builder.conf.impl.DecisionTableConfigurationImpl;
 import org.drools.container.spring.beans.DroolsResourceAdapter;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;

Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java	2010-01-18 05:56:21 UTC (rev 31118)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java	2010-01-18 08:11:55 UTC (rev 31119)
@@ -77,7 +77,7 @@
     protected abstract void configureDroolsContext();
 
     protected StatefulKnowledgeSession registerKnowledgeRuntime(String identifier, String rule) {
-        KnowledgeBuilder kbuilder = serviceManager.getKnowledgeBuilderFactory().newKnowledgeBuilder();
+        KnowledgeBuilder kbuilder = serviceManager.getKnowledgeBuilderFactoryService().newKnowledgeBuilder();
         
         if (rule != null && rule.length() > 0) {
             kbuilder.add(ResourceFactory.newByteArrayResource(rule.getBytes()), ResourceType.DRL);
@@ -88,7 +88,7 @@
         }
         assertFalse(kbuilder.hasErrors());
         Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
-        KnowledgeBase kbase = serviceManager.getKnowledgeBaseFactory().newKnowledgeBase();
+        KnowledgeBase kbase = serviceManager.getKnowledgeBaseFactoryService().newKnowledgeBase();
 
         kbase.addKnowledgePackages(pkgs);
         StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();

Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/pipeline/camel/CamelPipelineTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/pipeline/camel/CamelPipelineTest.java	2010-01-18 05:56:21 UTC (rev 31118)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/pipeline/camel/CamelPipelineTest.java	2010-01-18 08:11:55 UTC (rev 31119)
@@ -209,7 +209,7 @@
 
     private StatefulKnowledgeSession getVmsSessionStateful(ServiceManager sm,
             String rule) throws Exception {
-        KnowledgeBuilder kbuilder = sm.getKnowledgeBuilderFactory().newKnowledgeBuilder();
+        KnowledgeBuilder kbuilder = sm.getKnowledgeBuilderFactoryService().newKnowledgeBuilder();
         kbuilder.add(ResourceFactory.newByteArrayResource(rule.getBytes()),
                 ResourceType.DRL);
 
@@ -220,7 +220,7 @@
         assertFalse(kbuilder.hasErrors());
         Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
 
-        KnowledgeBase kbase = sm.getKnowledgeBaseFactory().newKnowledgeBase();
+        KnowledgeBase kbase = sm.getKnowledgeBaseFactoryService().newKnowledgeBase();
 
         kbase.addKnowledgePackages(pkgs);
         StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();