This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0bdcab672599614397461591c601ba9d74e66548
Author: Luca Burgazzoli <lburgazz...@gmail.com>
AuthorDate: Mon Mar 8 16:45:15 2021 +0100
core: move route definition loaders to dsl artifacts
---
.../camel/impl/engine/SimpleCamelContext.java | 2 +-
.../services/org/apache/camel/xmlroutes-loader | 2 -
.../services/org/apache/camel/xmlroutes-loader | 2 -
.../services/org/apache/camel/xmlroutes-loader | 2 +
.../dsl/xml/io/XmlRoutesDefinitionLoader.java | 5 +-
dsl/camel-xml-jaxb-dsl/pom.xml | 10 ++++
.../services/org/apache/camel/xmlroutes-loader | 2 +
.../xml/jaxb/JaxbXmlRoutesDefinitionLoader.java | 5 +-
.../jaxb/definition}/CreateModelFromXmlTest.java | 2 +-
.../xml/jaxb/definition}/LoadRestFromXmlTest.java | 2 +-
.../xml/jaxb/definition}/LoadRouteFromXmlTest.java | 3 +-
.../LoadRouteFromXmlWithInterceptTest.java | 3 +-
.../LoadRouteFromXmlWithNamespaceTest.java | 3 +-
.../LoadRouteFromXmlWithOnExceptionTest.java | 3 +-
.../LoadRouteFromXmlWithPolicyTest.java | 3 +-
.../definition}/RouteTemplateLoadFromXmlTest.java | 2 +-
...ManagedCamelContextUpdateRoutesFromXmlTest.java | 2 +-
...RoutesWithPropertyPlaceholdersFromXmlPTest.java | 2 +-
.../ManagedRouteUpdateRouteFromXmlTest.java | 2 +-
.../xml/jaxb/management/ManagementTestSupport.java | 56 ++++++++++++++++++++++
.../xml/jaxb/definition}/barInterceptorRoute.xml | 0
.../xml/jaxb/definition}/barOnExceptionRoute.xml | 0
.../dsl/xml/jaxb/definition}/barPolicyRoute.xml | 0
.../camel/dsl/xml/jaxb/definition}/barRest.xml | 0
.../camel/dsl/xml/jaxb/definition}/barRoute.xml | 0
.../camel/dsl/xml/jaxb/definition}/barTemplate.xml | 0
.../xml/jaxb/definition}/routeWithNamespace.xml | 0
.../camel/dsl/xml/jaxb/definition}/simpleRoute.xml | 0
.../jaxb/definition}/simpleRouteWithNamespaces.xml | 0
dsl/pom.xml | 1 +
30 files changed, 94 insertions(+), 20 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index 057cd5a..58037db 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -439,7 +439,7 @@ public class SimpleCamelContext extends
AbstractCamelContext {
return result.get();
} else {
throw new IllegalArgumentException(
- "Cannot find ModelJAXBContextFactory on classpath. Add
either camel-xml-io or camel-xml-jaxb to classpath.");
+ "Cannot find XMLRoutesDefinitionLoader on classpath. Add
either camel-xml-io or camel-xml-jaxb to classpath.");
}
}
diff --git
a/core/camel-xml-io/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
b/core/camel-xml-io/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
deleted file mode 100644
index bfd59e0..0000000
---
a/core/camel-xml-io/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.xml.in.ModelParserXMLRoutesDefinitionLoader
diff --git
a/core/camel-xml-jaxb/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
b/core/camel-xml-jaxb/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
deleted file mode 100644
index f0e0768..0000000
---
a/core/camel-xml-jaxb/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.xml.jaxb.JaxbXMLRoutesDefinitionLoader
diff --git
a/dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
b/dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
new file mode 100644
index 0000000..0914600
--- /dev/null
+++
b/dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.dsl.xml.io.XmlRoutesDefinitionLoader
diff --git
a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/ModelParserXMLRoutesDefinitionLoader.java
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesDefinitionLoader.java
similarity index 93%
rename from
core/camel-xml-io/src/main/java/org/apache/camel/xml/in/ModelParserXMLRoutesDefinitionLoader.java
rename to
dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesDefinitionLoader.java
index fcdcfe9..4e857c0 100644
---
a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/ModelParserXMLRoutesDefinitionLoader.java
+++
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesDefinitionLoader.java
@@ -14,20 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.xml.in;
+package org.apache.camel.dsl.xml.io;
import java.io.InputStream;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.XMLRoutesDefinitionLoader;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.xml.in.ModelParser;
/**
* {@link XMLRoutesDefinitionLoader} that uses {@link ModelParser} to load and
parse the routes from XML which is fast
* and light-weight compared to the default that uses JAXB.
*/
@JdkService(XMLRoutesDefinitionLoader.FACTORY)
-public class ModelParserXMLRoutesDefinitionLoader implements
XMLRoutesDefinitionLoader {
+public class XmlRoutesDefinitionLoader implements XMLRoutesDefinitionLoader {
public static final String NAMESPACE =
"http://camel.apache.org/schema/spring";;
diff --git a/dsl/camel-xml-jaxb-dsl/pom.xml b/dsl/camel-xml-jaxb-dsl/pom.xml
index 71a40ec..68822a5 100644
--- a/dsl/camel-xml-jaxb-dsl/pom.xml
+++ b/dsl/camel-xml-jaxb-dsl/pom.xml
@@ -64,6 +64,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-management</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-direct</artifactId>
<scope>test</scope>
</dependency>
@@ -113,6 +118,11 @@
<artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git
a/dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
b/dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
new file mode 100644
index 0000000..c443dbe
--- /dev/null
+++
b/dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.dsl.xml.jaxb.JaxbXmlRoutesDefinitionLoader
diff --git
a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXMLRoutesDefinitionLoader.java
b/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesDefinitionLoader.java
similarity index 92%
rename from
core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXMLRoutesDefinitionLoader.java
rename to
dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesDefinitionLoader.java
index 2c7b46b..a28f0ad 100644
---
a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXMLRoutesDefinitionLoader.java
+++
b/dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesDefinitionLoader.java
@@ -14,20 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.xml.jaxb;
+package org.apache.camel.dsl.xml.jaxb;
import java.io.InputStream;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.XMLRoutesDefinitionLoader;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.xml.jaxb.JaxbHelper;
/**
* JAXB based {@link XMLRoutesDefinitionLoader}. This is the default loader
used historically by Camel. The camel-xml-io
* parser is a light-weight alternative.
*/
@JdkService(XMLRoutesDefinitionLoader.FACTORY)
-public class JaxbXMLRoutesDefinitionLoader implements
XMLRoutesDefinitionLoader {
+public class JaxbXmlRoutesDefinitionLoader implements
XMLRoutesDefinitionLoader {
@Override
public Object loadRoutesDefinition(CamelContext context, InputStream
inputStream) throws Exception {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java
similarity index 99%
rename from
core/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java
index 942362d..1a11ab5 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util;
+package org.apache.camel.dsl.xml.jaxb.definition;
import java.io.InputStream;
import java.util.Iterator;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRestFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java
similarity index 98%
rename from
core/camel-core/src/test/java/org/apache/camel/model/LoadRestFromXmlTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java
index 024cbc1..bb5b2ad 100644
---
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRestFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.model;
+package org.apache.camel.dsl.xml.jaxb.definition;
import java.io.InputStream;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java
similarity index 96%
rename from
core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java
index f3e01ac..48879d4 100644
---
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.model;
+package org.apache.camel.dsl.xml.jaxb.definition;
import java.io.InputStream;
@@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.model.RoutesDefinition;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithInterceptTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java
similarity index 95%
rename from
core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithInterceptTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java
index 6a34ff7..8dd0069 100644
---
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithInterceptTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.model;
+package org.apache.camel.dsl.xml.jaxb.definition;
import java.io.InputStream;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.model.RoutesDefinition;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithNamespaceTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java
similarity index 95%
rename from
core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithNamespaceTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java
index f9a43d6..42cc4c1 100644
---
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithNamespaceTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.model;
+package org.apache.camel.dsl.xml.jaxb.definition;
import java.io.InputStream;
@@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Route;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.model.RoutesDefinition;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithOnExceptionTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java
similarity index 96%
rename from
core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithOnExceptionTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java
index 3fa5274..7504a2e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithOnExceptionTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.model;
+package org.apache.camel.dsl.xml.jaxb.definition;
import java.io.InputStream;
@@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Processor;
+import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java
similarity index 97%
rename from
core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java
index 5a4a48d..3b62659 100644
---
a/core/camel-core/src/test/java/org/apache/camel/model/LoadRouteFromXmlWithPolicyTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.model;
+package org.apache.camel.dsl.xml.jaxb.definition;
import java.io.InputStream;
@@ -24,6 +24,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NamedNode;
import org.apache.camel.Processor;
import org.apache.camel.Route;
+import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.spi.Policy;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateLoadFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java
similarity index 98%
rename from
core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateLoadFromXmlTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java
index 2e80e9b..d29a737 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateLoadFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder;
+package org.apache.camel.dsl.xml.jaxb.definition;
import java.io.InputStream;
import java.util.HashMap;
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesFromXmlTest.java
similarity index 98%
rename from
core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesFromXmlTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesFromXmlTest.java
index 434cc7e..d8f7320 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesFromXmlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.management;
+package org.apache.camel.dsl.xml.jaxb.management;
import java.util.Set;
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
similarity index 99%
rename from
core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
index a4c6db0..c15a35e 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.management;
+package org.apache.camel.dsl.xml.jaxb.management;
import java.util.Properties;
import java.util.Set;
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteUpdateRouteFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedRouteUpdateRouteFromXmlTest.java
similarity index 99%
rename from
core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteUpdateRouteFromXmlTest.java
rename to
dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedRouteUpdateRouteFromXmlTest.java
index c5bc661..15d9283 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteUpdateRouteFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedRouteUpdateRouteFromXmlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.management;
+package org.apache.camel.dsl.xml.jaxb.management;
import java.util.Set;
diff --git
a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagementTestSupport.java
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagementTestSupport.java
new file mode 100644
index 0000000..5ac3de8
--- /dev/null
+++
b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagementTestSupport.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dsl.xml.jaxb.management;
+
+import java.io.IOException;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+
+import org.apache.camel.ContextTestSupport;
+
+/**
+ * Base class for JMX tests.
+ */
+public abstract class ManagementTestSupport extends ContextTestSupport {
+
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ protected MBeanServer getMBeanServer() {
+ return
context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <T> T invoke(MBeanServerConnection server, ObjectName name,
String operationName)
+ throws InstanceNotFoundException, MBeanException,
ReflectionException, IOException {
+ return (T) server.invoke(name, operationName, null, null);
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <T> T invoke(
+ MBeanServerConnection server, ObjectName name, String
operationName, Object[] params, String[] signature)
+ throws InstanceNotFoundException, MBeanException,
ReflectionException, IOException {
+ return (T) server.invoke(name, operationName, params, signature);
+ }
+}
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/model/barInterceptorRoute.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/model/barInterceptorRoute.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/model/barOnExceptionRoute.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barOnExceptionRoute.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/model/barOnExceptionRoute.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barOnExceptionRoute.xml
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/model/barPolicyRoute.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/model/barPolicyRoute.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/model/barRest.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/model/barRest.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRoute.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/model/barRoute.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRoute.xml
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/builder/barTemplate.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/builder/barTemplate.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/model/routeWithNamespace.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/routeWithNamespace.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/model/routeWithNamespace.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/routeWithNamespace.xml
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/util/simpleRoute.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRoute.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/util/simpleRoute.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRoute.xml
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/util/simpleRouteWithNamespaces.xml
b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRouteWithNamespaces.xml
similarity index 100%
rename from
core/camel-core/src/test/resources/org/apache/camel/util/simpleRouteWithNamespaces.xml
rename to
dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRouteWithNamespaces.xml
diff --git a/dsl/pom.xml b/dsl/pom.xml
index 0d4b9ea..086836f 100644
--- a/dsl/pom.xml
+++ b/dsl/pom.xml
@@ -167,6 +167,7 @@
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-format-plugin</artifactId>
+ <version>${project.version}</version>
</plugin>
</plugins>
</build>
