This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a83eaaa0d01 CAMEL-20113: camel/tests consolidating (#12594)
a83eaaa0d01 is described below
commit a83eaaa0d01c684dd2be57f9bb2ad216f6fbe092
Author: Ivan Kulaga <kulagaivanandreev...@gmail.com>
AuthorDate: Wed Dec 27 01:41:58 2023 +0600
CAMEL-20113: camel/tests consolidating (#12594)
org.apache.camel.itest.jaxb:
-SpringLoadRouteFromXmlTest - moved to the camel-jaxb component;
-JaxbFallbackTypeConverterTest - moved to the camel-jaxb component;
org.apache.camel.itest.jetty:
-JettyBridgeHostHeaderIssueTest - moved to camel-jetty;
-JettyConstantSetHeaderTest - setting headers is checked in other
camel-jetty tests, so it is deleted;
-JettyFailoverRoundRobinTest - moved to camel-jetty;
-JettyJmsShutdownInProgressTest - jetty graceful shutdown is checked in
org.apache.camel.component.jetty.JettySuspendWhileInProgressTest, so it is
deleted;
-JettyJmsTest - test was made just to show example route, so it is deleted;
-JettyJmsTwowayTest - test was made just to show example route, so it is
deleted;
-JettyRestRedirectTest - moved to camel-jetty;
-JettySimpleSetHeaderTest - setting headers is checked in other camel-jetty
tests, so it is deleted;
-JettyValidatorStreamTest - moved to camel-jetty;
-JettyValidatorTest - moved to camel-jetty;
-JettyXsltHttpTemplateTest - moved to camel-jetty;
-JettyXsltTest - moved to camel-jetty;
---
.../camel/example}/SpringLoadRouteFromXmlTest.java | 6 +-
.../camel/jaxb/FallbackTypeConverterTest.java | 9 +--
.../org/apache/camel/example}/BarRoute.xml | 0
.../camel/example}/SpringLoadRouteFromXmlTest.xml | 0
.../jetty/JettyBridgeHostHeaderIssueTest.java | 2 +-
.../jetty/JettyFailoverRoundRobinTest.java | 2 +-
.../component}/jetty/JettyValidatorStreamTest.java | 2 +-
...alidatorStreamWithStreamCachingEnabledTest.java | 2 +-
.../camel/component}/jetty/JettyValidatorTest.java | 2 +-
.../jetty/JettyXsltHttpTemplateTest.java | 4 +-
.../camel/component}/jetty/JettyXsltTest.java | 9 ++-
.../jetty/SpringFailoverRoundRobinTest.java | 6 +-
.../jetty/rest/RestJettyRedirectTest.java | 4 +-
.../src/test/resources/OptimizationRequest.xsd | 0
.../camel/component}/jetty/InvalidRequest.xml | 0
.../jetty/JettySpringFailoverRoundRobinTest.xml | 0
.../apache/camel/component}/jetty/ValidRequest.xml | 0
.../org/apache/camel/component}/jetty/greeting.xsl | 0
.../apache/camel/component}/jetty/transform.xsl | 0
.../org/apache/camel/itest/jaxb/example/Bar.java | 52 -------------
.../itest/jetty/JettyConstantSetHeaderTest.java | 61 ---------------
.../jetty/JettyJmsShutdownInProgressTest.java | 89 ----------------------
.../org/apache/camel/itest/jetty/JettyJmsTest.java | 80 -------------------
.../camel/itest/jetty/JettyJmsTwowayTest.java | 61 ---------------
.../itest/jetty/JettySimpleSetHeaderTest.java | 61 ---------------
.../itest/jetty/SetExchangePatternProcessor.java | 36 ---------
.../camel/itest/jetty/SetResponseProcessor.java | 34 ---------
.../JettyJmsShutdownInProgressTest-context.xml | 52 -------------
.../camel/itest/jetty/JettyJmsTest-context.xml | 49 ------------
.../itest/jetty/JettyJmsTwowayTest-context.xml | 49 ------------
30 files changed, 24 insertions(+), 648 deletions(-)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringLoadRouteFromXmlTest.java
similarity index 94%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.java
rename to
components/camel-jaxb/src/test/java/org/apache/camel/example/SpringLoadRouteFromXmlTest.java
index 46c098f2ebf..47765d2abbc 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/example/SpringLoadRouteFromXmlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jaxb;
+package org.apache.camel.example;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.Unmarshaller;
@@ -36,7 +36,7 @@ public class SpringLoadRouteFromXmlTest extends
CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new
ClassPathXmlApplicationContext("org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.xml");
+ return new
ClassPathXmlApplicationContext("org/apache/camel/example/SpringLoadRouteFromXmlTest.xml");
}
@Test
@@ -54,7 +54,7 @@ public class SpringLoadRouteFromXmlTest extends
CamelSpringTestSupport {
JAXBContext jaxb = new
DefaultModelJAXBContextFactory().newJAXBContext();
Unmarshaller unmarshaller = jaxb.createUnmarshaller();
- Resource rs = new
ClassPathResource("org/apache/camel/itest/jaxb/BarRoute.xml");
+ Resource rs = new
ClassPathResource("org/apache/camel/example/BarRoute.xml");
Object value = unmarshaller.unmarshal(rs.getInputStream());
// it should be a RoutesDefinition (we can have multiple routes in the
same XML file)
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterTest.java
similarity index 92%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
rename to
components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterTest.java
index edb5a2ae973..2ba7563cda0 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterTest.java
@@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jaxb;
+package org.apache.camel.jaxb;
import java.io.InputStream;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxb.FallbackTypeConverter;
-import org.apache.camel.itest.jaxb.example.Bar;
+import org.apache.camel.example.Bar;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class JaxbFallbackTypeConverterTest extends CamelTestSupport {
+public class FallbackTypeConverterTest extends CamelTestSupport {
@Test
void testJaxbFallbackTypeConverter() {
@@ -37,7 +37,7 @@ public class JaxbFallbackTypeConverterTest extends
CamelTestSupport {
bar.setValue("cool");
String result = template.requestBody("direct:start", bar,
String.class);
assertNotNull(result);
- assertTrue(result.indexOf("<bar name=\"camel\" value=\"cool\"/>") > 0,
"Get a wrong xml string");
+ assertTrue(result.indexOf("<bar name=\"camel\" value=\"cool\"") > 0,
"Get a wrong xml string");
assertTrue(result.indexOf("><bar") > 0, "The pretty print setting is
not working");
}
@@ -59,5 +59,4 @@ public class JaxbFallbackTypeConverterTest extends
CamelTestSupport {
}
};
}
-
}
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jaxb/BarRoute.xml
b/components/camel-jaxb/src/test/resources/org/apache/camel/example/BarRoute.xml
similarity index 100%
rename from
tests/camel-itest/src/test/resources/org/apache/camel/itest/jaxb/BarRoute.xml
rename to
components/camel-jaxb/src/test/resources/org/apache/camel/example/BarRoute.xml
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.xml
b/components/camel-jaxb/src/test/resources/org/apache/camel/example/SpringLoadRouteFromXmlTest.xml
similarity index 100%
rename from
tests/camel-itest/src/test/resources/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.xml
rename to
components/camel-jaxb/src/test/resources/org/apache/camel/example/SpringLoadRouteFromXmlTest.xml
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java
similarity index 99%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java
index 5f89dea2731..8393e6f7683 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyFailoverRoundRobinTest.java
similarity index 99%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyFailoverRoundRobinTest.java
index 04a12982941..7e0db40a966 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyFailoverRoundRobinTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java
similarity index 98%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java
index 4ddc14b80f7..2baac48fb9b 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty;
import java.io.InputStream;
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
similarity index 98%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
index ea03984aa1b..31ed04ec820 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty;
import java.io.InputStream;
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java
similarity index 98%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java
index a2dff3097c3..ad004edc560 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty;
import java.io.InputStream;
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltHttpTemplateTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java
similarity index 95%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltHttpTemplateTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java
index 7ca49550192..3770b3da860 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltHttpTemplateTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
@@ -53,7 +53,7 @@ public class JettyXsltHttpTemplateTest extends
CamelTestSupport {
public void configure() {
from("jetty:http://0.0.0.0:"; + port + "/myxslt")
.pollEnrich(
-
"file://src/test/resources/org/apache/camel/itest/jetty/?fileName=transform.xsl&noop=true&readLock=none",
+
"file://src/test/resources/org/apache/camel/component/jetty/?fileName=transform.xsl&noop=true&readLock=none",
2000)
.convertBodyTo(String.class)
.to("log:transform");
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java
similarity index 88%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java
index 1cdacfd6572..bb662210d7a 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty;
import java.io.InputStream;
@@ -38,7 +38,8 @@ public class JettyXsltTest extends CamelTestSupport {
@Test
void testClasspath() {
String response
- =
template.requestBody("xslt:org/apache/camel/itest/jetty/greeting.xsl",
"<hello>Camel</hello>", String.class);
+ =
template.requestBody("xslt:org/apache/camel/component/jetty/greeting.xsl",
"<hello>Camel</hello>",
+ String.class);
assertEquals("<?xml version=\"1.0\"
encoding=\"UTF-8\"?><goodbye>Camel</goodbye>", response);
}
@@ -46,7 +47,7 @@ public class JettyXsltTest extends CamelTestSupport {
@Test
void testClasspathInvalidParameter() {
try {
-
template.requestBody("xslt:org/apache/camel/itest/jetty/greeting.xsl?name=greeting.xsl",
"<hello>Camel</hello>",
+
template.requestBody("xslt:org/apache/camel/component/jetty/greeting.xsl?name=greeting.xsl",
"<hello>Camel</hello>",
String.class);
fail("Should have thrown exception");
} catch (ResolveEndpointFailedException e) {
@@ -73,7 +74,7 @@ public class JettyXsltTest extends CamelTestSupport {
String name = exchange.getIn().getHeader("name",
String.class);
ObjectHelper.notNull(name, "name");
- name = "org/apache/camel/itest/jetty/" + name;
+ name = "org/apache/camel/component/jetty/" + name;
InputStream is
=
ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(),
name);
String xml =
exchange.getContext().getTypeConverter().convertTo(String.class, is);
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java
similarity index 93%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java
index 43c1458056a..0aa46d329d5 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
@@ -25,7 +25,7 @@ import
org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class JettySpringFailoverRoundRobinTest extends CamelSpringTestSupport {
+public class SpringFailoverRoundRobinTest extends CamelSpringTestSupport {
private static int port1 = AvailablePortFinder.getNextAvailable();
private static int port2 = AvailablePortFinder.getNextAvailable();
@@ -43,7 +43,7 @@ public class JettySpringFailoverRoundRobinTest extends
CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new
ClassPathXmlApplicationContext("org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml");
+ return new
ClassPathXmlApplicationContext("/org/apache/camel/component/jetty/JettySpringFailoverRoundRobinTest.xml");
}
@Test
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java
similarity index 95%
rename from
tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
rename to
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java
index d7f864e837b..43aadf5bc64 100644
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.jetty;
+package org.apache.camel.component.jetty.rest;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class JettyRestRedirectTest extends CamelTestSupport {
+public class RestJettyRedirectTest extends CamelTestSupport {
private int port;
diff --git a/tests/camel-itest/src/test/resources/OptimizationRequest.xsd
b/components/camel-jetty/src/test/resources/OptimizationRequest.xsd
similarity index 100%
rename from tests/camel-itest/src/test/resources/OptimizationRequest.xsd
rename to components/camel-jetty/src/test/resources/OptimizationRequest.xsd
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/InvalidRequest.xml
b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/InvalidRequest.xml
similarity index 100%
rename from
tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/InvalidRequest.xml
rename to
components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/InvalidRequest.xml
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml
b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettySpringFailoverRoundRobinTest.xml
similarity index 100%
rename from
tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml
rename to
components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettySpringFailoverRoundRobinTest.xml
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/ValidRequest.xml
b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/ValidRequest.xml
similarity index 100%
rename from
tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/ValidRequest.xml
rename to
components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/ValidRequest.xml
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/greeting.xsl
b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/greeting.xsl
similarity index 100%
rename from
tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/greeting.xsl
rename to
components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/greeting.xsl
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/transform.xsl
b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/transform.xsl
similarity index 100%
rename from
tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/transform.xsl
rename to
components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/transform.xsl
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/example/Bar.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/example/Bar.java
deleted file mode 100644
index c9e76afc10c..00000000000
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/example/Bar.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.itest.jaxb.example;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Bar {
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String value;
-
- public Bar() {
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public String getName() {
- return name;
- }
-
- public String getValue() {
- return value;
- }
-
-}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyConstantSetHeaderTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyConstantSetHeaderTest.java
deleted file mode 100644
index 2c86e170a42..00000000000
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyConstantSetHeaderTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.itest.jetty;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class JettyConstantSetHeaderTest extends CamelTestSupport {
-
- private int port;
-
- @Test
- void testJettyConstantSetHeader() throws Exception {
- getMockEndpoint("mock:before").message(0).header("beer").isNull();
-
- MockEndpoint result = getMockEndpoint("mock:result");
- result.expectedBodiesReceived("Hello World");
- result.message(0).header("beer").isEqualTo("Carlsberg");
-
- String reply = template.requestBody("http://localhost:"; + port +
"/beer", "Hello World", String.class);
- assertEquals("Bye World", reply);
-
- MockEndpoint.assertIsSatisfied(context);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
-
- return new RouteBuilder() {
- @Override
- public void configure() {
- from("jetty:http://localhost:"; + port + "/beer")
- .convertBodyTo(String.class)
- .to("mock:before")
- .setHeader("beer", constant("Carlsberg"))
- .to("mock:result")
- .transform(constant("Bye World"));
- }
- };
- }
-}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
deleted file mode 100644
index e50c634dacd..00000000000
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.itest.jetty;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.http.base.HttpOperationFailedException;
-import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-@CamelSpringTest
-@ContextConfiguration
-public class JettyJmsShutdownInProgressTest {
- @RegisterExtension
- public static JmsServiceExtension jmsServiceExtension =
JmsServiceExtension.createExtension();
-
- private static int port = AvailablePortFinder.getNextAvailable();
- private static final String URL = "http://localhost:"; + port +
"/JettyJmsShutdownInProgressTest";
- static {
- //set them as system properties so Spring can use the property
placeholder
- //things to set them into the URL's in the spring contexts
- System.setProperty("JettyJmsShutdownInProgressTest.port",
Integer.toString(port));
- }
-
- @Autowired
- protected CamelContext camelContext;
-
- @Autowired
- protected ProducerTemplate template;
-
- @Test
- void testShutdownInProgress() throws Exception {
- Future<String> reply1 = template.asyncRequestBody(URL, "World",
String.class);
- Future<String> reply2 = template.asyncRequestBody(URL, "Camel",
String.class);
-
- // shutdown camel while in progress, wait 2 sec so the first req has
been received in Camel route
- Executors.newSingleThreadExecutor().execute(() -> {
- try {
- Thread.sleep(2000);
- JettyJmsShutdownInProgressTest.this.camelContext.stop();
- } catch (Exception e) {
- // ignore
- }
- });
-
- // wait a bit more before sending next
- Thread.sleep(5000);
-
- // this one should fail
- try {
- template.requestBody(URL, "Tiger", String.class);
- fail("Should have thrown exception");
- } catch (Exception e) {
- HttpOperationFailedException hofe = (HttpOperationFailedException)
e.getCause();
- assertEquals(503, hofe.getStatusCode());
- }
-
- // but the 2 first should still return valid replies
- assertEquals("Bye World", reply1.get(10, TimeUnit.SECONDS));
- assertEquals("Bye Camel", reply2.get(10, TimeUnit.SECONDS));
- }
-
-}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
deleted file mode 100644
index a90e7d271b6..00000000000
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.itest.jetty;
-
-import java.util.List;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-@CamelSpringTest
-@ContextConfiguration
-public class JettyJmsTest {
- @RegisterExtension
- public static JmsServiceExtension jmsServiceExtension =
JmsServiceExtension.createExtension();
-
- private static int port = AvailablePortFinder.getNextAvailable();
- private static final String URL = "http://localhost:"; + port +
"/JettyJmsTest";
- static {
- //set them as system properties so Spring can use the property
placeholder
- //things to set them into the URL's in the spring contexts
- System.setProperty("JettyJmsTest.port", Integer.toString(port));
- }
-
- @Autowired
- protected CamelContext camelContext;
-
- @EndpointInject("mock:JettyJmsTestResultEndpoint")
- protected MockEndpoint resultEndpoint;
-
- @Test
- void testMocksAreValid() throws Exception {
- assertNotNull(resultEndpoint);
- resultEndpoint.reset();
-
- ProducerTemplate template = camelContext.createProducerTemplate();
- template.sendBodyAndHeader(URL, "Hello form Willem", "Operation",
"greetMe");
-
- // Sleep a while and wait for the message whole processing
- Thread.sleep(4000);
- template.stop();
-
- MockEndpoint.assertIsSatisfied(camelContext);
- List<Exchange> list = resultEndpoint.getReceivedExchanges();
- assertEquals(1, list.size(), "Should get one message");
-
- for (Exchange exchange : list) {
- Object result = exchange.getIn().getBody();
- assertEquals("Hello form Willem", result, "Should get the
request");
- assertEquals("greetMe", exchange.getIn().getHeader("Operation"),
"Should get the header");
- }
- }
-
-}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
deleted file mode 100644
index 61429ef99d0..00000000000
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.itest.jetty;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-@CamelSpringTest
-@ContextConfiguration
-public class JettyJmsTwowayTest {
- @RegisterExtension
- public static JmsServiceExtension jmsServiceExtension =
JmsServiceExtension.createExtension();
-
- private static int port = AvailablePortFinder.getNextAvailable();
- private static final String URL = "http://localhost:"; + port +
"/JettyJmsTwowayTest";
- static {
- //set them as system properties so Spring can use the property
placeholder
- //things to set them into the URL's in the spring contexts
- System.setProperty("JettyJmsTwowayTest.port", Integer.toString(port));
- }
-
- @Autowired
- protected CamelContext camelContext;
-
- @Test
- void testSendingRequest() {
- assertNotNull(camelContext, "The camelContext should not be null");
- ProducerTemplate template = camelContext.createProducerTemplate();
- Exchange exchange = template.send(URL, exchange1 -> {
- exchange1.getIn().setBody("<hello>Willem</hello>");
- exchange1.getIn().setHeader("Operation", "greetMe");
- });
- assertEquals("<response><hello>Willem</hello></response>",
exchange.getMessage().getBody(String.class));
- template.stop();
- }
-}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimpleSetHeaderTest.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimpleSetHeaderTest.java
deleted file mode 100644
index 249248ccb7f..00000000000
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimpleSetHeaderTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.itest.jetty;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class JettySimpleSetHeaderTest extends CamelTestSupport {
-
- private int port;
-
- @Test
- void testJettySimpleSetHeader() throws Exception {
- getMockEndpoint("mock:before").message(0).header("beer").isNull();
-
- MockEndpoint result = getMockEndpoint("mock:result");
- result.expectedBodiesReceived("Hello World");
- result.message(0).header("beer").isEqualTo("Carlsberg");
-
- String reply = template.requestBody("http://localhost:"; + port +
"/beer", "Hello World", String.class);
- assertEquals("Bye World", reply);
-
- MockEndpoint.assertIsSatisfied(context);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
-
- return new RouteBuilder() {
- @Override
- public void configure() {
- from("jetty:http://localhost:"; + port + "/beer")
- .convertBodyTo(String.class)
- .to("mock:before")
- .setHeader("beer", simple("Carlsberg"))
- .to("mock:result")
- .transform(simple("Bye World"));
- }
- };
- }
-}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetExchangePatternProcessor.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetExchangePatternProcessor.java
deleted file mode 100644
index 668d0099ddf..00000000000
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetExchangePatternProcessor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.itest.jetty;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
-
-public class SetExchangePatternProcessor implements Processor {
-
- @Override
- public void process(Exchange exchange) {
- // Override the exchange pattern
- exchange.setPattern(ExchangePattern.InOnly);
-
- // Convert the input stream into a string
- String result = exchange.getIn().getBody(String.class);
- exchange.getIn().setBody(result);
-
- }
-
-}
diff --git
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java
deleted file mode 100644
index d06b3a239dc..00000000000
---
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.itest.jetty;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-
-public class SetResponseProcessor implements Processor {
-
- @Override
- public void process(Exchange exchange) {
-
- // Convert the input stream into a string
- String request = exchange.getIn().getBody(String.class);
-
- exchange.getMessage().setBody("<response>" + request + "</response>");
-
- }
-
-}
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
deleted file mode 100644
index 15a0afea62a..00000000000
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
- <bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="jms"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
- </bean>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
-
- <!-- jetty supports suspension so we can graceful shutdown -->
- <route>
- <from
uri="jetty:http://localhost:{{JettyJmsShutdownInProgressTest.port}}/JettyJmsShutdownInProgressTest"/>
- <to uri="jms:queue:JettyJmsShutdownInProgressTestFoo"/>
- </route>
-
- <!-- also defer this as we defer the other route -->
- <route shutdownRoute="Defer">
- <from
uri="jms:queue:JettyJmsShutdownInProgressTestFoo?concurrentConsumers=5"/>
- <delay>
- <constant>10000</constant>
- </delay>
- <transform>
- <simple>Bye ${body}</simple>
- </transform>
- </route>
-
- </camelContext>
-
-</beans>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
deleted file mode 100644
index ef24c91d71a..00000000000
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
- <bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
-
- <bean id="jms"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
- </bean>
-
- <bean id="setExchangePatternProcessor"
class="org.apache.camel.itest.jetty.SetExchangePatternProcessor"/>
-
- <!-- START SNIPPET: example -->
- <camelContext xmlns="http://camel.apache.org/schema/spring"; trace="true">
- <route>
- <from
uri="jetty:http://localhost:{{JettyJmsTest.port}}/JettyJmsTest"/>
- <to uri="log:MyCategory?level=INFO"/>
- <process ref="setExchangePatternProcessor"/>
- <to uri="jms:JettyJMSTestResponseQueue"/>
- </route>
- <route>
- <from uri="jms:JettyJMSTestResponseQueue"/>
- <to uri="mock:JettyJmsTestResultEndpoint"/>
- </route>
- </camelContext>
- <!-- END SNIPPET: example -->
-
-</beans>
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
deleted file mode 100644
index b709371778e..00000000000
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
-
- <bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
-
- <bean id="jms"
class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://itest-jms?broker.persistent=false&create=false"/>
- </bean>
-
- <bean id="setResponseProcessor"
class="org.apache.camel.itest.jetty.SetResponseProcessor"/>
-
- <!-- START SNIPPET: example -->
- <camelContext xmlns="http://camel.apache.org/schema/spring"; trace="true">
- <route>
- <from
uri="jetty:http://localhost:{{JettyJmsTwowayTest.port}}/JettyJmsTwowayTest"/>
- <to uri="jms:JettyJmsTwowayTestResponseQueue"/>
- </route>
- <route>
- <from uri="jms:JettyJmsTwowayTestResponseQueue"/>
- <process ref="setResponseProcessor"/>
- </route>
- </camelContext>
- <!-- END SNIPPET: example -->
-
-</beans>
