camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1291879 - in /camel/branches/camel-2.9.x: ./ components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Date Tue, 21 Feb 2012 15:41:19 GMT
Author: ningjiang
Date: Tue Feb 21 15:41:18 2012
New Revision: 1291879

URL: http://svn.apache.org/viewvc?rev=1291879&view=rev
Log:
Merged revisions 1291864 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1291864 | ningjiang | 2012-02-21 23:24:25 +0800 (Tue, 21 Feb 2012) | 1 line
  
  CAMEL-5010 removed the log of OSGi environment not detected
........

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 Tue Feb 21 15:41:18 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864

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=1291879&r1=1291878&r2=1291879&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
Tue Feb 21 15:41:18 2012
@@ -143,9 +143,7 @@ public class CamelNamespaceHandler exten
         }
         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));
     }



Mime
View raw message