Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D31799BF for ; Thu, 16 Feb 2012 07:06:05 +0000 (UTC) Received: (qmail 43792 invoked by uid 500); 16 Feb 2012 07:06:05 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 43750 invoked by uid 500); 16 Feb 2012 07:06:04 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 43740 invoked by uid 99); 16 Feb 2012 07:06:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 07:06:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 07:06:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B1F0223888E7; Thu, 16 Feb 2012 07:05:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1244861 - /camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Date: Thu, 16 Feb 2012 07:05:41 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120216070541.B1F0223888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Thu Feb 16 07:05:41 2012 New Revision: 1244861 URL: http://svn.apache.org/viewvc?rev=1244861&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/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=1244861&r1=1244860&r2=1244861&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original) +++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Thu Feb 16 07:05:41 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)); }