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 2009/03/24 17:21:08 UTC
svn commit: r757881 - in /camel/branches/camel-1.x: ./
components/camel-osgi/src/main/java/org/apache/camel/osgi/
components/camel-xmpp/src/test/resources/
Author: ningjiang
Date: Tue Mar 24 16:21:02 2009
New Revision: 757881
URL: http://svn.apache.org/viewvc?rev=757881&view=rev
Log:
Merged revisions 757865 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r757865 | ningjiang | 2009-03-24 23:56:42 +0800 (Tue, 24 Mar 2009) | 1 line
Added some logs for debuging
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/ (props changed)
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 16:21:02 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,753101,753175,755136,755487,756313,756348,756870,757636,757693,757743
+/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,753175,755136,755487,756313,756348,756870,757636,757693,757743,757865
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/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?rev=757881&r1=757880&r2=757881&view=diff
==============================================================================
--- camel/branches/camel-1.x/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 Tue Mar 24 16:21:02 2009
@@ -28,6 +28,8 @@
import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.impl.converter.TypeConverterLoader;
import org.apache.camel.util.ResolverUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
@@ -36,7 +38,7 @@
* any spring application context involved.
*/
public class CamelContextFactory implements BundleContextAware {
-
+ protected static final transient Log LOG = LogFactory.getLog(CamelContextFactory.class);
private BundleContext bundleContext;
public BundleContext getBundleContext() {
@@ -49,7 +51,8 @@
public DefaultCamelContext createContext() {
DefaultCamelContext context = new DefaultCamelContext();
- if (bundleContext != null) {
+ if (bundleContext != null) {
+ LOG.debug("The bundle context is not be null, let's setup the Osgi resolvers");
context.setComponentResolver(new OsgiComponentResolver());
context.setLanguageResolver(new OsgiLanguageResolver());
addOsgiAnnotationTypeConverterLoader(context, bundleContext);
@@ -86,5 +89,6 @@
typeConverterLoaders.remove(atLoader);
}
typeConverterLoaders.add(new OsgiAnnotationTypeConverterLoader(bundleContext));
+ LOG.debug("added the OsgiAnnotationTypeConverterLoader");
}
}
Modified: camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java?rev=757881&r1=757880&r2=757881&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java (original)
+++ camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java Tue Mar 24 16:21:02 2009
@@ -30,13 +30,16 @@
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.util.FactoryFinder;
import org.apache.camel.util.ResolverUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
@XmlRootElement(name = "camelContext")
@XmlAccessorType(XmlAccessType.FIELD)
public class CamelContextFactoryBean extends org.apache.camel.spring.CamelContextFactoryBean implements BundleContextAware {
-
+ protected static final transient Log LOG = LogFactory.getLog(CamelContextFactoryBean.class);
+
@XmlTransient
private BundleContext bundleContext;
@@ -50,6 +53,7 @@
protected SpringCamelContext createContext() {
SpringCamelContext context = super.createContext();
+ LOG.debug("The bundle context is " + bundleContext);
if (bundleContext != null) {
context.setComponentResolver(new OsgiComponentResolver());
context.setLanguageResolver(new OsgiLanguageResolver());
@@ -85,8 +89,9 @@
}
if (atLoader != null) {
typeConverterLoaders.remove(atLoader);
- }
+ }
typeConverterLoaders.add(new OsgiAnnotationTypeConverterLoader(bundleContext));
+ LOG.debug("added the OsgiAnnotationTypeConverterLoader");
}
}
Propchange: camel/branches/camel-1.x/components/camel-xmpp/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 16:21:02 2009
@@ -1 +1 @@
-/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743
+/camel/trunk/components/camel-xmpp/src/test/resources:757693,757743,757865