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 2020/02/11 09:35:27 UTC

[camel] branch master updated (3575e6b -> a1c4b82)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 3575e6b  CAMEL-14521: camel-bindy add icu4j to karaf features
     new 016dd68  Fixed kura tests as they load XML routes
     new a1c4b82  CAMEL-14399: OsgiDefaultCamelContext should init like camel-blueprint does. Thanks to Rob T for reporting.

The 2 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:
 components/camel-kura/pom.xml                                        | 5 +++++
 .../java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java     | 3 +++
 2 files changed, 8 insertions(+)


[camel] 02/02: CAMEL-14399: OsgiDefaultCamelContext should init like camel-blueprint does. Thanks to Rob T for reporting.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a1c4b82a31108cd23409d0ee6ca4edc5b809b291
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Feb 11 10:35:01 2020 +0100

    CAMEL-14399: OsgiDefaultCamelContext should init like camel-blueprint does. Thanks to Rob T for reporting.
---
 .../main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
index 188f043..9f85f73 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
@@ -29,6 +29,7 @@ public class OsgiDefaultCamelContext extends DefaultCamelContext {
     private final BundleContext bundleContext;
 
     public OsgiDefaultCamelContext(BundleContext bundleContext) {
+        super(false);
         this.bundleContext = bundleContext;
 
         // inject common osgi
@@ -41,6 +42,8 @@ public class OsgiDefaultCamelContext extends DefaultCamelContext {
         addLifecycleStrategy(repo1);
         // setup the application context classloader with the bundle classloader
         setApplicationContextClassLoader(new BundleDelegatingClassLoader(bundleContext.getBundle()));
+
+        init();
     }
 
     @Override


[camel] 01/02: Fixed kura tests as they load XML routes

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 016dd682a9d39e368e6f162b90d17cd2c17bf0c7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Feb 11 10:33:13 2020 +0100

    Fixed kura tests as they load XML routes
---
 components/camel-kura/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 8b98258..56febc4 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -87,6 +87,11 @@
 
         <dependency>
             <groupId>org.apache.camel</groupId>
+            <artifactId>camel-xml-jaxb</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
             <artifactId>camel-mock</artifactId>
             <scope>test</scope>
         </dependency>