You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/01/13 04:40:18 UTC
[2/2] git commit: CAMEL-7129: Remove the CamelXsltResourceUri header
from xslt component
CAMEL-7129: Remove the CamelXsltResourceUri header from xslt component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ec54fa0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ec54fa0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ec54fa0
Branch: refs/heads/camel-2.11.x
Commit: 2ec54fa0c13ae65bdcccff764af081a79fcc05f9
Parents: dbaa2bc
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Jan 13 11:02:48 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Jan 13 11:36:58 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/xslt/XsltConstants.java | 3 +++
.../apache/camel/component/xslt/XsltEndpoint.java | 15 ++++-----------
.../xslt/XsltFromHeaderOverrideEndpointUriTest.java | 5 ++---
3 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ec54fa0/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java
index f5b12bc..1c76b41 100644
--- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java
+++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltConstants.java
@@ -21,6 +21,9 @@ package org.apache.camel.component.xslt;
*/
public final class XsltConstants {
+ @Deprecated
+ // XsltComponent don't support this message any more
+ // Please create the XsltEndpoint directly from the URI
public static final String XSLT_RESOURCE_URI = "CamelXsltResourceUri";
private XsltConstants() {
http://git-wip-us.apache.org/repos/asf/camel/blob/2ec54fa0/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
index cdff08c..c1ce513 100644
--- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
@@ -76,19 +76,12 @@ public class XsltEndpoint extends ProcessorEndpoint {
@Override
protected void onExchange(Exchange exchange) throws Exception {
- String newResourceUri = exchange.getIn().getHeader(XsltConstants.XSLT_RESOURCE_URI, String.class);
- if (newResourceUri != null) {
- exchange.getIn().removeHeader(XsltConstants.XSLT_RESOURCE_URI);
- LOG.trace("{} set to {} creating new endpoint to handle exchange", XsltConstants.XSLT_RESOURCE_URI, newResourceUri);
- XsltEndpoint newEndpoint = findOrCreateEndpoint(getEndpointUri(), newResourceUri);
- newEndpoint.onExchange(exchange);
- } else {
- if (!cacheStylesheet || cacheCleared) {
- loadResource(resourceUri);
- }
- super.onExchange(exchange);
+ if (!cacheStylesheet || cacheCleared) {
+ loadResource(resourceUri);
}
+ super.onExchange(exchange);
+
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/2ec54fa0/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
index 84668b3..0eb6c26 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFromHeaderOverrideEndpointUriTest.java
@@ -23,10 +23,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.junit.Ignore;
-/**
- *
- */
+@Ignore("CamelXsltComponent don't support XSLT_RESOURCE_URI header anymore")
public class XsltFromHeaderOverrideEndpointUriTest extends ContextTestSupport {
public void testSendMessageAndHaveItTransformed() throws Exception {