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 2013/10/04 13:29:41 UTC
[1/2] git commit: Update Jetty 9.1 (JSR 356)
Updated Branches:
refs/heads/master 0ac535923 -> 461c1e618
Update Jetty 9.1 (JSR 356)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/461c1e61
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/461c1e61
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/461c1e61
Branch: refs/heads/master
Commit: 461c1e6187f78033208b86dbe3673281d643c859
Parents: ae983ee
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 4 13:28:58 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 4 13:29:30 2013 +0200
----------------------------------------------------------------------
.../wicket-native-websocket-javax/pom.xml | 2 +-
.../org/apache/wicket/protocol/ws/javax/Start.java | 14 +++++---------
2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/461c1e61/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
index cc1809f..65f7d93 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/pom.xml
@@ -32,7 +32,7 @@
<description>Provides the common code needed for the different integrations with web container's WebSocket implementations</description>
<properties>
- <jetty.version>9.1.0.M0</jetty.version>
+ <jetty.version>9.1.0.RC0</jetty.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/461c1e61/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/test/java/org/apache/wicket/protocol/ws/javax/Start.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/test/java/org/apache/wicket/protocol/ws/javax/Start.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/test/java/org/apache/wicket/protocol/ws/javax/Start.java
index 6df7205..f1e6237 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/test/java/org/apache/wicket/protocol/ws/javax/Start.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/test/java/org/apache/wicket/protocol/ws/javax/Start.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.protocol.ws.javax;
-import org.apache.wicket.util.file.File;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
@@ -25,10 +24,8 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.webapp.Configuration;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.webapp.WebXmlConfiguration;
-import org.eclipse.jetty.websocket.jsr356.server.WebSocketConfiguration;
+import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
public class Start
{
@@ -86,12 +83,10 @@ public class Start
bb.setServer(server);
bb.setContextPath("/");
- bb.setBaseResource(Resource.newResource(new File("src/test/webapp")));
+ bb.setWar("src/test/webapp");
- bb.setConfigurations(new Configuration[] {
- new WebSocketConfiguration(),
- new WebXmlConfiguration()
- });
+
+ WebSocketServerContainerInitializer.configureContext(bb);
// START JMX SERVER
// MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
@@ -102,6 +97,7 @@ public class Start
server.setHandler(bb);
try {
+// bb.dumpStdErr();
System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP");
server.start();
System.in.read();
[2/2] git commit: Update Jetty 9.0
Posted by mg...@apache.org.
Update Jetty 9.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ae983ee0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ae983ee0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ae983ee0
Branch: refs/heads/master
Commit: ae983ee04a5d299d782c517687685c24ea6e4929
Parents: 0ac5359
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 4 13:28:44 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 4 13:29:30 2013 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae983ee0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d330d96..f13bba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mvn.build.java.version>1.7</mvn.build.java.version>
<jetty.version>8.1.13.v20130916</jetty.version>
- <jetty9.version>9.0.5.v20130815</jetty9.version>
+ <jetty9.version>9.0.6.v20130930</jetty9.version>
<spring.version>3.2.4.RELEASE</spring.version>
<servlet-api.version>3.0.1</servlet-api.version>
<maven.javadoc.version>2.9.1</maven.javadoc.version>