You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ts...@apache.org on 2016/07/09 04:31:53 UTC
[3/6] wicket git commit: WICKET-6194 - Fixed jetty build
WICKET-6194 - Fixed jetty build
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/54e09bc1
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/54e09bc1
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/54e09bc1
Branch: refs/heads/master
Commit: 54e09bc11eea72c5a8293dbee9b3813f15065129
Parents: 6e184f3
Author: Tobias Soloschenko <ts...@apache.org>
Authored: Sat Jul 2 17:46:45 2016 +0200
Committer: Tobias Soloschenko <ts...@apache.org>
Committed: Sat Jul 9 06:30:39 2016 +0200
----------------------------------------------------------------------
.../http2/markup/head/PushHeaderItem.java | 2 +-
.../wicket-http2/wicket-http2-jetty/pom.xml | 25 --------------------
.../http2/markup/head/Jetty9PushBuilder.java | 15 +++++-------
3 files changed, 7 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/54e09bc1/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java
index f3f0034..a9f3602 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java
+++ b/wicket-experimental/wicket-http2/wicket-http2-core/src/main/java/org/apache/wicket/http2/markup/head/PushHeaderItem.java
@@ -61,7 +61,7 @@ public class PushHeaderItem extends HeaderItem
/**
* The URLs of resources to be pushed to the client
*/
- private Set<String> urls = new ConcurrentHashSet<>(new TreeSet<>());
+ private Set<String> urls = new ConcurrentHashSet<String>(new TreeSet<String>());
/**
* Uses the URLs that has already been pushed to the client to ensure not to push them again
http://git-wip-us.apache.org/repos/asf/wicket/blob/54e09bc1/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
index 026763e..84f81d4 100644
--- a/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
+++ b/wicket-experimental/wicket-http2/wicket-http2-jetty/pom.xml
@@ -44,31 +44,6 @@
<version>9.3.9.M1</version>
<type>POM</type>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>javax.servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-server</artifactId>
- <version>9.3.9.M1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>javax.servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.alpn</groupId>
- <artifactId>alpn-api</artifactId>
- <version>1.1.2.v20150522</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/54e09bc1/wicket-experimental/wicket-http2/wicket-http2-jetty/src/main/java/org/apache/wicket/http2/markup/head/Jetty9PushBuilder.java
----------------------------------------------------------------------
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/Jetty9PushBuilder.java
index 34a7300..ef6f1bf 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/Jetty9PushBuilder.java
@@ -29,16 +29,13 @@ public class Jetty9PushBuilder implements PushBuilder
@Override
public void push(HttpServletRequest httpServletRequest, String... paths)
{
- // TODO Jetty has to switch to the javax.servlet-api classes and handle
- // SETTINGS_ENABLE_PUSH settings frame value and implement the default API against
- // it.
Request request = RequestCycle.get().getRequest();
HttpServletRequest httpRequest = (HttpServletRequest) request.getContainerRequest();
-// org.eclipse.jetty.server.PushBuilder pushBuilder = org.eclipse.jetty.server.Request.getBaseRequest(httpRequest).getPushBuilder();
-// for (String path : paths)
-// {
-// pushBuilder.path(path);
-// }
-// pushBuilder.push();
+ org.eclipse.jetty.server.PushBuilder pushBuilder = org.eclipse.jetty.server.Request.getBaseRequest(httpRequest).getPushBuilder();
+ for (String path : paths)
+ {
+ pushBuilder.path(path);
+ }
+ pushBuilder.push();
}
}