svn commit: r1345638 - /camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml

[da...@apache.org]

Author: davsclaus
Date: Sun Jun  3 09:42:00 2012
New Revision: 1345638

URL: http://svn.apache.org/viewvc?rev=1345638&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/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml?rev=1345638&r1=1345637&r2=1345638&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml Sun Jun  3 09:42:00 2012
@@ -17,7 +17,6 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:p="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
@@ -26,7 +25,7 @@
   <!-- bridge spring property placeholder with Camel -->
   <!-- you must NOT use the <context:property-placeholder at the same time, only this bridge bean -->
   <bean id="bridgePropertyPlaceholder" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer">
-    <p:property name="location" value="classpath:org/apache/camel/component/properties/cheese.properties"/>
+    <property name="location" value="classpath:org/apache/camel/component/properties/cheese.properties"/>
   </bean>
 
   <!-- END SNIPPET: e1 -->
@@ -36,7 +35,7 @@
   <!-- a bean that uses Spring property placeholder -->
   <!-- the ${hi} is a spring property placeholder -->
   <bean id="hello" class="org.apache.camel.component.properties.HelloBean">
-    <p:property name="greeting" value="${hi}"/>
+    <property name="greeting" value="${hi}"/>
   </bean>
 
   <camelContext xmlns="http://camel.apache.org/schema/spring">