/[Apache-SVN]
ViewVC logotype

Revision 1410957


Jump to revision: Previous Next
Author: bvahdat
Date: Sun Nov 18 18:53:33 2012 UTC (11 years, 5 months ago)
Changed paths: 6
Log Message:
Merged revisions 1410955 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x

................
  r1410955 | bvahdat | 2012-11-18 19:43:22 +0100 (So, 18 Nov 2012) | 9 lines
  
  Merged revisions 1410952 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1410952 | bvahdat | 2012-11-18 19:39:21 +0100 (So, 18 Nov 2012) | 1 line
    
    CAMEL-5796: Fixed the resolvement of the property placeholder in combination with the transacted DSL. Thanks to Claus Ibsen for providing a better patch as well as the unit-test for the camel-core module. I also added two tests for the camel-spring module using the propertyPlaceholder and bridgePropertyPlaceholder variants, also polished a tiny generics stuff of the ProcessorDefinition.resolvePropertyPlaceholders() method.
  ........
................


Changed paths

Path Details
Directorycamel/branches/camel-2.9.x/ modified , props changed
Directorycamel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java modified , text changed
Directorycamel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/intercept/TransactedPropertyPlaceholderIssueTest.java
(Copied from camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/intercept/TransactedPropertyPlaceholderIssueTest.java, r1410955)
added
Directorycamel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.java
(Copied from camel/branches/camel-2.10.x/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.java, r1410955)
added
Directorycamel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml
(Copied from camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringPropertiesAfterTransactedDSLTest.xml, r1410955)
added
Directorycamel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/component/properties/myprop.properties modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26