This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch mock
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c1ad871422c4409ece961d3319a0491a4924bd2c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Apr 15 09:44:55 2019 +0200
Move mock component out of camel-core. Work in progress.
---
.../main/java/org/apache/camel/builder/ExpressionClause.java | 2 +-
.../org/apache/camel/builder/ExpressionClauseSupport.java | 2 +-
.../src/main/java/org/apache/camel/builder/ValueBuilder.java | 2 +-
.../org/apache/camel/builder/xml/MessageVariableResolver.java | 10 +++++-----
.../main/java/org/apache/camel/builder/xml/XPathBuilder.java | 11 ++++++-----
.../apache/camel/builder/xml/DefaultNamespaceContextTest.java | 1 +
.../camel/builder/xml/ExtractXPathWithNamespaceTest.java | 1 +
.../xml/XPathHeaderNameResultTypeAndNamespaceTest.java | 1 +
.../camel/builder/xml/XPathNamespaceResultTypeTest.java | 1 +
.../java/org/apache/camel/builder/xml/XPathNamespaceTest.java | 1 +
.../apache/camel/builder/xml/XPathNestedNamespaceTest.java | 1 +
.../src/test/java/org/apache/camel/builder/xml/XPathTest.java | 1 +
.../camel/builder/xml/XPathWithNamespacesFromDomTest.java | 1 +
.../test/java/org/apache/camel/issues/SetHeaderIssueTest.java | 2 +-
.../java/org/apache/camel/language/XMLTokenSplitTest.java | 2 +-
.../language/tokenizer/XMLTokenizeLanguageGroupingTest.java | 2 +-
.../tokenizer/XMLTokenizeLanguageStreamingFileTest.java | 2 +-
.../language/tokenizer/XMLTokenizeLanguageStreamingTest.java | 2 +-
.../camel/language/tokenizer/XMLTokenizeLanguageTest.java | 2 +-
.../tokenizer/XMLTokenizeWrapLanguageGroupingTest.java | 2 +-
.../camel/language/tokenizer/XMLTokenizeWrapLanguageTest.java | 2 +-
.../apache/camel/processor/SplitGroupMultiXmlTokenTest.java | 2 +-
.../camel/processor/SplitGroupWrappedMultiXmlTokenTest.java | 2 +-
.../org/apache/camel/processor/SplitterWithXqureyTest.java | 2 +-
.../XPathWithNamespaceBuilderFilterAndResultTypeTest.java | 2 +-
.../camel/processor/XPathWithNamespaceBuilderFilterTest.java | 2 +-
.../apache/camel/processor/XPathWithNamespacesFilterTest.java | 2 +-
.../org/apache/camel/support}/builder/xml/Namespaces.java | 2 +-
28 files changed, 37 insertions(+), 28 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index c9b9521..7b89cab 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -24,7 +24,7 @@ import java.util.function.Supplier;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.model.ExpressionNode;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.support.ExpressionAdapter;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 56ae73e..fa515c4 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.model.language.ConstantExpression;
import org.apache.camel.model.language.ExchangePropertyExpression;
import org.apache.camel.model.language.ExpressionDefinition;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
b/core/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
index 2ebc165..dc50ec4 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.support.ExpressionToPredicateAdapter;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
b/core/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
index dff752e..8ae9914 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
@@ -27,11 +27,11 @@ import org.apache.camel.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.builder.xml.Namespaces.ENVIRONMENT_VARIABLES;
-import static org.apache.camel.builder.xml.Namespaces.EXCHANGE_PROPERTY;
-import static org.apache.camel.builder.xml.Namespaces.IN_NAMESPACE;
-import static org.apache.camel.builder.xml.Namespaces.OUT_NAMESPACE;
-import static
org.apache.camel.builder.xml.Namespaces.SYSTEM_PROPERTIES_NAMESPACE;
+import static
org.apache.camel.support.builder.xml.Namespaces.ENVIRONMENT_VARIABLES;
+import static
org.apache.camel.support.builder.xml.Namespaces.EXCHANGE_PROPERTY;
+import static org.apache.camel.support.builder.xml.Namespaces.IN_NAMESPACE;
+import static org.apache.camel.support.builder.xml.Namespaces.OUT_NAMESPACE;
+import static
org.apache.camel.support.builder.xml.Namespaces.SYSTEM_PROPERTIES_NAMESPACE;
/**
* A variable resolver for XPath expressions which support properties on the
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
b/core/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index 8fd8ebd..580abfd 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -61,6 +61,7 @@ import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.MessageHelper;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -68,11 +69,11 @@ import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.builder.xml.Namespaces.DEFAULT_NAMESPACE;
-import static org.apache.camel.builder.xml.Namespaces.FUNCTION_NAMESPACE;
-import static org.apache.camel.builder.xml.Namespaces.IN_NAMESPACE;
-import static org.apache.camel.builder.xml.Namespaces.OUT_NAMESPACE;
-import static
org.apache.camel.builder.xml.Namespaces.isMatchingNamespaceOrEmptyNamespace;
+import static
org.apache.camel.support.builder.xml.Namespaces.DEFAULT_NAMESPACE;
+import static
org.apache.camel.support.builder.xml.Namespaces.FUNCTION_NAMESPACE;
+import static org.apache.camel.support.builder.xml.Namespaces.IN_NAMESPACE;
+import static org.apache.camel.support.builder.xml.Namespaces.OUT_NAMESPACE;
+import static
org.apache.camel.support.builder.xml.Namespaces.isMatchingNamespaceOrEmptyNamespace;
/**
* Creates an XPath expression builder which creates a nodeset result by
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
index b445a24..bbb3023 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/DefaultNamespaceContextTest.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
public class DefaultNamespaceContextTest extends ContextTestSupport {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
index 4243ed5..e701ae0 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.xml;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
/**
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameResultTypeAndNamespaceTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameResultTypeAndNamespaceTest.java
index 79a12d6..1db0a10 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameResultTypeAndNamespaceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathHeaderNameResultTypeAndNamespaceTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.xml;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
/**
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceResultTypeTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceResultTypeTest.java
index f5001cd..30e0bb4 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceResultTypeTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceResultTypeTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.builder.xml;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.builder.xml.Namespaces;
/**
* XPath with namespace test
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceTest.java
index 522263a..6f587db 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNamespaceTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder.xml;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
/**
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNestedNamespaceTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNestedNamespaceTest.java
index 0b4787d..73af8d8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNestedNamespaceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathNestedNamespaceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.xml;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
public class XPathNestedNamespaceTest extends ContextTestSupport {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
index 22c1a96..7a3dbe0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
@@ -41,6 +41,7 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.util.StringHelper;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
index 92120b9..91fc2b2 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
@@ -20,6 +20,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
public class XPathWithNamespacesFromDomTest extends ContextTestSupport {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
index 8a66e40..a37728b 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
index b313aa0..342f85d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.language;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
index c5b88d2..b9c147e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.language.tokenizer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java
index 4f23da9..e3316e3 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingFileTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.language.tokenizer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingTest.java
index b39fa28..add5d4f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageStreamingTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.language.tokenizer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
public class XMLTokenizeLanguageStreamingTest extends XMLTokenizeLanguageTest {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
index 01847c8..86c0958 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.language.tokenizer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageGroupingTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageGroupingTest.java
index f2c4038..50c33db 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageGroupingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageGroupingTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.language.tokenizer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
public class XMLTokenizeWrapLanguageGroupingTest extends ContextTestSupport {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageTest.java
index 282afc4..9419c0a 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeWrapLanguageTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.language.tokenizer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
public class XMLTokenizeWrapLanguageTest extends ContextTestSupport {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
index 0cf282e..e1d269d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
index 93be3aa..1414b7e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithXqureyTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithXqureyTest.java
index 121b272..0f29260 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithXqureyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithXqureyTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterAndResultTypeTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterAndResultTypeTest.java
index 195cf60..509330c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterAndResultTypeTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterAndResultTypeTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
public class XPathWithNamespaceBuilderFilterAndResultTypeTest extends
XPathWithNamespaceBuilderFilterTest {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
index 520fbb1..de50553 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
index 03cfbf7..22d9bf7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
b/core/camel-support/src/main/java/org/apache/camel/support/builder/xml/Namespaces.java
similarity index 98%
rename from
core/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
rename to
core/camel-support/src/main/java/org/apache/camel/support/builder/xml/Namespaces.java
index b08c461..d924daa 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/builder/xml/Namespaces.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder.xml;
+package org.apache.camel.support.builder.xml;
import java.util.HashMap;
import java.util.Map;
