Author: davsclaus
Date: Thu Jan 19 10:35:08 2012
New Revision: 1233272
URL: http://svn.apache.org/viewvc?rev=1233272&view=rev
Log:
CAMEL-4915: Serialization data format should use ClassResolver API from Camel
to work with other runtimes.
Added:
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MySerialBean.java
- copied unchanged from r1233269,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/MySerialBean.java
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/
- copied from r1233269,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/MySerialBean.java
- copied unchanged from r1233269,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/MySerialBean.java
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java
- copied unchanged from r1233269,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
camel/branches/camel-2.9.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 10:35:08 2012
@@ -1 +1 @@
-/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259
+/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 19 10:35:08 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259
+/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=1233272&r1=1233271&r2=1233272&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Thu Jan 19 10:35:08 2012
@@ -335,7 +335,7 @@ public final class IOConverter {
@Override
protected Class<?> resolveClass(ObjectStreamClass
objectStreamClass) throws IOException, ClassNotFoundException {
// need to let Camel be able to resolve class using
ClassResolver SPI, to let class loading
- // work in OSGi and other runtimes
+ // work in OSGi and other containers
Class<?> answer = null;
String name = objectStreamClass.getName();
if (exchange != null) {
Modified:
camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java?rev=1233272&r1=1233271&r2=1233272&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
Thu Jan 19 10:35:08 2012
@@ -39,10 +39,12 @@ public class OsgiClassResolver extends D
}
public Class<?> resolveClass(String name) {
+ LOG.trace("Resolve class {}", name);
name = ObjectHelper.normalizeClassName(name);
Class<?> clazz = ObjectHelper.loadSimpleType(name);
if (clazz == null) {
clazz = doLoadClass(name, bundleContext.getBundle());
+ LOG.trace("Loading class {} using BundleContext {} -> {}", new
Object[]{name, bundleContext.getBundle(), clazz});
}
return clazz;
}
Propchange: camel/branches/camel-2.9.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 10:35:08 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027,1228223,1228879,1232782,1232834,1233259
+/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027,1228223,1228879,1232782,1232834,1233259,1233269
