test packages

apache · Jul 18, 2019 · 5ef9d37 · 5ef9d37
1 parent 615c20a
commit 5ef9d37
Show file tree

Hide file tree

Showing 34 changed files with 94 additions and 61 deletions.
diff --git a/...t/test/CustomDefaultServletClassTest.java → ...t/test/CustomDefaultServletClassTest.java b/...t/test/CustomDefaultServletClassTest.java → ...t/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/...arkus/it/camel/servlet/CustomServlet.java → ...component/servlet/test/CustomServlet.java b/...arkus/it/camel/servlet/CustomServlet.java → ...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.it.camel.servlet;
+package org.apache.camel.quarkus.component.servlet.test;
 
 import java.io.IOException;
 

diff --git a/...onent/servlet/test/MinimalConfigTest.java → ...onent/servlet/test/MinimalConfigTest.java b/...onent/servlet/test/MinimalConfigTest.java → ...onent/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/...nt/servlet/test/NoDefaultServletTest.java → ...nt/servlet/test/NoDefaultServletTest.java b/...nt/servlet/test/NoDefaultServletTest.java → ...nt/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/...uarkus/it/camel/aws/CamelApplication.java → ...us/component/asw/s3/CamelApplication.java b/...uarkus/it/camel/aws/CamelApplication.java → ...us/component/asw/s3/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.aws;
+package org.apache.camel.quarkus.component.asw.s3;
 
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;

diff --git a/...a/io/quarkus/it/camel/aws/CamelRoute.java → .../quarkus/component/asw/s3/CamelRoute.java b/...a/io/quarkus/it/camel/aws/CamelRoute.java → .../quarkus/component/asw/s3/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.asw.s3;
 
 import org.apache.camel.builder.RouteBuilder;
 

diff --git a/...uarkus/it/camel/aws/CamelApplication.java → ...s/component/aws/sns/CamelApplication.java b/...uarkus/it/camel/aws/CamelApplication.java → ...s/component/aws/sns/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.aws;
+package org.apache.camel.quarkus.component.aws.sns;
 
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;

diff --git a/...a/io/quarkus/it/camel/aws/CamelRoute.java → ...quarkus/component/aws/sns/CamelRoute.java b/...a/io/quarkus/it/camel/aws/CamelRoute.java → ...quarkus/component/aws/sns/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.sns;
 
 import org.apache.camel.builder.RouteBuilder;
 

diff --git a/...uarkus/it/camel/aws/CamelApplication.java → ...s/component/aws/sqs/CamelApplication.java b/...uarkus/it/camel/aws/CamelApplication.java → ...s/component/aws/sqs/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.aws;
+package org.apache.camel.quarkus.component.aws.sqs;
 
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;

diff --git a/...a/io/quarkus/it/camel/aws/CamelRoute.java → ...quarkus/component/aws/sqs/CamelRoute.java b/...a/io/quarkus/it/camel/aws/CamelRoute.java → ...quarkus/component/aws/sqs/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.sqs;
 
 import org.apache.camel.builder.RouteBuilder;
 

diff --git a/...arkus/it/camel/core/CamelApplication.java → .../camel/quarkus/core/CamelApplication.java b/...arkus/it/camel/core/CamelApplication.java → .../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/.../io/quarkus/it/camel/core/CamelRoute.java → ...apache/camel/quarkus/core/CamelRoute.java b/.../io/quarkus/it/camel/core/CamelRoute.java → ...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/...o/quarkus/it/camel/core/CamelServlet.java → ...ache/camel/quarkus/core/CamelServlet.java b/...o/quarkus/it/camel/core/CamelServlet.java → ...ache/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/...io/quarkus/it/camel/core/CamelITCase.java → ...pache/camel/quarkus/core/CamelITCase.java b/...io/quarkus/it/camel/core/CamelITCase.java → ...pache/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/...a/io/quarkus/it/camel/core/CamelTest.java → .../apache/camel/quarkus/core/CamelTest.java b/...a/io/quarkus/it/camel/core/CamelTest.java → .../apache/camel/quarkus/core/CamelTest.java
@@ -14,18 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.quarkus.it.camel.core;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
+package org.apache.camel.quarkus.core;
 
 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.containsString;
