[jboss-svn-commits] JBL Code SVN: r31270 - in labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline: drools-camel/src/main/java/org/drools/camel/component and 2 other directories.

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

Author: lucazamador
Date: 2010-01-27 16:43:03 -0500 (Wed, 27 Jan 2010)
New Revision: 31270

Modified:
   labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/pom.xml
   labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsJaxbDataFormat.java
   labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
   labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
   labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/pom.xml
Log:
integration with trunk modifications

Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/pom.xml
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/pom.xml	2010-01-27 21:24:14 UTC (rev 31269)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/pom.xml	2010-01-27 21:43:03 UTC (rev 31270)
@@ -52,8 +52,12 @@
             <groupId>org.drools</groupId>
             <artifactId>drools-transformer-xstream</artifactId>
         </dependency>
-
          <dependency>
+         	<groupId>org.drools</groupId>
+         	<artifactId>drools-transformer-jaxb</artifactId>
+         </dependency>
+         
+         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core</artifactId>
             <version>${camel-version}</version>

Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsJaxbDataFormat.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsJaxbDataFormat.java	2010-01-27 21:24:14 UTC (rev 31269)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsJaxbDataFormat.java	2010-01-27 21:43:03 UTC (rev 31270)
@@ -145,7 +145,7 @@
 		Options xjcOpts = new Options();
 		xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
 		ServiceManagerLocalClient serviceManager = new ServiceManagerLocalClient();
-		KnowledgeBuilder kbuilder = serviceManager.getKnowledgeBuilderFactory().newKnowledgeBuilder();
+		KnowledgeBuilder kbuilder = serviceManager.getKnowledgeBuilderFactoryService().newKnowledgeBuilder();
 		String[] classNames = null;
 		try {
 			classNames = KnowledgeBuilderHelper.addXsdModel( ResourceFactory.newClassPathResource("person.xsd", getClass()),
@@ -156,7 +156,7 @@
 			System.out.println("Errors while adding xsd model. " + kbuilder.getErrors());
 		}
 
-		KnowledgeBase kbase = serviceManager.getKnowledgeBaseFactory().newKnowledgeBase();
+		KnowledgeBase kbase = serviceManager.getKnowledgeBaseFactoryService().newKnowledgeBase();
 		kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
 
 		JAXBContext jaxbContext = null;

Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java	2010-01-27 21:24:14 UTC (rev 31269)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java	2010-01-27 21:43:03 UTC (rev 31270)
@@ -126,7 +126,7 @@
     
     @Override
     protected StatefulKnowledgeSession registerKnowledgeRuntime(String identifier, String rule) {
-    	KnowledgeBuilder kbuilder = serviceManager.getKnowledgeBuilderFactory().newKnowledgeBuilder();
+    	KnowledgeBuilder kbuilder = serviceManager.getKnowledgeBuilderFactoryService().newKnowledgeBuilder();
     	
     	Options xjcOpts = new Options();
         xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
@@ -155,7 +155,7 @@
     	assertFalse(kbuilder.hasErrors());
     	
     	
-    	KnowledgeBase kbase = serviceManager.getKnowledgeBaseFactory().newKnowledgeBase();
+    	KnowledgeBase kbase = serviceManager.getKnowledgeBaseFactoryService().newKnowledgeBase();
 		kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
 		
 //		JAXBContext jaxbContext = null;

Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java	2010-01-27 21:24:14 UTC (rev 31269)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java	2010-01-27 21:43:03 UTC (rev 31270)
@@ -19,7 +19,6 @@
 
 import javax.naming.Context;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLAssert;
@@ -30,7 +29,6 @@
 import org.drools.builder.ResourceType;
 import org.drools.definition.KnowledgePackage;
 import org.drools.io.ResourceFactory;
-import org.drools.runtime.KnowledgeRuntime;
 import org.drools.runtime.StatefulKnowledgeSession;
 import org.drools.vsm.ServiceManager;
 import org.drools.vsm.local.ServiceManagerLocalClient;
@@ -38,8 +36,8 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class DroolsCamelTestSupport extends ContextTestSupport {
-    private static final Logger LOG = LoggerFactory.getLogger(DroolsCamelTestSupport.class);
-    private ServiceManager serviceManager;
+    protected static final Logger LOG = LoggerFactory.getLogger(DroolsCamelTestSupport.class);
+    protected ServiceManager serviceManager;
 
     public void setServiceManager(ServiceManager serviceManager) {
         this.serviceManager = serviceManager;

Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/pom.xml
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/pom.xml	2010-01-27 21:24:14 UTC (rev 31269)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/pom.xml	2010-01-27 21:43:03 UTC (rev 31270)
@@ -31,6 +31,11 @@
          <artifactId>jaxb-xjc</artifactId>
          <version>2.0.3</version>
       </dependency>
+      <dependency>
+      	<groupId>org.drools</groupId>
+      	<artifactId>drools-api</artifactId>
+      	<version>${project.version}</version>
+      </dependency>
    </dependencies>
    <repositories>
       <repository>