diff --git a/itests/common/src/main/java/org/wildfly/camel/test/common/HttpRequest.java b/itests/common/src/main/java/org/wildfly/camel/test/common/HttpRequest.java index 357c52f241..957709d2c9 100644 --- a/itests/common/src/main/java/org/wildfly/camel/test/common/HttpRequest.java +++ b/itests/common/src/main/java/org/wildfly/camel/test/common/HttpRequest.java @@ -41,8 +41,9 @@ /** * @author Carlo de Wolf */ -public class HttpRequest { +public final class HttpRequest { + // Hide ctor private HttpRequest(){ } @@ -181,10 +182,12 @@ private HttpResponse processResponse(HttpURLConnection conn) throws IOException if (throwExceptionOnFailure && responseCode != HttpURLConnection.HTTP_OK) { final InputStream err = conn.getErrorStream(); - try { - throw new IOException(read(err)); - } finally { - err.close(); + if (err != null) { + try { + throw new IOException(read(err)); + } finally { + err.close(); + } } } final InputStream in = conn.getInputStream(); @@ -198,4 +201,29 @@ private HttpResponse processResponse(HttpURLConnection conn) throws IOException } } } + + public static class HttpResponse { + private int statusCode; + private String body; + + public int getStatusCode() { + return statusCode; + } + + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + + public String getBody() { + return body; + } + + public void setBody(String body) { + this.body = body; + } + + public String toString() { + return "HttpResponse{status=" + statusCode + "}"; + } + } } diff --git a/itests/common/src/main/java/org/wildfly/camel/test/common/HttpResponse.java b/itests/common/src/main/java/org/wildfly/camel/test/common/HttpResponse.java deleted file mode 100644 index 3ebabfd66f..0000000000 --- a/itests/common/src/main/java/org/wildfly/camel/test/common/HttpResponse.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * #%L - * Wildfly Camel :: Testsuite :: Common - * %% - * Copyright (C) 2013 - 2015 RedHat - * %% - * Licensed 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. - * #L% - */ - -package org.wildfly.camel.test.common; - -public class HttpResponse { - private int statusCode; - private String body; - - public int getStatusCode() { - return statusCode; - } - - public void setStatusCode(int statusCode) { - this.statusCode = statusCode; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } -} diff --git a/itests/docker/domain/src/test/java/org/wildfly/camel/test/docker/domain/DockerDomainTest.java b/itests/docker/domain/src/test/java/org/wildfly/camel/test/docker/domain/DockerDomainTest.java index 7f7cd938b8..4a5c496696 100644 --- a/itests/docker/domain/src/test/java/org/wildfly/camel/test/docker/domain/DockerDomainTest.java +++ b/itests/docker/domain/src/test/java/org/wildfly/camel/test/docker/domain/DockerDomainTest.java @@ -19,6 +19,10 @@ */ package org.wildfly.camel.test.docker.domain; +import java.io.File; +import java.io.FilenameFilter; +import java.util.concurrent.TimeUnit; + import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.as.arquillian.api.ContainerResource; @@ -27,14 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.wildfly.camel.test.common.HttpRequest; -import org.wildfly.camel.test.common.HttpResponse; +import org.wildfly.camel.test.common.HttpRequest.HttpResponse; import org.wildfly.camel.test.common.docker.DeployCommand; import org.wildfly.camel.test.common.docker.DockerCommand.Result; -import java.io.File; -import java.io.FilenameFilter; -import java.util.concurrent.TimeUnit; - @RunAsClient @RunWith(Arquillian.class) diff --git a/itests/standalone/pom.xml b/itests/standalone/pom.xml index 19ba719292..0ec9c4c4d1 100644 --- a/itests/standalone/pom.xml +++ b/itests/standalone/pom.xml @@ -20,12 +20,6 @@ --> - 4.0.0 @@ -141,20 +135,24 @@ org.apache.camel - camel-script + camel-restlet org.apache.camel - camel-restlet + camel-rss org.apache.camel - camel-rss + camel-script org.apache.camel camel-soap + + org.apache.camel + camel-swagger + org.apache.camel camel-xmlsecurity diff --git a/itests/standalone/src/test/java/org/wildfly/camel/test/rest/RestDslIntegrationTest.java b/itests/standalone/src/test/java/org/wildfly/camel/test/rest/RestDslIntegrationTest.java index 67ffa403c1..1c4fb1e040 100644 --- a/itests/standalone/src/test/java/org/wildfly/camel/test/rest/RestDslIntegrationTest.java +++ b/itests/standalone/src/test/java/org/wildfly/camel/test/rest/RestDslIntegrationTest.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.wildfly.camel.test.common.HttpRequest; -import org.wildfly.camel.test.common.HttpResponse; +import org.wildfly.camel.test.common.HttpRequest.HttpResponse; @RunWith(Arquillian.class) public class RestDslIntegrationTest { @@ -40,7 +40,7 @@ public class RestDslIntegrationTest { public static WebArchive createDeployment() { final WebArchive archive = ShrinkWrap.create(WebArchive.class, "camel.war"); archive.addAsWebInfResource("rest/web.xml", "web.xml"); - archive.addClasses(HttpRequest.class, HttpResponse.class); + archive.addClasses(HttpRequest.class); return archive; } diff --git a/itests/standalone/src/test/java/org/wildfly/camel/test/servlet/ServletIntegrationTest.java b/itests/standalone/src/test/java/org/wildfly/camel/test/servlet/ServletIntegrationTest.java index 2b025217a3..fec275b8e1 100644 --- a/itests/standalone/src/test/java/org/wildfly/camel/test/servlet/ServletIntegrationTest.java +++ b/itests/standalone/src/test/java/org/wildfly/camel/test/servlet/ServletIntegrationTest.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.wildfly.camel.test.common.HttpRequest; -import org.wildfly.camel.test.common.HttpResponse; +import org.wildfly.camel.test.common.HttpRequest.HttpResponse; @RunWith(Arquillian.class) public class ServletIntegrationTest { @@ -42,7 +42,7 @@ public class ServletIntegrationTest { public static WebArchive createDeployment() { final WebArchive archive = ShrinkWrap.create(WebArchive.class, "camel.war"); archive.addAsWebInfResource("servlet/web.xml", "web.xml"); - archive.addClasses(HttpRequest.class, HttpResponse.class); + archive.addClasses(HttpRequest.class); return archive; } diff --git a/itests/standalone/src/test/java/org/wildfly/camel/test/swagger/SwaggerIntegrationTest.java b/itests/standalone/src/test/java/org/wildfly/camel/test/swagger/SwaggerIntegrationTest.java new file mode 100644 index 0000000000..91e8aacbed --- /dev/null +++ b/itests/standalone/src/test/java/org/wildfly/camel/test/swagger/SwaggerIntegrationTest.java @@ -0,0 +1,87 @@ +/* + * #%L + * Wildfly Camel :: Testsuite + * %% + * Copyright (C) 2013 - 2015 RedHat + * %% + * Licensed 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. + * #L% + */ +package org.wildfly.camel.test.swagger; + +import java.net.MalformedURLException; + +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.ProducerTemplate; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.impl.DefaultCamelContext; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.wildfly.camel.test.common.HttpRequest; +import org.wildfly.camel.test.common.HttpRequest.HttpResponse; +import org.wildfly.camel.test.cxf.rs.subA.GreetingService; +import org.wildfly.camel.test.cxf.rs.subA.RestApplication; + +@RunWith(Arquillian.class) +public class SwaggerIntegrationTest { + + @Deployment + public static WebArchive deployment() { + final WebArchive archive = ShrinkWrap.create(WebArchive.class, "swagger-tests.war"); + archive.addAsWebInfResource("swagger/web.xml", "web.xml"); + archive.addPackage(RestApplication.class.getPackage()); + archive.addClasses(HttpRequest.class); + return archive; + } + + @Test + public void testCxfRsConsumer() throws Exception { + + CamelContext camelctx = new DefaultCamelContext(); + camelctx.addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start") + .setHeader(Exchange.HTTP_METHOD, constant("GET")). + to("cxfrs://" + getEndpointAddress("/swagger-tests") + "?resourceClasses=" + GreetingService.class.getName()); + } + }); + + camelctx.start(); + try { + ProducerTemplate producer = camelctx.createProducerTemplate(); + String result = producer.requestBodyAndHeader("direct:start", "mybody", "name", "Kermit", String.class); + Assert.assertEquals("Hello Kermit", result); + } finally { + camelctx.stop(); + } + } + + @Test + public void testSwaggerAPI() throws Exception { + HttpResponse result = HttpRequest.get("http://localhost:8080/swagger-tests/api-docs").getResponse(); + System.out.println(result); + System.out.println(result.getBody()); + //Assert.assertEquals("Hello Kermit", result.getBody()); + } + + private String getEndpointAddress(String contextPath) throws MalformedURLException { + return "http://localhost:8080" + contextPath + "/rest/greet/hello/Kermit"; + } +} diff --git a/itests/standalone/src/test/resources/classloading/exported-path-patterns.txt b/itests/standalone/src/test/resources/classloading/exported-path-patterns.txt index a6fe446a35..4bbf3b2800 100644 --- a/itests/standalone/src/test/resources/classloading/exported-path-patterns.txt +++ b/itests/standalone/src/test/resources/classloading/exported-path-patterns.txt @@ -1,6 +1,7 @@ [includes] ^ca/uhn/hl7v2(.*) ^com/google/protobuf + ^com/wordnik/swagger(.*) ^org/apache/abdera(.*) ^org/apache/activemq ^org/apache/activemq/camel(.*) diff --git a/itests/standalone/src/test/resources/swagger/web.xml b/itests/standalone/src/test/resources/swagger/web.xml new file mode 100644 index 0000000000..d36fc26e57 --- /dev/null +++ b/itests/standalone/src/test/resources/swagger/web.xml @@ -0,0 +1,35 @@ + + + + ApiDeclarationServlet + org.apache.camel.component.swagger.DefaultCamelSwaggerServlet + + + base.path + rest + + + api.path + api-docs + + + api.version + 1.2.3 + + + api.title + User Services + + + api.description + Camel Rest Example with Swagger that provides an User REST service + + + 2 + + + + ApiDeclarationServlet + /api-docs/* + + diff --git a/modules/etc/baseline/exported-paths.txt b/modules/etc/baseline/exported-paths.txt index e1e740d3a1..4103404af2 100644 --- a/modules/etc/baseline/exported-paths.txt +++ b/modules/etc/baseline/exported-paths.txt @@ -236,6 +236,24 @@ ca/uhn/hl7v2/validation/builder/support ca/uhn/hl7v2/validation/impl ca/uhn/hl7v2/view com/google/protobuf +com/wordnik/swagger +com/wordnik/swagger/annotations +com/wordnik/swagger/config +com/wordnik/swagger/converter +com/wordnik/swagger/core +com/wordnik/swagger/core/filter +com/wordnik/swagger/core/util +com/wordnik/swagger/jaxrs +com/wordnik/swagger/jaxrs/config +com/wordnik/swagger/jaxrs/filter +com/wordnik/swagger/jaxrs/json +com/wordnik/swagger/jaxrs/listing +com/wordnik/swagger/jaxrs/reader +com/wordnik/swagger/model +com/wordnik/swagger/reader +com/wordnik/swagger/servlet +com/wordnik/swagger/servlet/config +com/wordnik/swagger/servlet/listing org/apache/abdera org/apache/abdera/factory org/apache/abdera/filter @@ -309,6 +327,7 @@ org/apache/camel/component/rss org/apache/camel/component/servlet org/apache/camel/component/servlet/osgi org/apache/camel/component/sql +org/apache/camel/component/swagger org/apache/camel/component/velocity org/apache/camel/component/weather org/apache/camel/component/xmlsecurity diff --git a/modules/etc/baseline/module-list.txt b/modules/etc/baseline/module-list.txt index 3e82266f85..297cac8d4a 100644 --- a/modules/etc/baseline/module-list.txt +++ b/modules/etc/baseline/module-list.txt @@ -1,7 +1,15 @@ /cglib/cglib-nodep/main/cglib-nodep-2.2.2.jar +/ch/qos/logback/logback-classic/main/logback-classic-1.0.1.jar +/ch/qos/logback/logback-core/main/logback-core-1.0.1.jar +/com/fasterxml/jackson/module/jackson-module-jsonSchema/main/jackson-module-jsonSchema-2.4.1.jar +/com/fasterxml/jackson/module/jackson-module-scala_2/10/main/jackson-module-scala_2.10-2.4.1.jar +/com/google/code/findbugs/annotations/main/annotations-2.0.1.jar +/com/google/code/findbugs/jsr305/main/jsr305-2.0.1.jar /com/jcraft/jsch/main/jsch-0.1.51.jar +/com/thoughtworks/paranamer/main/paranamer-2.6.jar /javax/el/main/el-api-2.2.jar /javax/el/main/el-impl-2.2.jar +/javax/ws/rs/jsr311-api/main/jsr311-api-1.1.1.jar /net/oauth/core/oauth-provider/main/oauth-provider-20100527.jar /net/oauth/core/oauth/main/oauth-20100527.jar /net/sf/ehcache/main/ehcache-2.8.5.jar @@ -70,6 +78,11 @@ /org/apache/camel/component/servlet/main/camel-servlet-2.15.1.jar /org/apache/camel/component/soap/main/camel-soap-2.15.1.jar /org/apache/camel/component/sql/main/camel-sql-2.15.1.jar +/org/apache/camel/component/swagger/main/camel-swagger-2.15.1.jar +/org/apache/camel/component/swagger/main/swagger-annotations-1.3.12.jar +/org/apache/camel/component/swagger/main/swagger-core_2.10-1.3.12.jar +/org/apache/camel/component/swagger/main/swagger-jaxrs_2.10-1.3.12.jar +/org/apache/camel/component/swagger/main/swagger-servlet_2.10-1.3.12.jar /org/apache/camel/component/tagsoup/main/camel-tagsoup-2.15.1.jar /org/apache/camel/component/tagsoup/main/tagsoup-1.2.1.jar /org/apache/camel/component/velocity/main/camel-velocity-2.15.1.jar @@ -153,14 +166,25 @@ /org/jboss/gravia/main/gravia-resource-1.1.3.jar /org/jboss/gravia/main/gravia-runtime-api-1.1.3.jar /org/jboss/gravia/main/gravia-runtime-embedded-1.1.3.jar +/org/joda/joda-convert/main/joda-convert-1.6.jar +/org/json4s/json4s-ast_2/10/main/json4s-ast_2.10-3.2.11.jar +/org/json4s/json4s-core_2/10/main/json4s-core_2.10-3.2.11.jar +/org/json4s/json4s-ext_2/10/main/json4s-ext_2.10-3.2.11.jar +/org/json4s/json4s-jackson_2/10/main/json4s-jackson_2.10-3.2.11.jar +/org/json4s/json4s-native_2/10/main/json4s-native_2.10-3.2.11.jar /org/mvel/mvel2/main/mvel2-2.2.1.Final.jar -/org/opensaml/2.6/joda-time-2.2.jar +/org/opensaml/2.6/joda-time-2.3.jar /org/opensaml/2.6/opensaml-2.6.1.jar /org/opensaml/openws/main/openws-1.5.1.jar /org/opensaml/xmltooling/main/xmltooling-1.4.1.jar /org/osgi/enterprise/main/org.osgi.enterprise-5.0.0.jar +/org/reflections/main/reflections-0.9.9.jar /org/restlet/main/org.restlet-2.2.3.jar /org/restlet/main/org.restlet.ext.httpclient-2.2.3.jar +/org/scala-lang/scala-compiler/main/scala-compiler-2.10.0.jar +/org/scala-lang/scala-library/main/scala-library-2.10.4.jar +/org/scala-lang/scala-reflect/main/scala-reflect-2.10.4.jar +/org/scala-lang/scalap/main/scalap-2.10.0.jar /org/springframework/aop/main/aopalliance-1.0.jar /org/springframework/aop/main/spring-aop-4.1.5.RELEASE.jar /org/springframework/beans/main/spring-beans-4.1.5.RELEASE.jar diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/ch/qos/logback/logback-classic/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/ch/qos/logback/logback-classic/main/module.xml new file mode 100644 index 0000000000..c04f501e73 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/ch/qos/logback/logback-classic/main/module.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/ch/qos/logback/logback-core/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/ch/qos/logback/logback-core/main/module.xml new file mode 100644 index 0000000000..6de3e3bbfb --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/ch/qos/logback/logback-core/main/module.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/com/fasterxml/jackson/module/jackson-module-jsonSchema/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/fasterxml/jackson/module/jackson-module-jsonSchema/main/module.xml new file mode 100644 index 0000000000..f13c1f0812 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/fasterxml/jackson/module/jackson-module-jsonSchema/main/module.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/com/fasterxml/jackson/module/jackson-module-scala_2/10/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/fasterxml/jackson/module/jackson-module-scala_2/10/main/module.xml new file mode 100644 index 0000000000..a676d12ab2 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/fasterxml/jackson/module/jackson-module-scala_2/10/main/module.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/com/google/code/findbugs/annotations/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/google/code/findbugs/annotations/main/module.xml new file mode 100644 index 0000000000..075fcb899d --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/google/code/findbugs/annotations/main/module.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/com/google/code/findbugs/jsr305/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/google/code/findbugs/jsr305/main/module.xml new file mode 100644 index 0000000000..ca68686e07 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/google/code/findbugs/jsr305/main/module.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/com/thoughtworks/paranamer/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/thoughtworks/paranamer/main/module.xml new file mode 100644 index 0000000000..a2c60b8a97 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/com/thoughtworks/paranamer/main/module.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/javax/ws/rs/jsr311-api/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/javax/ws/rs/jsr311-api/main/module.xml new file mode 100644 index 0000000000..0e9ad5ea0b --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/javax/ws/rs/jsr311-api/main/module.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/swagger/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/swagger/main/module.xml new file mode 100644 index 0000000000..15a51c4176 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/swagger/main/module.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/joda/joda-convert/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/joda/joda-convert/main/module.xml new file mode 100644 index 0000000000..1d3c14595a --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/joda/joda-convert/main/module.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-ast_2/10/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-ast_2/10/main/module.xml new file mode 100644 index 0000000000..f215ffe737 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-ast_2/10/main/module.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-core_2/10/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-core_2/10/main/module.xml new file mode 100644 index 0000000000..04d299a8c1 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-core_2/10/main/module.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-ext_2/10/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-ext_2/10/main/module.xml new file mode 100644 index 0000000000..7914ddb07f --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-ext_2/10/main/module.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-jackson_2/10/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-jackson_2/10/main/module.xml new file mode 100644 index 0000000000..a6b36de806 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-jackson_2/10/main/module.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-native_2/10/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-native_2/10/main/module.xml new file mode 100644 index 0000000000..cca4949bb5 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/json4s/json4s-native_2/10/main/module.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/opensaml/2.6/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/opensaml/2.6/module.xml index 2ce5f307bc..304c29419d 100644 --- a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/opensaml/2.6/module.xml +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/opensaml/2.6/module.xml @@ -1,7 +1,7 @@ - + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/reflections/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/reflections/main/module.xml new file mode 100644 index 0000000000..7f9eaf61d1 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/reflections/main/module.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-compiler/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-compiler/main/module.xml new file mode 100644 index 0000000000..dec5a4e5dc --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-compiler/main/module.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-library/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-library/main/module.xml new file mode 100644 index 0000000000..353987bad7 --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-library/main/module.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-reflect/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-reflect/main/module.xml new file mode 100644 index 0000000000..c8e13d1bed --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scala-reflect/main/module.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scalap/main/module.xml b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scalap/main/module.xml new file mode 100644 index 0000000000..23a62a126e --- /dev/null +++ b/modules/etc/generated/wildfly/modules/system/layers/fuse/org/scala-lang/scalap/main/module.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml b/modules/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml index 8a6d0381d2..14b11914dd 100644 --- a/modules/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml +++ b/modules/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml @@ -68,6 +68,7 @@ + diff --git a/modules/etc/smartics/camel-modules.xml b/modules/etc/smartics/camel-modules.xml index 7acdef4997..012d4b42aa 100644 --- a/modules/etc/smartics/camel-modules.xml +++ b/modules/etc/smartics/camel-modules.xml @@ -586,6 +586,20 @@ + + + + + + + + + + + + + + diff --git a/modules/etc/smartics/wildfly-modules.xml b/modules/etc/smartics/wildfly-modules.xml index b69b8a0fcb..57f8d5f814 100644 --- a/modules/etc/smartics/wildfly-modules.xml +++ b/modules/etc/smartics/wildfly-modules.xml @@ -25,18 +25,27 @@ --> + + + + - + - + + + + + + diff --git a/modules/pom.xml b/modules/pom.xml index 35a90f5598..3976086be3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -255,6 +255,11 @@ camel-sql provided + + org.apache.camel + camel-swagger + provided + org.apache.camel camel-tagsoup