You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/08/28 14:43:24 UTC
[1/3] git commit: CAMEL-7759 Using the TCCL as the default value of
ApplicationContextClassLoader in DefaultCamelContext
Repository: camel
Updated Branches:
refs/heads/master d62717e51 -> baf84ebff
CAMEL-7759 Using the TCCL as the default value of ApplicationContextClassLoader in DefaultCamelContext
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64f04205
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64f04205
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64f04205
Branch: refs/heads/master
Commit: 64f042054ac003d0a7a5bde6cb9fe90690f30f9d
Parents: d62717e
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Aug 28 20:11:48 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Aug 28 20:42:41 2014 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/impl/DefaultCamelContext.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/64f04205/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 666ee4a..2c36dc5 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
@@ -36,6 +36,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+
import javax.naming.Context;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
@@ -1782,8 +1783,13 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
private void doStartCamel() throws Exception {
if (applicationContextClassLoader == null) {
- // use the classloader that loaded this class
- setApplicationContextClassLoader(this.getClass().getClassLoader());
+ // Using the TCCL as the default value of ApplicationClassLoader
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ if (cl == null) {
+ // use the classloader that loaded this class
+ cl = this.getClass().getClassLoader();
+ }
+ setApplicationContextClassLoader(cl);
}
if (log.isDebugEnabled()) {
[2/3] git commit: CAMEL-7761 Setup the application context
classloader of OSGiDefaultCamelContext
Posted by ni...@apache.org.
CAMEL-7761 Setup the application context classloader of OSGiDefaultCamelContext
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2806bb16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2806bb16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2806bb16
Branch: refs/heads/master
Commit: 2806bb166f0884c50aa68cffacadde489cacfdda
Parents: 64f0420
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Aug 28 20:28:25 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Aug 28 20:42:42 2014 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2806bb16/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 7329a7b..a48b9d1 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
@@ -22,6 +22,7 @@ import java.util.Properties;
import org.apache.camel.TypeConverter;
import org.apache.camel.core.osgi.utils.BundleContextUtils;
+import org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Registry;
@@ -41,6 +42,8 @@ public class OsgiDefaultCamelContext extends DefaultCamelContext {
this.bundleContext = bundleContext;
this.registry = registry;
OsgiCamelContextHelper.osgiUpdate(this, bundleContext);
+ // setup the application context classloader with the bundle classloader
+ setApplicationContextClassLoader(new BundleDelegatingClassLoader(bundleContext.getBundle()));
}
@Override
[3/3] git commit: camel-kafka should use scala-2.10.x
Posted by ni...@apache.org.
camel-kafka should use scala-2.10.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/baf84ebf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/baf84ebf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/baf84ebf
Branch: refs/heads/master
Commit: baf84ebff70f74387c1f4c803ee7d5d59afa5292
Parents: 2806bb1
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Aug 28 20:33:16 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Aug 28 20:42:42 2014 +0800
----------------------------------------------------------------------
components/camel-kafka/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/baf84ebf/components/camel-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index c0a8908..e550b93 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala-version}</version>
+ <version>${scala-2.10-version}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/baf84ebf/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index e178f0f..2e6ca60 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -216,7 +216,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-castor/${project.version}</bundle>
</feature>
-<!-- TODO: Karaf does not yet support CDI seamless in the container
+<!-- TODO: Karaf does not yet support CDI seamless in the container
<feature name='camel-cdi' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle>
@@ -608,7 +608,7 @@
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<feature version='${project.version}'>camel-avro</feature>
<bundle>mvn:org.apache.camel/camel-infinispan/${project.version}</bundle>
- </feature>
+ </feature>
<feature name='camel-irc' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
@@ -635,7 +635,7 @@
<feature version='${jclouds-version}'>jclouds</feature>
<feature version='${jclouds-version}'>jclouds-blobstore</feature>
<feature version='${jclouds-version}'>jclouds-compute</feature>
- <feature version='${project.version}'>camel-core</feature>
+ <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jclouds/${project.version}</bundle>
</feature>
@@ -748,7 +748,7 @@
<bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle>
</feature>
<feature name='camel-kafka' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-version}</bundle>
+ <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-2.10-version}</bundle>
<bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.yammer.metrics/metrics-core/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}&Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle>
<bundle dependency='true'>wrap:mvn:com.yammer.metrics/metrics-annotation/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}&Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle>