Author: ningjiang
Date: Fri Mar 13 05:06:35 2009
New Revision: 753115
URL: http://svn.apache.org/viewvc?rev=753115&view=rev
Log:
Merged revisions 753101 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r753101 | ningjiang | 2009-03-13 11:36:40 +0800 (Fri, 13 Mar 2009) | 1 line
CAMEL-1456 supporting to create a default camel context in OSGi platefrom
........
Added:
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
- copied, changed from r753101,
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
Modified:
camel/branches/camel-1.x/ (props changed)
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 05:06:35 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Copied:
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
(from r753101,
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java?p2=camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java&p1=camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java&r1=753101&r2=753115&rev=753115&view=diff
==============================================================================
---
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
(original)
+++
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
Fri Mar 13 05:06:35 2009
@@ -27,6 +27,7 @@
import org.apache.camel.impl.converter.AnnotationTypeConverterLoader;
import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.impl.converter.TypeConverterLoader;
+import org.apache.camel.util.ResolverUtil;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
@@ -48,8 +49,7 @@
public DefaultCamelContext createContext() {
DefaultCamelContext context = new DefaultCamelContext();
- if (bundleContext != null) {
- context.setPackageScanClassResolver(new
OsgiPackageScanClassResolver(bundleContext));
+ if (bundleContext != null) {
context.setComponentResolver(new OsgiComponentResolver());
context.setLanguageResolver(new OsgiLanguageResolver());
addOsgiAnnotationTypeConverterLoader(context, bundleContext);
@@ -59,6 +59,18 @@
return context;
}
+ /**
+ * The factory method for create the ResolverUtil
+ * @return a new instance of ResolverUtil
+ */
+ protected ResolverUtil createResolverUtil() {
+ if (bundleContext != null) {
+ return new OsgiResolverUtil(bundleContext);
+ } else {
+ return new ResolverUtil();
+ }
+ }
+
protected void addOsgiAnnotationTypeConverterLoader(DefaultCamelContext
context, BundleContext bundleContext) {
DefaultTypeConverter typeConverter = (DefaultTypeConverter)
context.getTypeConverter();
List<TypeConverterLoader> typeConverterLoaders =
typeConverter.getTypeConverterLoaders();
@@ -73,6 +85,6 @@
if (atLoader != null) {
typeConverterLoaders.remove(atLoader);
}
- typeConverterLoaders.add(new
OsgiAnnotationTypeConverterLoader(context.getPackageScanClassResolver()));
+ typeConverterLoaders.add(new
OsgiAnnotationTypeConverterLoader(bundleContext));
}
}
