[jboss-svn-commits] JBL Code SVN: r30793 - in labs/jbossrules/trunk/drools-pipeline/drools-camel/src: main/resources/META-INF/services/org/apache/camel/component and 1 other directories.

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

Author: hzbarcea
Date: 2009-12-21 21:07:02 -0500 (Mon, 21 Dec 2009)
New Revision: 30793

Added:
   labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/resources/META-INF/services/org/apache/camel/component/drools-embedded
Modified:
   labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java
   labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsProxyEndpoint.java
   labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java
Log:
JBRULES-2347 Drools Pipeline integration with Camel
* changed convention for embedded route to use drools-embedded scheme vs ?pipeline parameter



Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java	2009-12-21 23:06:00 UTC (rev 30792)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java	2009-12-22 02:07:02 UTC (rev 30793)
@@ -15,6 +15,7 @@
 
 package org.drools.camel.component;
 
+import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -31,6 +32,7 @@
     public static final String DROOLS_OUT_IDENTIFIER = "DroolsOutIdentifier";
     public static final String DROOLS_HANDLE = "DroolsHandle";
     
+    private static final String EMBEDDED_SCHEME = "drools-embedded";
     private static final String UUID_PREFIX = "drools-";
     private static final AtomicInteger counter = new AtomicInteger();
     
@@ -87,11 +89,10 @@
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         Endpoint endpoint;
-        boolean isProxy = !parameters.containsKey("pipeline");
-        if (isProxy) {
+        if (EMBEDDED_SCHEME.equals(new URI(uri).getScheme())) {
+            endpoint = new DroolsEndpoint(uri, remaining, this);
+        } else {
             endpoint = new DroolsProxyEndpoint(uri, remaining, this);
-        } else {
-            endpoint = new DroolsEndpoint(uri, remaining, this);
         }
         setProperties(endpoint, parameters);
         return endpoint;

Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsProxyEndpoint.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsProxyEndpoint.java	2009-12-21 23:06:00 UTC (rev 30792)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsProxyEndpoint.java	2009-12-22 02:07:02 UTC (rev 30793)
@@ -54,7 +54,7 @@
                 public void configure() throws Exception {
                     from("direct:" + id).bean(new DroolsCamelContextInit((ServiceManager)getCamelContext().getRegistry().lookup("sm")))
                             //.unmarshal(xstream)
-                            .to("drools:" + uri + "?pipeline=" + id);
+                            .to("drools-embedded:" + uri);
                             //.marshal(xstream);
                 }
             };

Added: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/resources/META-INF/services/org/apache/camel/component/drools-embedded
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/resources/META-INF/services/org/apache/camel/component/drools-embedded	                        (rev 0)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/resources/META-INF/services/org/apache/camel/component/drools-embedded	2009-12-22 02:07:02 UTC (rev 30793)
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class=org.drools.camel.component.DroolsComponent
+

Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java	2009-12-21 23:06:00 UTC (rev 30792)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java	2009-12-22 02:07:02 UTC (rev 30793)
@@ -67,8 +67,8 @@
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("direct:test-with-session").to("drools://sm/ksession1?pipeline=test-with-session");
-                from("direct:test-no-session").to("drools://sm?pipeline=test-no-session");
+                from("direct:test-with-session").to("drools-embedded://sm/ksession1");
+                from("direct:test-no-session").to("drools-embedded://sm");
             }
         };
     }