+import static org.hamcrest.Matchers.is;
 
 @QuarkusTest
 public class CamelTest {

diff --git a/...arkus/it/camel/infinispan/CamelRoute.java → ...rkus/component/infinispan/CamelRoute.java b/...arkus/it/camel/infinispan/CamelRoute.java → ...rkus/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/...mel/infinispan/CamelInfinispanITCase.java → ...ent/infinispan/CamelInfinispanITCase.java b/...mel/infinispan/CamelInfinispanITCase.java → ...ent/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/...camel/infinispan/CamelInfinispanTest.java → ...onent/infinispan/CamelInfinispanTest.java b/...camel/infinispan/CamelInfinispanTest.java → ...onent/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/...inispan/InfinispanServerTestResource.java → ...inispan/InfinispanServerTestResource.java b/...inispan/InfinispanServerTestResource.java → ...inispan/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/.../quarkus/it/camel/jdbc/CamelResource.java → ...quarkus/component/jdbc/CamelResource.java b/.../quarkus/it/camel/jdbc/CamelResource.java → ...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/.../io/quarkus/it/camel/jdbc/CamelRoute.java → ...el/quarkus/component/jdbc/CamelRoute.java b/.../io/quarkus/it/camel/jdbc/CamelRoute.java → ...el/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/...io/quarkus/it/camel/jdbc/CamelJdbcIT.java → ...l/quarkus/component/jdbc/CamelJdbcIT.java b/...io/quarkus/it/camel/jdbc/CamelJdbcIT.java → ...l/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/.../quarkus/it/camel/jdbc/CamelJdbcTest.java → ...quarkus/component/jdbc/CamelJdbcTest.java b/.../quarkus/it/camel/jdbc/CamelJdbcTest.java → ...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/.../quarkus/it/camel/jdbc/TestResources.java → ...quarkus/component/jdbc/TestResources.java b/.../quarkus/it/camel/jdbc/TestResources.java → ...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/...ation-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelApplication.java b/...ation-tests/salesforce/src/main/java/io/quarkus/it/camel/salesforce/CamelApplication.java
diff --git a/...esforce/src/main/java/org/apache/camel/quarkus/component/salesforce/CamelApplication.java b/...esforce/src/main/java/org/apache/camel/quarkus/component/salesforce/CamelApplication.java
@@ -0,0 +1,24 @@
+/*
+ * 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.quarkus.component.salesforce;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/test")
+public class CamelApplication extends Application {
+}
diff --git a/...arkus/it/camel/salesforce/CamelRoute.java → ...rkus/component/salesforce/CamelRoute.java b/...arkus/it/camel/salesforce/CamelRoute.java → ...rkus/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/...kus/it/camel/salesforce/CamelServlet.java → ...us/component/salesforce/CamelServlet.java b/...kus/it/camel/salesforce/CamelServlet.java → ...us/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;

diff --git a/.../quarkus/it/camel/servlet/CamelRoute.java → ...quarkus/component/servlet/CamelRoute.java b/.../quarkus/it/camel/servlet/CamelRoute.java → ...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/...component/servlet/test/CustomServlet.java → ...rkus/component/servlet/CustomServlet.java b/...component/servlet/test/CustomServlet.java → ...rkus/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.camel.component.servlet.test;
+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
@@ -18,6 +18,6 @@ quarkus.camel.disable-xml=true
 quarkus.camel.disable-jaxb=true
 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/...rkus/it/camel/servlet/CamelServletIT.java → ...kus/component/servlet/CamelServletIT.java b/...rkus/it/camel/servlet/CamelServletIT.java → ...kus/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/...us/it/camel/servlet/CamelServletTest.java → ...s/component/servlet/CamelServletTest.java b/...us/it/camel/servlet/CamelServletTest.java → ...s/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
@@ -201,6 +201,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>