You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/09/02 17:41:57 UTC
[1/5] git commit: Polished javadoc
Updated Branches:
refs/heads/camel-2.10.x ef84e968d -> 7c8059a09
refs/heads/camel-2.11.x e2c1a4041 -> 42659f8e7
refs/heads/camel-2.12.x 20b60b702 -> 72807c486
refs/heads/master bb9e3d1ec -> eed23e3e8
Polished javadoc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b23317f2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b23317f2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b23317f2
Branch: refs/heads/master
Commit: b23317f266f6483a46e67f9dc959b810187fe4e2
Parents: bb9e3d1
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 2 16:35:32 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 2 16:35:32 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/model/RouteContextRefDefinitionHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b23317f2/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
index 08617ae..500aca9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
@@ -48,12 +48,12 @@ public final class RouteContextRefDefinitionHelper {
* <p/>
* This implmementation must be used to lookup the routes as it performs a deep clone of the routes
* as a {@link RouteContextRefDefinition} can be re-used with multiple {@link CamelContext} and each
- * context should have their own instances of the routes. This is to ensure no side-effefts and sharing
+ * context should have their own instances of the routes. This is to ensure no side-effects and sharing
* of instances between the contexts. For example such as property placeholders may be context specific
* so the routes should not use placeholders from another {@link CamelContext}.
*
* @param camelContext the CamelContext
- * @param ref the id of the {@link RouteContextRefDefinition} to lookup and get the rotues.
+ * @param ref the id of the {@link RouteContextRefDefinition} to lookup and get the routes.
* @return the routes.
*/
@SuppressWarnings("unchecked")
[4/5] git commit: CAMEL-6699: Fixed using in OSGi
Blueprint.
Posted by da...@apache.org.
CAMEL-6699: Fixed using <routeBuilder ref> in OSGi Blueprint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42659f8e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42659f8e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42659f8e
Branch: refs/heads/camel-2.11.x
Commit: 42659f8e771ee3f6ac157ee0f24de0f8df8741c5
Parents: e2c1a40
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 2 17:40:31 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 2 17:41:07 2013 +0200
----------------------------------------------------------------------
.../core/xml/AbstractCamelContextFactoryBean.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/42659f8e/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index c6e5bd3..20bae2f 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -634,21 +634,14 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
protected void installRoutes() throws Exception {
List<RouteBuilder> builders = new ArrayList<RouteBuilder>();
- // lets add route builders added from references
+ // lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
for (RouteBuilderDefinition builderRef : getBuilderRefs()) {
- RouteBuilder builder = builderRef.createRouteBuilder(getContext());
- if (builder != null) {
- builders.add(builder);
+ RoutesBuilder routes = builderRef.createRoutes(getContext());
+ if (routes != null) {
+ this.builders.add(routes);
} else {
- // support to get the route here
- RoutesBuilder routes = builderRef.createRoutes(getContext());
- if (routes != null) {
- this.builders.add(routes);
- } else {
- // Throw the exception that we can't find any build here
- throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
- }
+ throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
}
}
}
[5/5] git commit: CAMEL-6699: Fixed using in OSGi
Blueprint.
Posted by da...@apache.org.
CAMEL-6699: Fixed using <routeBuilder ref> in OSGi Blueprint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c8059a0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c8059a0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c8059a0
Branch: refs/heads/camel-2.10.x
Commit: 7c8059a09e07c34af0a6bb2b492a303ad82b4e96
Parents: ef84e96
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 2 17:40:31 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 2 17:41:25 2013 +0200
----------------------------------------------------------------------
.../core/xml/AbstractCamelContextFactoryBean.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7c8059a0/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 4173d64..ddd51f5 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -618,21 +618,14 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
protected void installRoutes() throws Exception {
List<RouteBuilder> builders = new ArrayList<RouteBuilder>();
- // lets add route builders added from references
+ // lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
for (RouteBuilderDefinition builderRef : getBuilderRefs()) {
- RouteBuilder builder = builderRef.createRouteBuilder(getContext());
- if (builder != null) {
- builders.add(builder);
+ RoutesBuilder routes = builderRef.createRoutes(getContext());
+ if (routes != null) {
+ this.builders.add(routes);
} else {
- // support to get the route here
- RoutesBuilder routes = builderRef.createRoutes(getContext());
- if (routes != null) {
- this.builders.add(routes);
- } else {
- // Throw the exception that we can't find any build here
- throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
- }
+ throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
}
}
}
[3/5] git commit: CAMEL-6699: Fixed using in OSGi
Blueprint.
Posted by da...@apache.org.
CAMEL-6699: Fixed using <routeBuilder ref> in OSGi Blueprint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/72807c48
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/72807c48
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/72807c48
Branch: refs/heads/camel-2.12.x
Commit: 72807c48679ec2819b8fcf46712c129c4c4b71cd
Parents: 20b60b7
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 2 17:40:31 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 2 17:40:55 2013 +0200
----------------------------------------------------------------------
.../core/xml/AbstractCamelContextFactoryBean.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/72807c48/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 8e0b498..621d645 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -721,21 +721,14 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
protected void installRoutes() throws Exception {
List<RouteBuilder> builders = new ArrayList<RouteBuilder>();
- // lets add route builders added from references
+ // lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
for (RouteBuilderDefinition builderRef : getBuilderRefs()) {
- RouteBuilder builder = builderRef.createRouteBuilder(getContext());
- if (builder != null) {
- builders.add(builder);
+ RoutesBuilder routes = builderRef.createRoutes(getContext());
+ if (routes != null) {
+ this.builders.add(routes);
} else {
- // support to get the route here
- RoutesBuilder routes = builderRef.createRoutes(getContext());
- if (routes != null) {
- this.builders.add(routes);
- } else {
- // Throw the exception that we can't find any build here
- throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
- }
+ throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
}
}
}
[2/5] git commit: CAMEL-6699: Fixed using in OSGi
Blueprint.
Posted by da...@apache.org.
CAMEL-6699: Fixed using <routeBuilder ref> in OSGi Blueprint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eed23e3e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eed23e3e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eed23e3e
Branch: refs/heads/master
Commit: eed23e3e8abe98c5d939badb951cda8ebbe6d51d
Parents: b23317f
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 2 17:40:31 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 2 17:40:31 2013 +0200
----------------------------------------------------------------------
.../core/xml/AbstractCamelContextFactoryBean.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/eed23e3e/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 8e0b498..621d645 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -721,21 +721,14 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
protected void installRoutes() throws Exception {
List<RouteBuilder> builders = new ArrayList<RouteBuilder>();
- // lets add route builders added from references
+ // lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
for (RouteBuilderDefinition builderRef : getBuilderRefs()) {
- RouteBuilder builder = builderRef.createRouteBuilder(getContext());
- if (builder != null) {
- builders.add(builder);
+ RoutesBuilder routes = builderRef.createRoutes(getContext());
+ if (routes != null) {
+ this.builders.add(routes);
} else {
- // support to get the route here
- RoutesBuilder routes = builderRef.createRoutes(getContext());
- if (routes != null) {
- this.builders.add(routes);
- } else {
- // Throw the exception that we can't find any build here
- throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
- }
+ throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
}
}
}