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/08/11 08:42:30 UTC
[1/4] camel git commit: [CAMEL-10233] Lazy load
ModelJAXBContextFactory in SpringCamelContext
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x f01c5ebba -> 291ea10af
refs/heads/master 8a18e2849 -> 940fde21b
[CAMEL-10233] Lazy load ModelJAXBContextFactory in SpringCamelContext
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07394f36
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07394f36
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07394f36
Branch: refs/heads/master
Commit: 07394f36e2b1b9ee6cf0fb23a7b2c9bd2cf29e4d
Parents: 8a18e28
Author: James Netherton <ja...@gmail.com>
Authored: Wed Aug 10 17:23:12 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Aug 11 10:07:31 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/impl/DefaultCamelContext.java | 6 +++++-
.../main/java/org/apache/camel/spring/SpringCamelContext.java | 7 ++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/07394f36/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 3d0f13b..4391d57 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -3938,7 +3938,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
public ModelJAXBContextFactory getModelJAXBContextFactory() {
if (modelJAXBContextFactory == null) {
- modelJAXBContextFactory = new DefaultModelJAXBContextFactory();
+ modelJAXBContextFactory = createModelJAXBContextFactory();
}
return modelJAXBContextFactory;
}
@@ -4254,6 +4254,10 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
}
+ protected ModelJAXBContextFactory createModelJAXBContextFactory() {
+ return new DefaultModelJAXBContextFactory();
+ }
+
@Override
public String toString() {
return "CamelContext(" + getName() + ")";
http://git-wip-us.apache.org/repos/asf/camel/blob/07394f36/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
index 62b988f..1d160fd 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
@@ -24,6 +24,7 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.ProcessorEndpoint;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.ManagementMBeanAssembler;
+import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.Registry;
import org.apache.camel.spring.spi.ApplicationContextRegistry;
import org.apache.camel.spring.spi.SpringInjector;
@@ -68,7 +69,6 @@ public class SpringCamelContext extends DefaultCamelContext implements Initializ
public SpringCamelContext(ApplicationContext applicationContext) {
setApplicationContext(applicationContext);
- setModelJAXBContextFactory(new SpringModelJAXBContextFactory());
}
public static void setNoStart(boolean b) {
@@ -261,6 +261,11 @@ public class SpringCamelContext extends DefaultCamelContext implements Initializ
return new ApplicationContextRegistry(getApplicationContext());
}
+ @Override
+ protected ModelJAXBContextFactory createModelJAXBContextFactory() {
+ return new SpringModelJAXBContextFactory();
+ }
+
private void maybeStart() throws Exception {
// for example from unit testing we want to start Camel later and not when Spring framework
// publish a ContextRefreshedEvent
[2/4] camel git commit: CAMEL-10233: Make similar change for
camel-blueprint. This closes #1115
Posted by da...@apache.org.
CAMEL-10233: Make similar change for camel-blueprint. This closes #1115
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/940fde21
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/940fde21
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/940fde21
Branch: refs/heads/master
Commit: 940fde21b81443557ec87c79747cf24b30cb157c
Parents: 07394f3
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Aug 11 10:41:35 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Aug 11 10:41:35 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/blueprint/BlueprintCamelContext.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/940fde21/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
index f48245d..02c9082 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
@@ -31,6 +31,7 @@ import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.FactoryFinder;
+import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.Registry;
import org.apache.camel.util.LoadPropertiesException;
import org.osgi.framework.BundleContext;
@@ -69,8 +70,12 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
setLanguageResolver(new BlueprintLanguageResolver(bundleContext));
setDataFormatResolver(new BlueprintDataFormatResolver(bundleContext));
setApplicationContextClassLoader(new BundleDelegatingClassLoader(bundleContext.getBundle()));
+ }
+
+ @Override
+ protected ModelJAXBContextFactory createModelJAXBContextFactory() {
// must use classloader of the namespace handler
- setModelJAXBContextFactory(new BlueprintModelJAXBContextFactory(CamelNamespaceHandler.class.getClassLoader()));
+ return new BlueprintModelJAXBContextFactory(CamelNamespaceHandler.class.getClassLoader());
}
public BundleContext getBundleContext() {
[4/4] camel git commit: CAMEL-10233: Make similar change for
camel-blueprint. This closes #1115
Posted by da...@apache.org.
CAMEL-10233: Make similar change for camel-blueprint. This closes #1115
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/291ea10a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/291ea10a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/291ea10a
Branch: refs/heads/camel-2.17.x
Commit: 291ea10af6b7db09af7b427db8c5224af1711ea3
Parents: dfd4649
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Aug 11 10:41:35 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Aug 11 10:42:14 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/blueprint/BlueprintCamelContext.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/291ea10a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
index f48245d..02c9082 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
@@ -31,6 +31,7 @@ import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.FactoryFinder;
+import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.Registry;
import org.apache.camel.util.LoadPropertiesException;
import org.osgi.framework.BundleContext;
@@ -69,8 +70,12 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
setLanguageResolver(new BlueprintLanguageResolver(bundleContext));
setDataFormatResolver(new BlueprintDataFormatResolver(bundleContext));
setApplicationContextClassLoader(new BundleDelegatingClassLoader(bundleContext.getBundle()));
+ }
+
+ @Override
+ protected ModelJAXBContextFactory createModelJAXBContextFactory() {
// must use classloader of the namespace handler
- setModelJAXBContextFactory(new BlueprintModelJAXBContextFactory(CamelNamespaceHandler.class.getClassLoader()));
+ return new BlueprintModelJAXBContextFactory(CamelNamespaceHandler.class.getClassLoader());
}
public BundleContext getBundleContext() {
[3/4] camel git commit: [CAMEL-10233] Lazy load
ModelJAXBContextFactory in SpringCamelContext
Posted by da...@apache.org.
[CAMEL-10233] Lazy load ModelJAXBContextFactory in SpringCamelContext
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dfd46499
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dfd46499
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dfd46499
Branch: refs/heads/camel-2.17.x
Commit: dfd46499623b69335fdef1ab95d57408071b9c0c
Parents: f01c5eb
Author: James Netherton <ja...@gmail.com>
Authored: Wed Aug 10 17:23:12 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Aug 11 10:42:06 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/impl/DefaultCamelContext.java | 6 +++++-
.../main/java/org/apache/camel/spring/SpringCamelContext.java | 7 ++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dfd46499/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 871ed4a..80d7164 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -3823,7 +3823,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
public ModelJAXBContextFactory getModelJAXBContextFactory() {
if (modelJAXBContextFactory == null) {
- modelJAXBContextFactory = new DefaultModelJAXBContextFactory();
+ modelJAXBContextFactory = createModelJAXBContextFactory();
}
return modelJAXBContextFactory;
}
@@ -4139,6 +4139,10 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
}
+ protected ModelJAXBContextFactory createModelJAXBContextFactory() {
+ return new DefaultModelJAXBContextFactory();
+ }
+
@Override
public String toString() {
return "CamelContext(" + getName() + ")";
http://git-wip-us.apache.org/repos/asf/camel/blob/dfd46499/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
index 62b988f..1d160fd 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
@@ -24,6 +24,7 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.ProcessorEndpoint;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.ManagementMBeanAssembler;
+import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.Registry;
import org.apache.camel.spring.spi.ApplicationContextRegistry;
import org.apache.camel.spring.spi.SpringInjector;
@@ -68,7 +69,6 @@ public class SpringCamelContext extends DefaultCamelContext implements Initializ
public SpringCamelContext(ApplicationContext applicationContext) {
setApplicationContext(applicationContext);
- setModelJAXBContextFactory(new SpringModelJAXBContextFactory());
}
public static void setNoStart(boolean b) {
@@ -261,6 +261,11 @@ public class SpringCamelContext extends DefaultCamelContext implements Initializ
return new ApplicationContextRegistry(getApplicationContext());
}
+ @Override
+ protected ModelJAXBContextFactory createModelJAXBContextFactory() {
+ return new SpringModelJAXBContextFactory();
+ }
+
private void maybeStart() throws Exception {
// for example from unit testing we want to start Camel later and not when Spring framework
// publish a ContextRefreshedEvent