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 2016/07/06 13:56:10 UTC
[1/2] camel git commit: Do not import spring boot when using spring-dm
Repository: camel
Updated Branches:
refs/heads/master b59e54fe2 -> f941567b9
Do not import spring boot when using spring-dm
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f941567b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f941567b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f941567b
Branch: refs/heads/master
Commit: f941567b93bcb0adf34de7014b87841ca85ced1e
Parents: 9277618
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 6 15:52:06 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 6 15:56:04 2016 +0200
----------------------------------------------------------------------
components/camel-spring-dm/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f941567b/components/camel-spring-dm/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/pom.xml b/components/camel-spring-dm/pom.xml
index 7f17a62..814fa16 100644
--- a/components/camel-spring-dm/pom.xml
+++ b/components/camel-spring-dm/pom.xml
@@ -40,6 +40,7 @@
!org.apache.camel.core.osgi*,
!org.apache.camel.core.xml*,
!org.apache.camel.osgi.*,
+ !org.springframework.boot.*,
org.apache.camel.*;${camel.osgi.import.strict.version},
org.springframework.osgi.*;version="[1.2,2)",
org.springframework*;version="${spring-dm-version-range}",
[2/2] camel git commit: CAMEL-10127: call parent constructor of
OsgiDefaultCamelContext with registry
Posted by da...@apache.org.
CAMEL-10127: call parent constructor of OsgiDefaultCamelContext with registry
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92776186
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92776186
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92776186
Branch: refs/heads/master
Commit: 92776186ced27ace33c8a67571ac932a17d03034
Parents: b59e54f
Author: B�rcs�k J�zsef <bo...@sch.bme.hu>
Authored: Wed Jul 6 11:59:15 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 6 15:56:04 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/92776186/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
index 0c5e782..a4c13cd 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
@@ -35,10 +35,11 @@ public class OsgiDefaultCamelContext extends DefaultCamelContext {
private final Registry registry;
public OsgiDefaultCamelContext(BundleContext bundleContext) {
- this(bundleContext, null);
+ this(bundleContext, new OsgiServiceRegistry(bundleContext));
}
public OsgiDefaultCamelContext(BundleContext bundleContext, Registry registry) {
+ super(registry);
this.bundleContext = bundleContext;
this.registry = registry;
OsgiCamelContextHelper.osgiUpdate(this, bundleContext);