You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/01/03 07:42:37 UTC
[camel] branch master updated (0d1f6ee -> fcc7549)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 0d1f6ee CAMEL-14345: camel-core - Optimize SendProcessor to not use ProducerCache when not needed
new 5205e4f Removed references to Guice in READMEs
new 5a20708 Removed more refs to Guice
new cbcff5e Removed more refs to Guice
new fcc7549 Regen
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 2 +-
apache-camel/src/main/release/README.txt | 2 +-
.../camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc | 4 ++--
.../java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java | 5 ++---
.../src/main/java/org/apache/camel/support/DefaultEndpoint.java | 2 +-
docs/components/modules/ROOT/pages/spring-javaconfig.adoc | 4 ++--
docs/user-manual/modules/ROOT/pages/architecture.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/component.adoc | 2 +-
8 files changed, 11 insertions(+), 12 deletions(-)
[camel] 02/04: Removed more refs to Guice
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5a20708c76f9174a09131a62935120651135e905
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 3 08:06:56 2020 +0100
Removed more refs to Guice
---
docs/components/modules/ROOT/pages/spring-javaconfig.adoc | 3 +--
docs/user-manual/modules/ROOT/pages/architecture.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/component.adoc | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/spring-javaconfig.adoc b/docs/components/modules/ROOT/pages/spring-javaconfig.adoc
index a6e34c7..8c08d61 100644
--- a/docs/components/modules/ROOT/pages/spring-javaconfig.adoc
+++ b/docs/components/modules/ROOT/pages/spring-javaconfig.adoc
@@ -4,8 +4,7 @@
Spring started life using XML Config to wire beans
together. However some folks don't like using XML and would rather use
-Java code which led to the creation of Guice along with the Spring
-JavaConfig project.
+Java code with the Spring JavaConfig project.
You can use either the XML or Java config approaches with Camel; its
your choice really on which you prefer.
diff --git a/docs/user-manual/modules/ROOT/pages/architecture.adoc b/docs/user-manual/modules/ROOT/pages/architecture.adoc
index f2f4ff5..9f11e25 100644
--- a/docs/user-manual/modules/ROOT/pages/architecture.adoc
+++ b/docs/user-manual/modules/ROOT/pages/architecture.adoc
@@ -14,7 +14,7 @@ which contains a collection of Component instances.
A Component is essentially a factory of
Endpoint instances. You can explicitly configure
Component instances in Java code or an IoC
-container like Spring or Guice, or they can be auto-discovered using
+container like Spring, or they can be auto-discovered using
URIs.
An Endpoint acts rather like a URI or URL in a web
diff --git a/docs/user-manual/modules/ROOT/pages/component.adoc b/docs/user-manual/modules/ROOT/pages/component.adoc
index 3895985..2e9da36 100644
--- a/docs/user-manual/modules/ROOT/pages/component.adoc
+++ b/docs/user-manual/modules/ROOT/pages/component.adoc
@@ -5,7 +5,7 @@ A Component is essentially a factory of xref:endpoint.adoc[Endpoint] instances.
You can explicitly configure Component instances
and add them to a xref:camelcontext.adoc[CamelContext] in an IoC
-container like Spring or Guice, or they can be auto-discovered using
+container like Spring, or they can be auto-discovered using
xref:uris.adoc[URIs].
[[Component-ComponentsIncluded]]
[camel] 01/04: Removed references to Guice in READMEs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5205e4f8d2455704f9680743005cb980af4ddc4c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 3 08:02:32 2020 +0100
Removed references to Guice in READMEs
---
README.md | 2 +-
apache-camel/src/main/release/README.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index b480183..56dd00f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ which kind of transport used, so learn the API once and you will be able to
interact with all the Components that is provided out-of-the-box.
Apache Camel has powerful Bean Binding and integrated seamless with
-popular frameworks such as Spring, CDI, Blueprint and Guice.
+popular frameworks such as Spring, CDI and Blueprint.
Apache Camel has extensive testing support allowing you to easily
unit test your routes.
diff --git a/apache-camel/src/main/release/README.txt b/apache-camel/src/main/release/README.txt
index a5cd199..f357ab8 100644
--- a/apache-camel/src/main/release/README.txt
+++ b/apache-camel/src/main/release/README.txt
@@ -20,7 +20,7 @@ will be able to interact with all the Components that is provided
out-of-the-box.
Apache Camel has powerful Bean Binding and integrated seamless with popular
-frameworks such as Spring and Guice.
+frameworks such as Spring, CDI and Blueprint.
Apache Camel has extensive Testing support allowing you to easily
unit test your routes.
[camel] 04/04: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fcc7549ad82d991c0ef3ef8a0eb1dbc5804d1935
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 3 08:13:00 2020 +0100
Regen
---
docs/components/modules/ROOT/pages/spring-javaconfig.adoc | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/components/modules/ROOT/pages/spring-javaconfig.adoc b/docs/components/modules/ROOT/pages/spring-javaconfig.adoc
index 8c08d61..b9ae2ec 100644
--- a/docs/components/modules/ROOT/pages/spring-javaconfig.adoc
+++ b/docs/components/modules/ROOT/pages/spring-javaconfig.adoc
@@ -6,6 +6,7 @@ Spring started life using XML Config to wire beans
together. However some folks don't like using XML and would rather use
Java code with the Spring JavaConfig project.
+
You can use either the XML or Java config approaches with Camel; its
your choice really on which you prefer.
[camel] 03/04: Removed more refs to Guice
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cbcff5e3f6f8787da20b4c0a63f13b3ce982dd4e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 3 08:09:23 2020 +0100
Removed more refs to Guice
---
.../camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc | 4 ++--
.../java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java | 5 ++---
.../src/main/java/org/apache/camel/support/DefaultEndpoint.java | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/components/camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc b/components/camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc
index 12cb675..04ae0b1 100644
--- a/components/camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc
+++ b/components/camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc
@@ -3,8 +3,8 @@
Spring started life using XML Config to wire beans
together. However some folks don't like using XML and would rather use
-Java code which led to the creation of Guice along with the Spring
-JavaConfig project.
+Java code with the Spring JavaConfig project.
+
You can use either the XML or Java config approaches with Camel; its
your choice really on which you prefer.
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
index 156062f..4483779 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
@@ -47,9 +47,8 @@ import org.slf4j.LoggerFactory;
/**
* A helper class for Camel based injector or post processing hooks which can be
- * reused by both the <a href="http://camel.apache.org/spring.html">Spring</a>,
- * <a href="http://camel.apache.org/guice.html">Guice</a> and
- * <a href="http://camel.apache.org/blueprint.html">Blueprint</a> support.
+ * reused by both the <a href="http://camel.apache.org/spring.html">Spring</a>
+ * and <a href="http://camel.apache.org/blueprint.html">Blueprint</a> support.
*/
public class CamelPostProcessorHelper implements CamelContextAware {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
index c32a403..57ecf75 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
@@ -436,7 +436,7 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
/**
* Sets the endpointUri if it has not been specified yet via some kind of
* dependency injection mechanism. This allows dependency injection
- * frameworks such as Spring or Guice to set the default endpoint URI in
+ * frameworks such as Spring to set the default endpoint URI in
* cases where it has not been explicitly configured using the name/context
* in which an Endpoint is created.
*/