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 4587d4ccde505f05085d0f9ecb4aacce46b3ffd3 Author: Luca Burgazzoli <[email protected]> AuthorDate: Tue Mar 9 15:55:25 2021 +0100 dsl: refactor camel-xml-jaxb-dsl tests --- dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml | 343 +++++++++++++++++++++ .../cdi}/RouteDefinitionsFromXmlTest.java | 4 +- .../src/test/resources/camel-context-routes.xml} | 15 +- .../cdi/src/test/resources/log4j2-test.properties | 31 ++ .../definition}/pom.xml | 32 +- .../jaxb/definition/CreateModelFromXmlTest.java | 0 .../xml/jaxb/definition/LoadRestFromXmlTest.java | 0 .../xml/jaxb/definition/LoadRouteFromXmlTest.java | 0 .../LoadRouteFromXmlWithInterceptTest.java | 0 .../LoadRouteFromXmlWithNamespaceTest.java | 0 .../LoadRouteFromXmlWithOnExceptionTest.java | 0 .../definition/LoadRouteFromXmlWithPolicyTest.java | 0 .../definition/RouteTemplateLoadFromXmlTest.java | 0 .../src/test/resources/log4j2-test.properties | 31 ++ .../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 .../dsl/xml/jaxb/definition/routeWithNamespace.xml | 0 .../camel/dsl/xml/jaxb/definition/simpleRoute.xml | 0 .../jaxb/definition/simpleRouteWithNamespaces.xml | 0 .../management}/pom.xml | 32 +- ...ManagedCamelContextUpdateRoutesFromXmlTest.java | 0 ...RoutesWithPropertyPlaceholdersFromXmlPTest.java | 0 .../ManagedRouteUpdateRouteFromXmlTest.java | 0 .../xml/jaxb/management/ManagementTestSupport.java | 0 .../src/test/resources/log4j2-test.properties | 31 ++ .../pom.xml} | 40 +-- dsl/camel-xml-jaxb-dsl/pom.xml | 5 - dsl/pom.xml | 1 + 32 files changed, 482 insertions(+), 83 deletions(-) diff --git a/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml b/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml new file mode 100644 index 0000000..68e89bd --- /dev/null +++ b/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml @@ -0,0 +1,343 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>camel-xml-jaxb-dsl-test</artifactId> + <version>3.9.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-xml-jaxb-dsl-test-cdi</artifactId> + <packaging>jar</packaging> + <name>Camel :: XML DSL Jaxb :: Test :: CDI</name> + <description>Camel XML DSL Tests with Jaxb and CDI</description> + + <properties> + <firstVersion>3.9.0</firstVersion> + </properties> + + <dependencyManagement> + <dependencies> + + <!-- test dependencies --> + + <dependency> + <groupId>org.jboss.shrinkwrap.descriptors</groupId> + <artifactId>shrinkwrap-descriptors-bom</artifactId> + <version>${shrinkwrap-descriptors-version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-bom</artifactId> + <version>${arquillian-version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + </dependencies> + </dependencyManagement> + <dependencies> + <!-- compile dependencies --> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-xml-jaxb-dsl</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-cdi</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-main</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-mock</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-bean</artifactId> + </dependency> + + <!-- DeltaSpike is only used to provide Main support thus optional --> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-api</artifactId> + <version>${deltaspike-version}</version> + <optional>true</optional> + </dependency> + + <!-- provided dependencies --> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core-xml</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-xml-jaxb</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <version>${jta-api-1.2-version}</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + + <!-- test dependencies --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-cloud</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-seda</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-direct</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-rest</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-ref</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <version>${slf4j-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <version>${arquillian-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.descriptors</groupId> + <artifactId>shrinkwrap-descriptors-depchain</artifactId> + <type>pom</type> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.camel</groupId> + <artifactId>camel-package-maven-plugin</artifactId> + <executions> + <execution> + <id>jaxb-list</id> + <goals> + <goal>generate-jaxb-list</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-generated-resources-jaxb</id> + <goals> + <goal>resources</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <resources> + <resource> + <directory>${basedir}/target/generated/camel/jaxb</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>weld-3.0</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + + <dependencies> + + <!-- provided dependencies --> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${cdi-api-2.0-version}</version> + <scope>provided</scope> + </dependency> + + <!-- test dependencies --> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-impl</artifactId> + <version>${weld3-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <version>${arquillian-weld-embedded-version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + </profile> + + + <profile> + <id>owb-1.0</id> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*Cdi12Test.java</exclude> + <exclude>**/*Cdi20Test.java</exclude> + <!-- OWB does not call the InjectionTarget#preDestroy method --> + <exclude>**/UnstoppedCamelContext*Test.java</exclude> + <!-- Reactivate when OWB-1155 is fixed --> + <exclude>**/ProgrammaticLookupTest.java</exclude> + <!-- Reactivate when OWB-1126 is fixed --> + <exclude>**/Xml*Test.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + + <!-- provided dependencies --> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_1.0_spec</artifactId> + <version>${geronimo-jcdi-1.0-spec-version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>${geronimo-atinject-1.0-spec-version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_1.1_spec</artifactId> + <version>${geronimo-interceptor-1.1-spec-version}</version> + <scope>provided</scope> + </dependency> + + <!-- test dependencies --> + + <dependency> + <groupId>org.apache.openwebbeans.arquillian</groupId> + <artifactId>owb-arquillian-standalone</artifactId> + <version>${openwebbeans1-version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-impl</artifactId> + <version>${openwebbeans1-version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + </profile> + </profiles> + +</project> \ No newline at end of file diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RouteDefinitionsFromXmlTest.java b/dsl/camel-xml-jaxb-dsl-test/cdi/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/cdi/RouteDefinitionsFromXmlTest.java similarity index 95% rename from components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RouteDefinitionsFromXmlTest.java rename to dsl/camel-xml-jaxb-dsl-test/cdi/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/cdi/RouteDefinitionsFromXmlTest.java index 340873b..9faa01c 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RouteDefinitionsFromXmlTest.java +++ b/dsl/camel-xml-jaxb-dsl-test/cdi/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/cdi/RouteDefinitionsFromXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.cdi.test; +package org.apache.camel.dsl.xml.jaxb.definition.cdi; import java.io.InputStream; import java.util.concurrent.TimeUnit; @@ -75,6 +75,6 @@ public class RouteDefinitionsFromXmlTest { inbound.sendBody("test"); - assertIsSatisfied(2L, TimeUnit.SECONDS, outbound); + MockEndpoint.assertIsSatisfied(2L, TimeUnit.SECONDS, outbound); } } diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml b/dsl/camel-xml-jaxb-dsl-test/cdi/src/test/resources/camel-context-routes.xml similarity index 72% copy from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml copy to dsl/camel-xml-jaxb-dsl-test/cdi/src/test/resources/camel-context-routes.xml index c7dbf76..e018d51 100644 --- a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml +++ b/dsl/camel-xml-jaxb-dsl-test/cdi/src/test/resources/camel-context-routes.xml @@ -17,15 +17,14 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> +<routes xmlns="http://camel.apache.org/schema/spring"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://camel.apache.org/schema/spring + http://camel.apache.org/schema/spring/camel-spring.xsd";> - <route id="bar"> - <from uri="direct:bar"/> - <intercept> - <to uri="log:intercept"/> - <to uri="mock:intercept"/> - </intercept> - <to uri="mock:bar"/> + <route> + <from uri="direct:inbound"/> + <to uri="mock:outbound"/> </route> </routes> diff --git a/dsl/camel-xml-jaxb-dsl-test/cdi/src/test/resources/log4j2-test.properties b/dsl/camel-xml-jaxb-dsl-test/cdi/src/test/resources/log4j2-test.properties new file mode 100644 index 0000000..f37e573 --- /dev/null +++ b/dsl/camel-xml-jaxb-dsl-test/cdi/src/test/resources/log4j2-test.properties @@ -0,0 +1,31 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-xml-jaxb-dsl-test-cdi.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n + +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n + +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file +#rootLogger.appenderRef.out.ref = out diff --git a/dsl/camel-xml-jaxb-dsl/pom.xml b/dsl/camel-xml-jaxb-dsl-test/definition/pom.xml similarity index 86% copy from dsl/camel-xml-jaxb-dsl/pom.xml copy to dsl/camel-xml-jaxb-dsl-test/definition/pom.xml index 68822a5..d8fe37d 100644 --- a/dsl/camel-xml-jaxb-dsl/pom.xml +++ b/dsl/camel-xml-jaxb-dsl-test/definition/pom.xml @@ -24,14 +24,14 @@ <parent> <groupId>org.apache.camel</groupId> - <artifactId>dsl</artifactId> + <artifactId>camel-xml-jaxb-dsl-test</artifactId> <version>3.9.0-SNAPSHOT</version> </parent> - <artifactId>camel-xml-jaxb-dsl</artifactId> + <artifactId>camel-xml-jaxb-dsl-test-definition</artifactId> <packaging>jar</packaging> - <name>Camel :: XML DSL with camel-xml-jaxb</name> - <description>Camel XML DSL with camel-xml-jaxb</description> + <name>Camel :: XML DSL Jaxb :: Test :: Definition</name> + <description>Camel XML DSL Tests with Jaxb and Definition</description> <properties> <firstVersion>3.9.0</firstVersion> @@ -40,15 +40,15 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> + <artifactId>camel-xml-jaxb-dsl</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> + <artifactId>camel-support</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-xml-jaxb</artifactId> + <artifactId>camel-core-model</artifactId> </dependency> <dependency> @@ -141,24 +141,6 @@ </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-spi</id> - <goals> - <goal>generate-spi</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <!-- skip testing on java 8 --> <profiles> <profile> diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/CreateModelFromXmlTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java diff --git a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/log4j2-test.properties b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/log4j2-test.properties new file mode 100644 index 0000000..dd31b6e --- /dev/null +++ b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/log4j2-test.properties @@ -0,0 +1,31 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-xml-jaxb-dsl-test-definition.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n + +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n + +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file +#rootLogger.appenderRef.out.ref = out diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barOnExceptionRoute.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barOnExceptionRoute.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barOnExceptionRoute.xml rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barOnExceptionRoute.xml diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml similarity index 100% copy from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml copy to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRoute.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRoute.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRoute.xml rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRoute.xml diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/routeWithNamespace.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/routeWithNamespace.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/routeWithNamespace.xml rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/routeWithNamespace.xml diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRoute.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRoute.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRoute.xml rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRoute.xml diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRouteWithNamespaces.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRouteWithNamespaces.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRouteWithNamespaces.xml rename to dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/simpleRouteWithNamespaces.xml diff --git a/dsl/camel-xml-jaxb-dsl/pom.xml b/dsl/camel-xml-jaxb-dsl-test/management/pom.xml similarity index 86% copy from dsl/camel-xml-jaxb-dsl/pom.xml copy to dsl/camel-xml-jaxb-dsl-test/management/pom.xml index 68822a5..ef14996 100644 --- a/dsl/camel-xml-jaxb-dsl/pom.xml +++ b/dsl/camel-xml-jaxb-dsl-test/management/pom.xml @@ -24,14 +24,14 @@ <parent> <groupId>org.apache.camel</groupId> - <artifactId>dsl</artifactId> + <artifactId>camel-xml-jaxb-dsl-test</artifactId> <version>3.9.0-SNAPSHOT</version> </parent> - <artifactId>camel-xml-jaxb-dsl</artifactId> + <artifactId>camel-xml-jaxb-dsl-test-managemenr</artifactId> <packaging>jar</packaging> - <name>Camel :: XML DSL with camel-xml-jaxb</name> - <description>Camel XML DSL with camel-xml-jaxb</description> + <name>Camel :: XML DSL Jaxb :: Test :: Management</name> + <description>Camel XML DSL Tests with Jaxb and Management</description> <properties> <firstVersion>3.9.0</firstVersion> @@ -40,15 +40,15 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-support</artifactId> + <artifactId>camel-xml-jaxb-dsl</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-core-model</artifactId> + <artifactId>camel-support</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-xml-jaxb</artifactId> + <artifactId>camel-core-model</artifactId> </dependency> <dependency> @@ -141,24 +141,6 @@ </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-spi</id> - <goals> - <goal>generate-spi</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <!-- skip testing on java 8 --> <profiles> <profile> diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesFromXmlTest.java b/dsl/camel-xml-jaxb-dsl-test/management/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesFromXmlTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesFromXmlTest.java rename to dsl/camel-xml-jaxb-dsl-test/management/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesFromXmlTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java b/dsl/camel-xml-jaxb-dsl-test/management/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java rename to dsl/camel-xml-jaxb-dsl-test/management/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedRouteUpdateRouteFromXmlTest.java b/dsl/camel-xml-jaxb-dsl-test/management/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedRouteUpdateRouteFromXmlTest.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedRouteUpdateRouteFromXmlTest.java rename to dsl/camel-xml-jaxb-dsl-test/management/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagedRouteUpdateRouteFromXmlTest.java 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-test/management/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagementTestSupport.java similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagementTestSupport.java rename to dsl/camel-xml-jaxb-dsl-test/management/src/test/java/org/apache/camel/dsl/xml/jaxb/management/ManagementTestSupport.java diff --git a/dsl/camel-xml-jaxb-dsl-test/management/src/test/resources/log4j2-test.properties b/dsl/camel-xml-jaxb-dsl-test/management/src/test/resources/log4j2-test.properties new file mode 100644 index 0000000..c7d86cb --- /dev/null +++ b/dsl/camel-xml-jaxb-dsl-test/management/src/test/resources/log4j2-test.properties @@ -0,0 +1,31 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-xml-jaxb-dsl-test-management.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n + +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n + +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file +#rootLogger.appenderRef.out.ref = out diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml b/dsl/camel-xml-jaxb-dsl-test/pom.xml similarity index 52% rename from dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml rename to dsl/camel-xml-jaxb-dsl-test/pom.xml index f7ce1ad..9d1bf63 100644 --- a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml +++ b/dsl/camel-xml-jaxb-dsl-test/pom.xml @@ -17,21 +17,25 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring";> - - <route id="foo"> - <from uri="direct:start"/> - <policy ref="foo"> - <to uri="mock:foo"/> - <to uri="mock:bar"/> - <to uri="mock:result"/> - </policy> - </route> - - <route id="bar"> - <from uri="direct:send"/> - <to uri="direct:start"/> - <to uri="mock:response"/> - </route> - -</routes> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>dsl</artifactId> + <version>3.9.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-xml-jaxb-dsl-test</artifactId> + <packaging>pom</packaging> + + <name>Camel :: XML DSL Jaxb :: Tests</name> + <description>Camel XML DSL Tests with camel-xml-jaxb</description> + + <modules> + <module>definition</module> + <module>management</module> + <module>cdi</module> + </modules> +</project> diff --git a/dsl/camel-xml-jaxb-dsl/pom.xml b/dsl/camel-xml-jaxb-dsl/pom.xml index 68822a5..758a305 100644 --- a/dsl/camel-xml-jaxb-dsl/pom.xml +++ b/dsl/camel-xml-jaxb-dsl/pom.xml @@ -64,11 +64,6 @@ </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> diff --git a/dsl/pom.xml b/dsl/pom.xml index 7f53a34..bcea21e 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -37,6 +37,7 @@ <module>camel-java-joor-dsl</module> <module>camel-xml-io-dsl</module> <module>camel-xml-jaxb-dsl</module> + <module>camel-xml-jaxb-dsl-test</module> <module>camel-yaml-dsl</module> </modules>
