Author: davsclaus
Date: Sun Mar 11 17:26:41 2012
New Revision: 1299400
URL: http://svn.apache.org/viewvc?rev=1299400&view=rev
Log:
CAMEL-5007: Fixed error handler with inlined redelivery policy to support Camel
property placeholders.
Added:
camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/component/properties/MyErrorBean.java
- copied unchanged from r1299383,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/MyErrorBean.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
- copied unchanged from r1299383,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
- copied unchanged from r1299383,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.xml
- copied unchanged from r1299383,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.xml
camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.xml
- copied unchanged from r1299383,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/properties/SpringErrorHandlerPropertiesPlaceholderTest.xml
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/ErrorHandlerDefinition.java
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 11 17:26:41 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383
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/ErrorHandlerDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java?rev=1299400&r1=1299399&r2=1299400&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
Sun Mar 11 17:26:41 2012
@@ -60,6 +60,6 @@ public class ErrorHandlerDefinition exte
@XmlAttribute
private String executorServiceRef;
@XmlElement
- private RedeliveryPolicyDefinition redeliveryPolicy;
+ private CamelRedeliveryPolicyFactoryBean redeliveryPolicy;
}
Modified:
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java?rev=1299400&r1=1299399&r2=1299400&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
Sun Mar 11 17:26:41 2012
@@ -22,7 +22,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.camel.processor.RedeliveryPolicy;
+import org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean;
import org.apache.camel.spring.ErrorHandlerType;
import org.apache.camel.util.ObjectHelper;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -35,7 +35,7 @@ import org.springframework.util.StringUt
* The DefinitionParser to deal with the ErrorHandler
*/
public class ErrorHandlerDefinitionParser extends BeanDefinitionParser {
- protected BeanDefinitionParser redeliveryPolicyParser = new
RedeliveryPolicyDefinitionParser(RedeliveryPolicy.class);
+ protected BeanDefinitionParser redeliveryPolicyParser = new
RedeliveryPolicyDefinitionParser(CamelRedeliveryPolicyFactoryBean.class);
public ErrorHandlerDefinitionParser() {
// need to override the default