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-quarkus.git
commit 3bef7a406df2709c7e7d8886ed4f91e13d02aeae Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Thu Jul 18 08:56:54 2019 +0200 move test packages to org.apache.camel --- .../http}/deployment/CamelNetty4HTTPProcessor.java | 2 +- .../http}/runtime/CamelNetty4Substitutions.java | 2 +- .../test/CustomDefaultServletClassTest.java | 2 +- .../component/servlet/test/CustomServlet.java | 2 +- .../component/servlet/test/MinimalConfigTest.java | 2 +- .../servlet/test/NoDefaultServletTest.java | 2 +- .../camel/quarkus/component}/aws/CamelRoute.java | 6 ++-- .../camel/quarkus}/core/CamelApplication.java | 2 +- .../apache/camel/quarkus}/core/CamelRoute.java | 2 +- .../apache/camel/quarkus}/core/CamelServlet.java | 2 +- .../apache/camel/quarkus}/core/CamelITCase.java | 2 +- .../apache/camel/quarkus}/core/CamelTest.java | 2 +- .../quarkus/component}/infinispan/CamelRoute.java | 2 +- .../infinispan/CamelInfinispanITCase.java | 2 +- .../component}/infinispan/CamelInfinispanTest.java | 2 +- .../infinispan/InfinispanServerTestResource.java | 2 +- .../quarkus/component}/jdbc/CamelResource.java | 2 +- .../camel/quarkus/component}/jdbc/CamelRoute.java | 2 +- .../camel/quarkus/component}/jdbc/CamelJdbcIT.java | 2 +- .../quarkus/component}/jdbc/CamelJdbcTest.java | 2 +- .../quarkus/component}/jdbc/TestResources.java | 2 +- .../quarkus/component/netty4/http}/CamelRoute.java | 2 +- .../quarkus/component/netty4/http/CamelIT.java} | 4 +-- .../quarkus/component/netty4/http}/CamelTest.java | 11 +++---- .../it/camel/salesforce/CamelApplication.java | 24 --------------- .../quarkus/component}/salesforce/CamelRoute.java | 2 +- .../component}/salesforce/CamelServlet.java | 4 +-- .../quarkus/component}/servlet/CamelRoute.java | 2 +- .../quarkus/component}/servlet/CustomServlet.java | 2 +- .../src/main/resources/application.properties | 2 +- .../quarkus/component}/servlet/CamelServletIT.java | 2 +- .../component}/servlet/CamelServletTest.java | 3 +- pom.xml | 34 ++++++++++++++++++++++ 33 files changed, 73 insertions(+), 65 deletions(-) diff --git a/extensions/netty4-http/deployment/src/main/java/org/apache/camel/quarkus/component/netty4http/deployment/CamelNetty4HTTPProcessor.java b/extensions/netty4-http/deployment/src/main/java/org/apache/camel/quarkus/component/netty4/http/deployment/CamelNetty4HTTPProcessor.java similarity index 94% rename from extensions/netty4-http/deployment/src/main/java/org/apache/camel/quarkus/component/netty4http/deployment/CamelNetty4HTTPProcessor.java rename to extensions/netty4-http/deployment/src/main/java/org/apache/camel/quarkus/component/netty4/http/deployment/CamelNetty4HTTPProcessor.java index 0a7aede..c338d22 100644 --- a/extensions/netty4-http/deployment/src/main/java/org/apache/camel/quarkus/component/netty4http/deployment/CamelNetty4HTTPProcessor.java +++ b/extensions/netty4-http/deployment/src/main/java/org/apache/camel/quarkus/component/netty4/http/deployment/CamelNetty4HTTPProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.netty4http.deployment; +package org.apache.camel.quarkus.component.netty4.http.deployment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; diff --git a/extensions/netty4-http/runtime/src/main/java/org/apache/camel/quarkus/component/netty4http/runtime/CamelNetty4Substitutions.java b/extensions/netty4-http/runtime/src/main/java/org/apache/camel/quarkus/component/netty4/http/runtime/CamelNetty4Substitutions.java similarity index 97% rename from extensions/netty4-http/runtime/src/main/java/org/apache/camel/quarkus/component/netty4http/runtime/CamelNetty4Substitutions.java rename to extensions/netty4-http/runtime/src/main/java/org/apache/camel/quarkus/component/netty4/http/runtime/CamelNetty4Substitutions.java index 3b45f9e..cd64880 100644 --- a/extensions/netty4-http/runtime/src/main/java/org/apache/camel/quarkus/component/netty4http/runtime/CamelNetty4Substitutions.java +++ b/extensions/netty4-http/runtime/src/main/java/org/apache/camel/quarkus/component/netty4/http/runtime/CamelNetty4Substitutions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.netty4http.runtime; +package org.apache.camel.quarkus.component.netty4.http.runtime; import org.apache.camel.component.netty4.NettyHelper; import org.apache.camel.util.concurrent.CamelThreadFactory; diff --git a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/CustomDefaultServletClassTest.java b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomDefaultServletClassTest.java similarity index 97% rename from extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/CustomDefaultServletClassTest.java rename to extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomDefaultServletClassTest.java index 46e54dc..70f1316 100644 --- a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/CustomDefaultServletClassTest.java +++ b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomDefaultServletClassTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.camel.component.servlet.test; +package org.apache.camel.quarkus.component.servlet.test; import org.apache.camel.builder.RouteBuilder; import org.hamcrest.core.IsEqual; diff --git a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/CustomServlet.java b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomServlet.java similarity index 96% rename from extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/CustomServlet.java rename to extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomServlet.java index 84754cf..0addf7b 100644 --- a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/CustomServlet.java +++ b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/CustomServlet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.camel.component.servlet.test; +package org.apache.camel.quarkus.component.servlet.test; import java.io.IOException; diff --git a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/MinimalConfigTest.java b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/MinimalConfigTest.java similarity index 97% rename from extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/MinimalConfigTest.java rename to extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/MinimalConfigTest.java index a248ad4..a7f3d3d 100644 --- a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/MinimalConfigTest.java +++ b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/MinimalConfigTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.camel.component.servlet.test; +package org.apache.camel.quarkus.component.servlet.test; import org.apache.camel.builder.RouteBuilder; import org.hamcrest.core.IsEqual; diff --git a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/NoDefaultServletTest.java b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/NoDefaultServletTest.java similarity index 97% rename from extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/NoDefaultServletTest.java rename to extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/NoDefaultServletTest.java index c0b9b86..4fa3a32 100644 --- a/extensions/servlet/deployment/src/test/java/io/quarkus/camel/component/servlet/test/NoDefaultServletTest.java +++ b/extensions/servlet/deployment/src/test/java/org/apache/camel/quarkus/component/servlet/test/NoDefaultServletTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.camel.component.servlet.test; +package org.apache.camel.quarkus.component.servlet.test; import org.apache.camel.builder.RouteBuilder; import org.hamcrest.core.IsEqual; diff --git a/integration-tests/aws/src/main/java/io/quarkus/it/camel/aws/CamelRoute.java b/integration-tests/aws/src/main/java/org/apache/camel/quarkus/component/aws/CamelRoute.java similarity index 97% rename from integration-tests/aws/src/main/java/io/quarkus/it/camel/aws/CamelRoute.java rename to integration-tests/aws/src/main/java/org/apache/camel/quarkus/component/aws/CamelRoute.java index 1e42ac4..c3ac017 100644 --- a/integration-tests/aws/src/main/java/io/quarkus/it/camel/aws/CamelRoute.java +++ b/integration-tests/aws/src/main/java/org/apache/camel/quarkus/component/aws/CamelRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.aws; +package org.apache.camel.quarkus.component.aws; import org.apache.camel.builder.RouteBuilder; @@ -35,12 +35,12 @@ public class CamelRoute extends RouteBuilder { .setBody(constant("Quarkus is great!")) .to("aws-sqs://camel-1") .to("log:sf?showAll=true"); - + from("timer:quarkus-eks?repeatCount=1") .setHeader("CamelAwsEKSOperation", constant("listClusters")) .to("aws-eks://cluster") .to("log:sf?showAll=true"); - + from("timer:quarkus-sns?repeatCount=1") .setBody(constant("Quarkus is great!")) .to("aws-sns://topic1") diff --git a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelApplication.java b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelApplication.java similarity index 95% rename from integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelApplication.java rename to integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelApplication.java index bc1063c..dd9d167 100644 --- a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelApplication.java +++ b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelApplication.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.core; +package org.apache.camel.quarkus.core; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; diff --git a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java similarity index 99% rename from integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java rename to integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java index 9ee0422..6872976 100644 --- a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java +++ b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.core; +package org.apache.camel.quarkus.core; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelServlet.java b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java similarity index 97% rename from integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelServlet.java rename to integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java index 3c65c98..11cd010 100644 --- a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelServlet.java +++ b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.core; +package org.apache.camel.quarkus.core; import java.util.List; import java.util.stream.Collectors; diff --git a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelITCase.java b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java similarity index 95% rename from integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelITCase.java rename to integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java index 5d04ebe..6e466d3 100644 --- a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelITCase.java +++ b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelITCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.core; +package org.apache.camel.quarkus.core; import io.quarkus.test.junit.SubstrateTest; diff --git a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelTest.java similarity index 97% rename from integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java rename to integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelTest.java index d12b2ff..6764f25 100644 --- a/integration-tests/core/src/test/java/io/quarkus/it/camel/core/CamelTest.java +++ b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.core; +package org.apache.camel.quarkus.core; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/integration-tests/infinispan/src/main/java/io/quarkus/it/camel/infinispan/CamelRoute.java b/integration-tests/infinispan/src/main/java/org/apache/camel/quarkus/component/infinispan/CamelRoute.java similarity index 97% rename from integration-tests/infinispan/src/main/java/io/quarkus/it/camel/infinispan/CamelRoute.java rename to integration-tests/infinispan/src/main/java/org/apache/camel/quarkus/component/infinispan/CamelRoute.java index ecc96f2..1507808 100644 --- a/integration-tests/infinispan/src/main/java/io/quarkus/it/camel/infinispan/CamelRoute.java +++ b/integration-tests/infinispan/src/main/java/org/apache/camel/quarkus/component/infinispan/CamelRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.infinispan; +package org.apache.camel.quarkus.component.infinispan; import java.nio.charset.StandardCharsets; diff --git a/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanITCase.java b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanITCase.java similarity index 94% rename from integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanITCase.java rename to integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanITCase.java index 33ff45e..5718406 100644 --- a/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanITCase.java +++ b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanITCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.infinispan; +package org.apache.camel.quarkus.component.infinispan; import io.quarkus.test.junit.SubstrateTest; diff --git a/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanTest.java b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanTest.java similarity index 96% rename from integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanTest.java rename to integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanTest.java index 3f7a0ce..b5fa581 100644 --- a/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/CamelInfinispanTest.java +++ b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/CamelInfinispanTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.infinispan; +package org.apache.camel.quarkus.component.infinispan; import static org.hamcrest.Matchers.is; diff --git a/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/InfinispanServerTestResource.java b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java similarity index 97% rename from integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/InfinispanServerTestResource.java rename to integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java index f0c275f..6800bb5 100644 --- a/integration-tests/infinispan/src/test/java/io/quarkus/it/camel/infinispan/InfinispanServerTestResource.java +++ b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.infinispan; +package org.apache.camel.quarkus.component.infinispan; import java.util.Collections; import java.util.Map; diff --git a/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelResource.java b/integration-tests/jdbc/src/main/java/org/apache/camel/quarkus/component/jdbc/CamelResource.java similarity index 98% rename from integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelResource.java rename to integration-tests/jdbc/src/main/java/org/apache/camel/quarkus/component/jdbc/CamelResource.java index b84b919..2dcae01 100644 --- a/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelResource.java +++ b/integration-tests/jdbc/src/main/java/org/apache/camel/quarkus/component/jdbc/CamelResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.jdbc; +package org.apache.camel.quarkus.component.jdbc; import java.sql.Connection; import java.sql.SQLException; diff --git a/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelRoute.java b/integration-tests/jdbc/src/main/java/org/apache/camel/quarkus/component/jdbc/CamelRoute.java similarity index 95% rename from integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelRoute.java rename to integration-tests/jdbc/src/main/java/org/apache/camel/quarkus/component/jdbc/CamelRoute.java index da66741..12aba0c 100644 --- a/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelRoute.java +++ b/integration-tests/jdbc/src/main/java/org/apache/camel/quarkus/component/jdbc/CamelRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.jdbc; +package org.apache.camel.quarkus.component.jdbc; import org.apache.camel.builder.RouteBuilder; diff --git a/integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/CamelJdbcIT.java b/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcIT.java similarity index 94% rename from integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/CamelJdbcIT.java rename to integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcIT.java index f8c4f64..97929b7 100644 --- a/integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/CamelJdbcIT.java +++ b/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.jdbc; +package org.apache.camel.quarkus.component.jdbc; import io.quarkus.test.junit.SubstrateTest; diff --git a/integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/CamelJdbcTest.java b/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcTest.java similarity index 97% rename from integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/CamelJdbcTest.java rename to integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcTest.java index 3c7410d..5bd0cf2 100644 --- a/integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/CamelJdbcTest.java +++ b/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/CamelJdbcTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.jdbc; +package org.apache.camel.quarkus.component.jdbc; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/TestResources.java b/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/TestResources.java similarity index 95% rename from integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/TestResources.java rename to integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/TestResources.java index 65cc2b8..55cfb12 100644 --- a/integration-tests/jdbc/src/test/java/io/quarkus/it/camel/jdbc/TestResources.java +++ b/integration-tests/jdbc/src/test/java/org/apache/camel/quarkus/component/jdbc/TestResources.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.jdbc; +package org.apache.camel.quarkus.component.jdbc; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.h2.H2DatabaseTestResource; diff --git a/integration-tests/netty4-http/src/main/java/io/quarkus/it/camel/netty4http/CamelRoute.java b/integration-tests/netty4-http/src/main/java/org/apache/camel/quarkus/component/netty4/http/CamelRoute.java similarity index 94% rename from integration-tests/netty4-http/src/main/java/io/quarkus/it/camel/netty4http/CamelRoute.java rename to integration-tests/netty4-http/src/main/java/org/apache/camel/quarkus/component/netty4/http/CamelRoute.java index 6b48d77..78f2d96 100644 --- a/integration-tests/netty4-http/src/main/java/io/quarkus/it/camel/netty4http/CamelRoute.java +++ b/integration-tests/netty4-http/src/main/java/org/apache/camel/quarkus/component/netty4/http/CamelRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.netty4http; +package org.apache.camel.quarkus.component.netty4.http; import org.apache.camel.builder.RouteBuilder; diff --git a/integration-tests/netty4-http/src/test/java/io/quarkus/it/camel/nett4http/CamelITCase.java b/integration-tests/netty4-http/src/test/java/org/apache/camel/quarkus/component/netty4/http/CamelIT.java similarity index 89% rename from integration-tests/netty4-http/src/test/java/io/quarkus/it/camel/nett4http/CamelITCase.java rename to integration-tests/netty4-http/src/test/java/org/apache/camel/quarkus/component/netty4/http/CamelIT.java index ea175b8..5798bfb 100644 --- a/integration-tests/netty4-http/src/test/java/io/quarkus/it/camel/nett4http/CamelITCase.java +++ b/integration-tests/netty4-http/src/test/java/org/apache/camel/quarkus/component/netty4/http/CamelIT.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.netty4http; +package org.apache.camel.quarkus.component.netty4.http; import io.quarkus.test.junit.SubstrateTest; @SubstrateTest -public class CamelITCase extends CamelTest { +public class CamelIT extends CamelTest { } diff --git a/integration-tests/netty4-http/src/test/java/io/quarkus/it/camel/nett4http/CamelTest.java b/integration-tests/netty4-http/src/test/java/org/apache/camel/quarkus/component/netty4/http/CamelTest.java similarity index 89% rename from integration-tests/netty4-http/src/test/java/io/quarkus/it/camel/nett4http/CamelTest.java rename to integration-tests/netty4-http/src/test/java/org/apache/camel/quarkus/component/netty4/http/CamelTest.java index da13458..439c407 100644 --- a/integration-tests/netty4-http/src/test/java/io/quarkus/it/camel/nett4http/CamelTest.java +++ b/integration-tests/netty4-http/src/test/java/org/apache/camel/quarkus/component/netty4/http/CamelTest.java @@ -14,18 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.netty4http; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; +package org.apache.camel.quarkus.component.netty4.http; import java.net.URI; -import org.junit.jupiter.api.Test; - -import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.Matchers.is; @QuarkusTest public class CamelTest { diff --git a/integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelApplication.java b/integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelApplication.java deleted file mode 100644 index aed7814..0000000 --- a/integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelApplication.java +++ /dev/null @@ -1,24 +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 io.quarkus.it.camel.salesforce; - -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; - -@ApplicationPath("/test") -public class CamelApplication extends Application { -} \ No newline at end of file diff --git a/integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelRoute.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/CamelRoute.java similarity index 95% rename from integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelRoute.java rename to integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/CamelRoute.java index 533b148..2abdce9 100644 --- a/integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelRoute.java +++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/CamelRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.salesforce; +package org.apache.camel.quarkus.component.salesforce; import org.apache.camel.builder.RouteBuilder; diff --git a/integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelServlet.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/CamelServlet.java similarity index 95% rename from integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelServlet.java rename to integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/CamelServlet.java index 4ec5140..f54361e 100644 --- a/integration-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelServlet.java +++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/CamelServlet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.salesforce; +package org.apache.camel.quarkus.component.salesforce; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -28,7 +28,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.quarkus.core.runtime.CamelRuntime; -@Path("/") +@Path("/test") @ApplicationScoped public class CamelServlet { @Inject diff --git a/integration-tests/servlet/src/main/java/io/quarkus/it/camel/servlet/CamelRoute.java b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java similarity index 96% rename from integration-tests/servlet/src/main/java/io/quarkus/it/camel/servlet/CamelRoute.java rename to integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java index 61b21f9..8ba1c13 100644 --- a/integration-tests/servlet/src/main/java/io/quarkus/it/camel/servlet/CamelRoute.java +++ b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.servlet; +package org.apache.camel.quarkus.component.servlet; import javax.enterprise.context.ApplicationScoped; diff --git a/integration-tests/servlet/src/main/java/io/quarkus/it/camel/servlet/CustomServlet.java b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomServlet.java similarity index 96% rename from integration-tests/servlet/src/main/java/io/quarkus/it/camel/servlet/CustomServlet.java rename to integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomServlet.java index ffba97f..b84275b 100644 --- a/integration-tests/servlet/src/main/java/io/quarkus/it/camel/servlet/CustomServlet.java +++ b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CustomServlet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.servlet; +package org.apache.camel.quarkus.component.servlet; import java.io.IOException; diff --git a/integration-tests/servlet/src/main/resources/application.properties b/integration-tests/servlet/src/main/resources/application.properties index 6de5929..071e429 100644 --- a/integration-tests/servlet/src/main/resources/application.properties +++ b/integration-tests/servlet/src/main/resources/application.properties @@ -33,7 +33,7 @@ quarkus.camel.defer-init-phase=false # quarkus.camel.servlet.url-patterns=/folder-1/*,/folder-2/* quarkus.camel.servlet.my-named-servlet.url-patterns=/my-named-folder/* -quarkus.camel.servlet.my-named-servlet.servlet-class=io.quarkus.it.camel.servlet.CustomServlet +quarkus.camel.servlet.my-named-servlet.servlet-class=org.apache.camel.quarkus.component.servlet.CustomServlet quarkus.camel.servlet.ignored-key.servlet-name=my-favorite-servlet quarkus.camel.servlet.ignored-key.url-patterns=/my-favorite-folder/* diff --git a/integration-tests/servlet/src/test/java/io/quarkus/it/camel/servlet/CamelServletIT.java b/integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletIT.java similarity index 94% rename from integration-tests/servlet/src/test/java/io/quarkus/it/camel/servlet/CamelServletIT.java rename to integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletIT.java index 6ccacd0..60e1b4f 100644 --- a/integration-tests/servlet/src/test/java/io/quarkus/it/camel/servlet/CamelServletIT.java +++ b/integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.servlet; +package org.apache.camel.quarkus.component.servlet; import io.quarkus.test.junit.SubstrateTest; diff --git a/integration-tests/servlet/src/test/java/io/quarkus/it/camel/servlet/CamelServletTest.java b/integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletTest.java similarity index 94% rename from integration-tests/servlet/src/test/java/io/quarkus/it/camel/servlet/CamelServletTest.java rename to integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletTest.java index 1b13f76..595f626 100644 --- a/integration-tests/servlet/src/test/java/io/quarkus/it/camel/servlet/CamelServletTest.java +++ b/integration-tests/servlet/src/test/java/org/apache/camel/quarkus/component/servlet/CamelServletTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.quarkus.it.camel.servlet; +package org.apache.camel.quarkus.component.servlet; +import org.apache.camel.quarkus.component.servlet.CustomServlet; import org.hamcrest.core.IsEqual; import org.junit.jupiter.api.Test; diff --git a/pom.xml b/pom.xml index 412c6dd..3705c1f 100644 --- a/pom.xml +++ b/pom.xml @@ -300,6 +300,40 @@ </plugins> </build> </profile> + + <profile> + <id>quarkus-snapshots</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <quarkus.version>999-SNAPSHOT</quarkus.version> + </properties> + <repositories> + <repository> + <id>oss-snapshots-repo</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>oss-snapshots-repo</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> </profiles> </project>