Author: davsclaus
Date: Mon Apr 12 04:59:08 2010
New Revision: 933094
URL: http://svn.apache.org/viewvc?rev=933094&view=rev
Log:
Fixed errorHandler tag and fixed spellings.
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
(contents, props changed)
- copied, changed from r933093,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefintionParserTest.java
Removed:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefintionParserTest.java
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java?rev=933094&r1=933093&r2=933094&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
Mon Apr 12 04:59:08 2010
@@ -16,19 +16,15 @@
*/
package org.apache.camel.spring;
-import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.LoggingLevel;
import org.apache.camel.model.IdentifiedType;
import org.apache.camel.model.RedeliveryPolicyDefinition;
-import org.apache.camel.model.config.PropertiesDefinition;
/**
* The <errorHandler> tag element.
@@ -52,7 +48,7 @@ public class ErrorHandlerDefinition exte
private String transactionManagerRef;
@XmlAttribute
private String onRedeliveryRef;
- @XmlElement(name = "redeliveryPolicy")
+ @XmlElement
private RedeliveryPolicyDefinition redeliveryPolicy;
}
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=933094&r1=933093&r2=933094&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Mon Apr 12 04:59:08 2010
@@ -57,7 +57,6 @@ import org.springframework.beans.factory
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.beans.factory.xml.ParserContext;
-
/**
* Camel namespace for the spring XML configuration file.
*/
@@ -70,7 +69,6 @@ public class CamelNamespaceHandler exten
private JAXBContext jaxbContext;
private Map<String, BeanDefinitionParser> parserMap = new HashMap<String,
BeanDefinitionParser>();
private Map<String, BeanDefinition> autoRegisterMap = new HashMap<String,
BeanDefinition>();
-
public static void renameNamespaceRecursive(Node node) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java?rev=933094&r1=933093&r2=933094&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
Mon Apr 12 04:59:08 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.spring.handler;
import org.w3c.dom.Attr;
@@ -38,8 +37,6 @@ import org.springframework.util.StringUt
*/
public class ErrorHandlerDefinitionParser extends BeanDefinitionParser {
- // TODO: use a FactoryBean instead to create a ErrorHandlerBuilder object
-
protected BeanDefinitionParser redeliveryPolicyParser = new
RedeliveryPolicyDefinitionParser(RedeliveryPolicy.class);
public ErrorHandlerDefinitionParser() {
@@ -57,10 +54,13 @@ public class ErrorHandlerDefinitionParse
}
protected boolean isEligibleAttribute(String attributeName) {
- return attributeName != null && !ID_ATTRIBUTE.equals(attributeName)
- && !attributeName.equals("xmlns") &&
!attributeName.startsWith("xmlns:")
+ if (attributeName == null || ID_ATTRIBUTE.equals(attributeName)) {
+ return false;
+ }
+ return !attributeName.equals("xmlns") &&
!attributeName.startsWith("xmlns:")
&& !attributeName.equals("type") &&
!attributeName.equals("onRedeliveryRef")
- && !attributeName.equals("transactionTemplateRef");
+ && !attributeName.equals("transactionTemplateRef")
+ && !attributeName.equals("transactionManagerRef");
}
@Override
Copied:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
(from r933093,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefintionParserTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefintionParserTest.java&r1=933093&r2=933094&rev=933094&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefintionParserTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
Mon Apr 12 04:59:08 2010
@@ -27,7 +27,7 @@ import org.apache.camel.spring.CamelCont
import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class ErrorHandlerDefintionParserTest extends TestCase {
+public class ErrorHandlerDefinitionParserTest extends TestCase {
protected ClassPathXmlApplicationContext ctx;
public void setUp() throws Exception {
@@ -74,7 +74,7 @@ public class ErrorHandlerDefintionParser
public void testDeadLetterErrorHandler() {
DeadLetterChannelBuilder errorHandler = (DeadLetterChannelBuilder)
ctx.getBean("deadLetterErrorHandler");
assertNotNull(errorHandler);
- assertEquals("get worng deadletteruri ", "log:dead",
errorHandler.getDeadLetterUri());
+ assertEquals("get worng deadletteruri", "log:dead",
errorHandler.getDeadLetterUri());
RedeliveryPolicy policy = errorHandler.getRedeliveryPolicy();
assertNotNull(policy);
assertEquals("Wrong maximumRedeliveries", 2,
policy.getMaximumRedeliveries());
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
