Author: davsclaus
Date: Tue Jan 15 17:05:35 2013
New Revision: 1433523
URL: http://svn.apache.org/viewvc?rev=1433523&view=rev
Log:
CAMEL-5973: Fixed property placeholder with blueprint and delegate not working
such as when using jasypt.
Added:
camel/branches/camel-2.10.x/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.java
- copied unchanged from r1433519,
camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.java
camel/branches/camel-2.10.x/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.java
- copied unchanged from r1433519,
camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.java
camel/branches/camel-2.10.x/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.java
- copied unchanged from r1433519,
camel/trunk/components/camel-jasypt/src/test/java/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.java
camel/branches/camel-2.10.x/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.xml
- copied unchanged from r1433519,
camel/trunk/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties2Test.xml
camel/branches/camel-2.10.x/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.xml
- copied unchanged from r1433519,
camel/trunk/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptProperties3Test.xml
camel/branches/camel-2.10.x/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.xml
- copied unchanged from r1433519,
camel/trunk/components/camel-jasypt/src/test/resources/org/apache/camel/component/jasypt/BlueprintJasyptPropertiesTest.xml
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-jasypt/pom.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1433519
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-jasypt/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jasypt/pom.xml?rev=1433523&r1=1433522&r2=1433523&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jasypt/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-jasypt/pom.xml Tue Jan 15
17:05:35 2013
@@ -56,7 +56,11 @@
<artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-blueprint</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>