You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/10 14:16:18 UTC
svn commit: r1431338 - in /camel/branches/camel-2.10.x: ./
components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
Author: davsclaus
Date: Thu Jan 10 13:16:18 2013
New Revision: 1431338
URL: http://svn.apache.org/viewvc?rev=1431338&view=rev
Log:
CAMEL-5949: XML DSL - Should not have default values in errorhandler
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
camel/branches/camel-2.10.x/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1431336
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java?rev=1431338&r1=1431337&r2=1431338&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java (original)
+++ camel/branches/camel-2.10.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java Thu Jan 10 13:16:18 2013
@@ -44,7 +44,7 @@ public class CamelErrorHandlerFactoryBea
@XmlAttribute
private String deadLetterUri;
@XmlAttribute
- private LoggingLevel level = LoggingLevel.ERROR;
+ private LoggingLevel level;
@XmlAttribute
private String logName;
@XmlAttribute
Modified: camel/branches/camel-2.10.x/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java?rev=1431338&r1=1431337&r2=1431338&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java (original)
+++ camel/branches/camel-2.10.x/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java Thu Jan 10 13:16:18 2013
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.camel.LoggingLevel;
import org.apache.camel.model.IdentifiedType;
-import org.apache.camel.model.RedeliveryPolicyDefinition;
/**
* The <errorHandler> tag element.
@@ -34,15 +33,15 @@ import org.apache.camel.model.Redelivery
@XmlRootElement(name = "errorHandler")
@XmlAccessorType(XmlAccessType.FIELD)
@SuppressWarnings("unused")
-public class ErrorHandlerDefinition extends IdentifiedType {
+public class ErrorHandlerDefinition extends IdentifiedType {
@XmlAttribute
private ErrorHandlerType type = ErrorHandlerType.DefaultErrorHandler;
@XmlAttribute
private String deadLetterUri;
@XmlAttribute
- private LoggingLevel level = LoggingLevel.ERROR;
+ private LoggingLevel level;
@XmlAttribute
- private LoggingLevel rollbackLoggingLevel = LoggingLevel.WARN;
+ private LoggingLevel rollbackLoggingLevel;
@XmlAttribute
private String logName;
@XmlAttribute