svn commit: r1345639 - /camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java

[davsclaus]

Author: davsclaus
Date: Sun Jun  3 09:48:03 2012
New Revision: 1345639

URL: http://svn.apache.org/viewvc?rev=1345639&view=rev
Log:
CAMEL-3547: Added bridge property placeholder between Spring and Camel, to make 
it easier to use Spring placeholders in Camel apps, without double 
configuration.

Modified:
    
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java

Modified: 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=1345639&r1=1345638&r2=1345639&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
 Sun Jun  3 09:48:03 2012
@@ -264,8 +264,8 @@ public class CamelContextFactoryBean ext
             }
             pc.setLocations(updatedLocations);
         } else if (beans.size() > 1) {
-            LOG.warn("Cannot bridge Camel and Spring property placeholders, as 
only exact 1 bean of type CamelSpringPropertyPlaceholderConfigurer"
-                    + " must be defined, was {} beans", beans.size());
+            LOG.warn("Cannot bridge Camel and Spring property placeholders, as 
exact only 1 bean of type BridgePropertyPlaceholderConfigurer"
+                    + " must be defined, was {} beans defined.", beans.size());
         }
     }