You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2019/02/24 00:22:45 UTC
[wicket] branch master updated: Introduce sub-packages for the
different HTTP2 PushBuilder impls
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new e593569 Introduce sub-packages for the different HTTP2 PushBuilder impls
e593569 is described below
commit e5935691600894b842ab7a72cea255815c188c83
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Sun Feb 24 02:20:10 2019 +0200
Introduce sub-packages for the different HTTP2 PushBuilder impls
Java 12 build was writing warnings that the same package (o.a.w.http2.markup.head) is defined in several modules.
OSGi would have failed using these modules too.
---
pom.xml | 10 +++++++--
testing/wicket-common-tests/pom.xml | 25 ++++++++++++++++++++++
.../wicket/osgi/OsgiClashingPackagesTest.java | 2 +-
.../http2/{ => markup/head/jetty}/Initializer.java | 4 ++--
.../markup/head/{ => jetty}/Jetty9PushBuilder.java | 5 ++++-
.../services/org.apache.wicket.IInitializer | 2 +-
.../{ => markup/head/servlet4}/Initializer.java | 4 ++--
.../head/{ => servlet4}/Servlet4PushBuilder.java | 5 ++++-
.../services/org.apache.wicket.IInitializer | 2 +-
.../{ => markup/head/tomcat}/Initializer.java | 4 ++--
.../head/{ => tomcat}/Tomcat85PushBuilder.java | 5 ++++-
.../services/org.apache.wicket.IInitializer | 2 +-
.../{ => markup/head/undertow}/Initializer.java | 4 ++--
.../head/{ => undertow}/UndertowPushBuilder.java | 5 ++++-
.../services/org.apache.wicket.IInitializer | 2 +-
15 files changed, 62 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 79c9a7e..b06fe0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,13 +141,13 @@
<jacoco.version>0.8.2</jacoco.version>
<jackson.version>2.9.8</jackson.version>
<jetty.version>9.4.14.v20181114</jetty.version>
- <junit.version>5.3.2</junit.version>
+ <junit.version>5.4.0</junit.version>
<spring.version>5.1.4.RELEASE</spring.version>
<servlet-api.version>3.1.0</servlet-api.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
<maven.surefire.version>2.22.1</maven.surefire.version>
<mockito.version>2.24.5</mockito.version>
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.26</slf4j.version>
<logback.version>1.2.3</logback.version>
<hamcrest.version>2.0.0.0</hamcrest.version>
<objenesis.version>3.0.1</objenesis.version>
@@ -406,6 +406,12 @@
</dependency>
<dependency>
<groupId>org.apache.wicket.experimental.wicket9</groupId>
+ <artifactId>wicket-http2-servlet4</artifactId>
+ <version>0.6-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket.experimental.wicket9</groupId>
<artifactId>wicket-http2-tomcat</artifactId>
<version>0.6-SNAPSHOT</version>
<type>jar</type>
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index adbfd7e..086d5ba 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -105,6 +105,31 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.wicket.experimental.wicket9</groupId>
+ <artifactId>wicket-http2-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket.experimental.wicket9</groupId>
+ <artifactId>wicket-http2-jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket.experimental.wicket9</groupId>
+ <artifactId>wicket-http2-servlet4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket.experimental.wicket9</groupId>
+ <artifactId>wicket-http2-tomcat</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket.experimental.wicket9</groupId>
+ <artifactId>wicket-http2-undertow</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<artifactId>junit-jupiter-engine</artifactId>
<groupId>org.junit.jupiter</groupId>
<scope>test</scope>
diff --git a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
index bd6701a..b7670d0 100644
--- a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
+++ b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
@@ -120,7 +120,7 @@ public class OsgiClashingPackagesTest
{
if (!projectBuckets.containsKey(packageWithContent))
{
- projectBuckets.put(packageWithContent, new ArrayList<Project>());
+ projectBuckets.put(packageWithContent, new ArrayList<>());
}
projectBuckets.get(packageWithContent).add(this);
}
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/Initializer.java b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/jetty/Initializer.java
similarity index 93%
rename from wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/Initializer.java
rename to wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/jetty/Initializer.java
index f4596bc..265be8c 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/Initializer.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/jetty/Initializer.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.http2;
+package org.apache.wicket.http2.markup.head.jetty;
import org.apache.wicket.Application;
import org.apache.wicket.IInitializer;
-import org.apache.wicket.http2.markup.head.Jetty9PushBuilder;
+import org.apache.wicket.http2.Http2Settings;
/**
* Initializes the jetty specific push builder API and makes it available through the HTTP2
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/jetty/Jetty9PushBuilder.java
similarity index 91%
rename from wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java
rename to wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/jetty/Jetty9PushBuilder.java
index 8b632dc..fb928a0 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/jetty/Jetty9PushBuilder.java
@@ -14,10 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.http2.markup.head;
+package org.apache.wicket.http2.markup.head.jetty;
import javax.servlet.http.HttpServletRequest;
+import org.apache.wicket.http2.markup.head.PushBuilder;
+import org.apache.wicket.http2.markup.head.PushItem;
+import org.apache.wicket.http2.markup.head.PushItemHeaderValue;
import org.apache.wicket.http2.markup.head.PushItemHeaderValue.HeaderOperation;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/resources/META-INF/services/org.apache.wicket.IInitializer b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
index f721b3e..5fb7d70 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
@@ -1 +1 @@
-org.apache.wicket.http2.Initializer
+org.apache.wicket.http2.markup.head.jetty.Initializer
diff --git a/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/Initializer.java b/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/servlet4/Initializer.java
similarity index 93%
rename from wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/Initializer.java
rename to wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/servlet4/Initializer.java
index 8d40bba..172e27b 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/Initializer.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/servlet4/Initializer.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.http2;
+package org.apache.wicket.http2.markup.head.servlet4;
import org.apache.wicket.Application;
import org.apache.wicket.IInitializer;
-import org.apache.wicket.http2.markup.head.Servlet4PushBuilder;
+import org.apache.wicket.http2.Http2Settings;
/**
* Initializes the servlet 4 specific push builder API and makes it available through the HTTP2
diff --git a/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/Servlet4PushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/servlet4/Servlet4PushBuilder.java
similarity index 90%
rename from wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/Servlet4PushBuilder.java
rename to wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/servlet4/Servlet4PushBuilder.java
index fe2a804..bbf35db 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/Servlet4PushBuilder.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/java/org/apache/wicket/http2/markup/head/servlet4/Servlet4PushBuilder.java
@@ -14,10 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.http2.markup.head;
+package org.apache.wicket.http2.markup.head.servlet4;
import javax.servlet.http.HttpServletRequest;
+import org.apache.wicket.http2.markup.head.PushBuilder;
+import org.apache.wicket.http2.markup.head.PushItem;
+import org.apache.wicket.http2.markup.head.PushItemHeaderValue;
import org.apache.wicket.http2.markup.head.PushItemHeaderValue.HeaderOperation;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
diff --git a/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/resources/META-INF/services/org.apache.wicket.IInitializer b/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
index f721b3e..644ee65 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
+++ b/wicket-experimental/wicket-http2/wicket-http2-servlet4/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
@@ -1 +1 @@
-org.apache.wicket.http2.Initializer
+org.apache.wicket.http2.markup.head.servlet4.Initializer
diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/Initializer.java b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/tomcat/Initializer.java
similarity index 93%
rename from wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/Initializer.java
rename to wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/tomcat/Initializer.java
index 0865e3e..76373c9 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/Initializer.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/tomcat/Initializer.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.http2;
+package org.apache.wicket.http2.markup.head.tomcat;
import org.apache.wicket.Application;
import org.apache.wicket.IInitializer;
-import org.apache.wicket.http2.markup.head.Tomcat85PushBuilder;
+import org.apache.wicket.http2.Http2Settings;
/**
* Initializes the tomcat specific push builder API and makes it available through the HTTP2
diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/tomcat/Tomcat85PushBuilder.java
similarity index 91%
rename from wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java
rename to wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/tomcat/Tomcat85PushBuilder.java
index 32faf6b..0c66f4d 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/Tomcat85PushBuilder.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/java/org/apache/wicket/http2/markup/head/tomcat/Tomcat85PushBuilder.java
@@ -14,11 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.http2.markup.head;
+package org.apache.wicket.http2.markup.head.tomcat;
import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.core.ApplicationPushBuilder;
+import org.apache.wicket.http2.markup.head.PushBuilder;
+import org.apache.wicket.http2.markup.head.PushItem;
+import org.apache.wicket.http2.markup.head.PushItemHeaderValue;
import org.apache.wicket.http2.markup.head.PushItemHeaderValue.HeaderOperation;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
diff --git a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/resources/META-INF/services/org.apache.wicket.IInitializer b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
index f721b3e..87b9d76 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
+++ b/wicket-experimental/wicket-http2/wicket-http2-tomcat/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
@@ -1 +1 @@
-org.apache.wicket.http2.Initializer
+org.apache.wicket.http2.markup.head.tomcat.Initializer
diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/Initializer.java b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/undertow/Initializer.java
similarity index 93%
rename from wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/Initializer.java
rename to wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/undertow/Initializer.java
index ae3eb51..4d95930 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/Initializer.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/undertow/Initializer.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.http2;
+package org.apache.wicket.http2.markup.head.undertow;
import org.apache.wicket.Application;
import org.apache.wicket.IInitializer;
-import org.apache.wicket.http2.markup.head.UndertowPushBuilder;
+import org.apache.wicket.http2.Http2Settings;
/**
* Initializes the undertow specific push builder API and makes it available through the http2
diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/undertow/UndertowPushBuilder.java
similarity index 91%
rename from wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java
rename to wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/undertow/UndertowPushBuilder.java
index b0b1014..d9ae85d 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/UndertowPushBuilder.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/java/org/apache/wicket/http2/markup/head/undertow/UndertowPushBuilder.java
@@ -14,10 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.http2.markup.head;
+package org.apache.wicket.http2.markup.head.undertow;
import javax.servlet.http.HttpServletRequest;
+import org.apache.wicket.http2.markup.head.PushBuilder;
+import org.apache.wicket.http2.markup.head.PushItem;
+import org.apache.wicket.http2.markup.head.PushItemHeaderValue;
import org.apache.wicket.http2.markup.head.PushItemHeaderValue.HeaderOperation;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
diff --git a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/resources/META-INF/services/org.apache.wicket.IInitializer b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
index f721b3e..052174b 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
+++ b/wicket-experimental/wicket-http2/wicket-http2-undertow/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
@@ -1 +1 @@
-org.apache.wicket.http2.Initializer
+org.apache.wicket.http2.markup.head.undertow.Initializer