Revert to 2.2.0-SNAPSHOT to fix jersey2 prefix bug

adrienlauer · adrienlauer · commit 392f4c892ddf · 2016-01-22T10:53:16.000+01:00
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-core</artifactId>
diff --git a/crypto/pom.xml b/crypto/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-crypto</artifactId>
diff --git a/el/pom.xml b/el/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-el</artifactId>
diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-metrics</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack.seed</groupId>
     <artifactId>seed</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -35,6 +35,7 @@
         <metrics.version>3.1.0</metrics.version>
         <jersey.version>1.19</jersey.version>
         <jersey2.version>2.22.1</jersey2.version>
+        <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
 
         <compatibility.version>2.1.0</compatibility.version>
 
diff --git a/rest/core/pom.xml b/rest/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-core</artifactId>
@@ -44,8 +44,8 @@
         <!-- PROVIDED -->
         <dependency>
             <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-            <version>${jsr311-api.version}</version>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>${javax.ws.rs-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/rest/jersey1/pom.xml b/rest/jersey1/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-jersey1</artifactId>
diff --git a/rest/jersey1/src/it/java/org/seedstack/seed/rest/Jersey1WithPrefixIT.java b/rest/jersey1/src/it/java/org/seedstack/seed/rest/Jersey1WithPrefixIT.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.seed.rest;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.json.JSONException;
+import org.junit.Test;
+import org.seedstack.seed.it.AbstractSeedWebIT;
+
+import javax.ws.rs.core.MediaType;
+import java.net.URL;
+
+import static com.jayway.restassured.RestAssured.expect;
+
+public class Jersey1WithPrefixIT extends AbstractSeedWebIT {
+
+    @ArquillianResource
+    private URL baseURL;
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class)
+                .addAsResource("with-prefix.props", "META-INF/configuration/with-prefix.props");
+    }
+
+    @RunAsClient
+    @Test
+    public void rest_prefix_is_honored() throws JSONException {
+        expect().statusCode(200).given().contentType(MediaType.APPLICATION_JSON).get(baseURL.toString() + "rest/hello");
+    }
+}
diff --git a/rest/jersey1/src/it/java/org/seedstack/seed/rest/fixtures/HelloResource.java b/rest/jersey1/src/it/java/org/seedstack/seed/rest/fixtures/HelloResource.java
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.seed.rest.fixtures;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/hello")
+public class HelloResource {
+    @GET
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/rest/jersey1/src/it/resources/with-prefix.props b/rest/jersey1/src/it/resources/with-prefix.props
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+org.seedstack.seed.rest.path = /rest
diff --git a/rest/jersey2/pom.xml b/rest/jersey2/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-jersey2</artifactId>
diff --git a/rest/jersey2/src/it/java/org/seedstack/seed/rest/jersey2/Jersey2WithPrefixIT.java b/rest/jersey2/src/it/java/org/seedstack/seed/rest/jersey2/Jersey2WithPrefixIT.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.seed.rest.jersey2;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.json.JSONException;
+import org.junit.Test;
+import org.seedstack.seed.it.AbstractSeedWebIT;
+
+import javax.ws.rs.core.MediaType;
+import java.net.URL;
+
+import static com.jayway.restassured.RestAssured.expect;
+
+public class Jersey2WithPrefixIT extends AbstractSeedWebIT {
+
+    @ArquillianResource
+    private URL baseURL;
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class)
+                .addAsResource("with-prefix.props", "META-INF/configuration/with-prefix.props");
+    }
+
+    @RunAsClient
+    @Test
+    public void rest_prefix_is_honored() throws JSONException {
+        expect().statusCode(200).given().contentType(MediaType.APPLICATION_JSON).get(baseURL.toString() + "rest/hello");
+    }
+}
diff --git a/rest/jersey2/src/it/java/org/seedstack/seed/rest/jersey2/fixtures/HelloResource.java b/rest/jersey2/src/it/java/org/seedstack/seed/rest/jersey2/fixtures/HelloResource.java
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.seed.rest.jersey2.fixtures;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/hello")
+public class HelloResource {
+    @GET
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/rest/jersey2/src/it/java/org/seedstack/seed/rest/jersey2/fixtures/TestResource.java b/rest/jersey2/src/it/java/org/seedstack/seed/rest/jersey2/fixtures/TestResource.java
@@ -7,8 +7,6 @@
  */
 package org.seedstack.seed.rest.jersey2.fixtures;
 
-import org.seedstack.seed.rest.jersey2.fixtures.Message;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
diff --git a/rest/jersey2/src/it/resources/logback-test.xml b/rest/jersey2/src/it/resources/logback-test.xml
@@ -14,7 +14,7 @@
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <root level="INFO">
+    <root level="WARN">
         <appender-ref ref="STDOUT" />
     </root>
 </configuration>
diff --git a/rest/jersey2/src/it/resources/with-prefix.props b/rest/jersey2/src/it/resources/with-prefix.props
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+org.seedstack.seed.rest.path = /rest
diff --git a/rest/jersey2/src/main/java/org/seedstack/seed/rest/jersey2/internal/Jersey2Module.java b/rest/jersey2/src/main/java/org/seedstack/seed/rest/jersey2/internal/Jersey2Module.java
@@ -32,12 +32,33 @@ class Jersey2Module extends ServletModule {
 
     @Override
     protected void configureServlets() {
+        Map<String, Object> jerseyProperties = buildJerseyProperties();
+        Map<String, String> initParams = buildInitParams(jerseyProperties);
+
+        filter(restConfiguration.getRestPath() + "/*").through(
+                new SeedServletContainer(resources, providers, jerseyProperties),
+                initParams
+        );
+    }
+
+    private Map<String, String> buildInitParams(Map<String, Object> jerseyProperties) {
+        Map<String, String> initParams = new HashMap<String, String>();
+
+        // Those properties must be defined as init parameters of the filter
+        initParams.put(ServletProperties.FILTER_CONTEXT_PATH, (String) jerseyProperties.get(ServletProperties.FILTER_CONTEXT_PATH));
+        initParams.put(ServletProperties.FILTER_STATIC_CONTENT_REGEX, (String) jerseyProperties.get(ServletProperties.FILTER_STATIC_CONTENT_REGEX));
+
+        return initParams;
+    }
+
+    private Map<String, Object> buildJerseyProperties() {
         Map<String, Object> jerseyProperties = new HashMap<String, Object>();
 
         // Default configuration values
         jerseyProperties.put(ServletProperties.FILTER_FORWARD_ON_404, true);
         jerseyProperties.put(ServerProperties.WADL_FEATURE_DISABLE, true);
 
+        // User-defined configuration values
         jerseyProperties.putAll(propertiesToMap(restConfiguration.getJerseyProperties()));
 
         // Forced configuration values
@@ -46,7 +67,7 @@ protected void configureServlets() {
         }
         jerseyProperties.put(ServletProperties.FILTER_CONTEXT_PATH, restConfiguration.getRestPath());
 
-        filter(restConfiguration.getRestPath() + "/*").through(new SeedServletContainer(resources, providers, jerseyProperties));
+        return jerseyProperties;
     }
 
     private Map<String, String> propertiesToMap(Properties properties) {
diff --git a/rest/pom.xml b/rest/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest</artifactId>
diff --git a/rest/specs/pom.xml b/rest/specs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-specs</artifactId>
diff --git a/security/core/pom.xml b/security/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-security</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security-core</artifactId>
diff --git a/security/pom.xml b/security/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security</artifactId>
diff --git a/security/specs/pom.xml b/security/specs/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.seedstack.seed</groupId>
 		<artifactId>seed-security</artifactId>
-		<version>2.2.1-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>seed-security-specs</artifactId>
diff --git a/shell/pom.xml b/shell/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-shell</artifactId>
diff --git a/specs/pom.xml b/specs/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-specs</artifactId>
diff --git a/testing/pom.xml b/testing/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-testing</artifactId>
diff --git a/transaction/pom.xml b/transaction/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-transaction</artifactId>
diff --git a/web/core/pom.xml b/web/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-core</artifactId>
diff --git a/web/pom.xml b/web/pom.xml
diff --git a/web/security/pom.xml b/web/security/pom.xml
diff --git a/web/specs/pom.xml b/web/specs/pom.xml
diff --git a/web/undertow/pom.xml b/web/undertow/pom.xml
diff --git a/web/websocket/pom.xml b/web/websocket/pom.xml
