svn commit: r1244863 - in /camel/branches/camel-2.9.x: ./ components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java

[davsclaus]

Author: davsclaus
Date: Thu Feb 16 07:08:51 2012
New Revision: 1244863

URL: http://svn.apache.org/viewvc?rev=1244863&view=rev
Log:
CAMEL-5010: Removed osgi environment detection logging as it has no value 
anymore, and also causes JBoss7 to do a WARN logging.

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 07:08:51 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=1244863&r1=1244862&r2=1244863&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
 Thu Feb 16 07:08:51 2012
@@ -122,26 +122,7 @@ public class CamelNamespaceHandler exten
         registerParser("errorHandler", errorHandlerParser);
         parserMap.put("errorHandler", errorHandlerParser);
 
-        // camel context
-        boolean osgi = false;
         Class cl = CamelContextFactoryBean.class;
-        try {
-            Class<?> c = Class.forName("org.apache.camel.osgi.Activator");
-            Method mth = c.getDeclaredMethod("getBundle");
-            Object bundle = mth.invoke(null);
-            if (bundle != null) {
-                cl = 
Class.forName("org.apache.camel.osgi.CamelContextFactoryBean");
-                osgi = true;
-            }
-        } catch (Throwable t) {
-            // not running with camel-osgi so we fallback to the regular 
factory bean
-            LOG.trace("Cannot find class so assuming not running in OSGi 
container: " + t.getMessage());
-        }
-        if (osgi) {
-            LOG.info("OSGi environment detected.");
-        } else {
-            LOG.info("OSGi environment not detected.");
-        }
         LOG.debug("Using {} as CamelContextBeanDefinitionParser", 
cl.getCanonicalName());
         registerParser("camelContext", new 
CamelContextBeanDefinitionParser(cl));
     }