[jboss-svn-commits] JBL Code SVN: r33586 - 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
jboss-svn-commits at lists.jboss.org
Mon Jun 21 23:56:05 EDT 2010
Author: hzbarcea
Date: 2010-06-21 23:56:04 -0400 (Mon, 21 Jun 2010)
New Revision: 33586
Removed:
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/test/java/org/drools/camel/component/CamelEndpointTest.java
labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxWrapperCollectionTest.java
labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java
labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java
labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java
Log:
JBRULES-2347: Drools Pipeline integration with Camel
- removed the creation of the secondary route.
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 2010-06-22 03:37:23 UTC (rev 33585)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java 2010-06-22 03:56:04 UTC (rev 33586)
@@ -30,8 +30,7 @@
public static final String DROOLS_LOOKUP = "DroolsLookup";
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();
@@ -88,11 +87,7 @@
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
Endpoint endpoint;
- if (EMBEDDED_SCHEME.equals(new URI(uri).getScheme())) {
- endpoint = new DroolsEndpoint(uri, remaining, this);
- } else {
- endpoint = new DroolsProxyEndpoint(uri, remaining, this);
- }
+ endpoint = new DroolsEndpoint(uri, remaining, this);
setProperties(endpoint, parameters);
return endpoint;
}
Deleted: 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 2010-06-22 03:37:23 UTC (rev 33585)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/main/resources/META-INF/services/org/apache/camel/component/drools-embedded 2010-06-22 03:56:04 UTC (rev 33586)
@@ -1,19 +0,0 @@
-#
-# 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 2010-06-22 03:37:23 UTC (rev 33585)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java 2010-06-22 03:56:04 UTC (rev 33586)
@@ -67,8 +67,8 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:test-with-session").to("drools-embedded://node/ksession1");
- from("direct:test-no-session").to("drools-embedded://node");
+ from("direct:test-with-session").to("drools://node/ksession1");
+ from("direct:test-no-session").to("drools://node");
}
};
}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxWrapperCollectionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxWrapperCollectionTest.java 2010-06-22 03:37:23 UTC (rev 33585)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxWrapperCollectionTest.java 2010-06-22 03:56:04 UTC (rev 33586)
@@ -363,9 +363,9 @@
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:test-with-session").
- unmarshal("drools-jaxb").to("drools-embedded:node/ksession1").marshal("drools-jaxb");
+ unmarshal("drools-jaxb").to("drools:node/ksession1").marshal("drools-jaxb");
from("direct:test-no-session").
- unmarshal("drools-jaxb").to("drools-embedded:node").marshal("drools-jaxb");
+ unmarshal("drools-jaxb").to("drools:node").marshal("drools-jaxb");
}
};
}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-06-22 03:37:23 UTC (rev 33585)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-06-22 03:56:04 UTC (rev 33586)
@@ -288,9 +288,9 @@
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:test-with-session").
- unmarshal("drools-jaxb").to("drools-embedded:node/ksession1").marshal("drools-jaxb");
+ unmarshal("drools-jaxb").to("drools:node/ksession1").marshal("drools-jaxb");
from("direct:test-no-session").
- unmarshal("drools-jaxb").to("drools-embedded:node").marshal("drools-jaxb");
+ unmarshal("drools-jaxb").to("drools:node").marshal("drools-jaxb");
}
};
}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java 2010-06-22 03:37:23 UTC (rev 33585)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java 2010-06-22 03:56:04 UTC (rev 33586)
@@ -124,9 +124,9 @@
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:test-with-session").
- unmarshal("drools-jaxb").to("drools-embedded:node/ksession1").marshal("drools-jaxb");
+ unmarshal("drools-jaxb").to("drools:node/ksession1").marshal("drools-jaxb");
from("direct:test-no-session").
- unmarshal("drools-jaxb").to("drools-embedded:node").marshal("drools-jaxb");
+ unmarshal("drools-jaxb").to("drools:node").marshal("drools-jaxb");
}
};
}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java 2010-06-22 03:37:23 UTC (rev 33585)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java 2010-06-22 03:56:04 UTC (rev 33586)
@@ -150,9 +150,9 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:test-with-session").routePolicy(new DroolsClassloaderPolicy()).unmarshal("drools-xstream").to("drools-embedded:node/ksession1").marshal("drools-xstream");
- from("direct:test-with-session-json").routePolicy(new DroolsClassloaderPolicy()).unmarshal("drools-json").to("drools-embedded:node/ksession1").marshal("drools-json" );
- from("direct:test-no-session").routePolicy(new DroolsClassloaderPolicy()).unmarshal("drools-xstream").to( "drools-embedded:node").marshal("drools-xstream");
+ from("direct:test-with-session").routePolicy(new DroolsClassloaderPolicy()).unmarshal("drools-xstream").to("drools:node/ksession1").marshal("drools-xstream");
+ from("direct:test-with-session-json").routePolicy(new DroolsClassloaderPolicy()).unmarshal("drools-json").to("drools:node/ksession1").marshal("drools-json" );
+ from("direct:test-no-session").routePolicy(new DroolsClassloaderPolicy()).unmarshal("drools-xstream").to( "drools:node").marshal("drools-xstream");
}
};
}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java 2010-06-22 03:37:23 UTC (rev 33585)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java 2010-06-22 03:56:04 UTC (rev 33586)
@@ -40,7 +40,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:test-no-marshal").to("drools-embedded://node/ksession1");
+ from("direct:test-no-marshal").to("drools://node/ksession1");
}
};
}
More information about the jboss-svn-commits
mailing list