diff --git a/async-tasks-parent/async-tasks-demo/pom.xml b/async-tasks-parent/async-tasks-demo/pom.xml
index 2d8c6a85dd..6f7e2c1902 100644
--- a/async-tasks-parent/async-tasks-demo/pom.xml
+++ b/async-tasks-parent/async-tasks-demo/pom.xml
@@ -48,7 +48,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml b/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml
index ec97e62af5..5d263a46a8 100644
--- a/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml
+++ b/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml
@@ -43,13 +43,14 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/browserid-parent/browserid-examples/pom.xml b/browserid-parent/browserid-examples/pom.xml
index 03826b13e1..3d2dff5929 100644
--- a/browserid-parent/browserid-examples/pom.xml
+++ b/browserid-parent/browserid-examples/pom.xml
@@ -43,13 +43,14 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/closure-compiler/pom.xml b/closure-compiler/pom.xml
index 4861e8c2e1..9da58ee939 100644
--- a/closure-compiler/pom.xml
+++ b/closure-compiler/pom.xml
@@ -32,7 +32,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/console-parent/console-examples/pom.xml b/console-parent/console-examples/pom.xml
index 5726ce44c9..fabf3a6963 100644
--- a/console-parent/console-examples/pom.xml
+++ b/console-parent/console-examples/pom.xml
@@ -25,7 +25,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
@@ -82,8 +82,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
- test
+ jetty-all
+ uber
junit
diff --git a/dashboard-parent/dashboard-examples/pom.xml b/dashboard-parent/dashboard-examples/pom.xml
index 05d43ebe98..21ce3cf1b7 100644
--- a/dashboard-parent/dashboard-examples/pom.xml
+++ b/dashboard-parent/dashboard-examples/pom.xml
@@ -114,8 +114,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
- test
+ jetty-all
+ uber
diff --git a/datastores-parent/pom.xml b/datastores-parent/pom.xml
index 66a2f9f1f8..1f0b10d767 100644
--- a/datastores-parent/pom.xml
+++ b/datastores-parent/pom.xml
@@ -39,8 +39,9 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
provided
+ uber
org.slf4j
diff --git a/datatables-parent/datatables-examples/pom.xml b/datatables-parent/datatables-examples/pom.xml
index 5c4c5795da..422909c41a 100644
--- a/datatables-parent/datatables-examples/pom.xml
+++ b/datatables-parent/datatables-examples/pom.xml
@@ -68,7 +68,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
org.webjars
diff --git a/editable-grid-parent/editable-grid-examples/pom.xml b/editable-grid-parent/editable-grid-examples/pom.xml
index 82ec8510a2..c990ad4ea5 100644
--- a/editable-grid-parent/editable-grid-examples/pom.xml
+++ b/editable-grid-parent/editable-grid-examples/pom.xml
@@ -57,7 +57,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/flot-parent/flot-examples/pom.xml b/flot-parent/flot-examples/pom.xml
index a1242323a1..d46a9acc34 100644
--- a/flot-parent/flot-examples/pom.xml
+++ b/flot-parent/flot-examples/pom.xml
@@ -40,7 +40,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/inmethod-grid-parent/pom.xml b/inmethod-grid-parent/pom.xml
index b628021e1e..b26c69efe4 100644
--- a/inmethod-grid-parent/pom.xml
+++ b/inmethod-grid-parent/pom.xml
@@ -78,7 +78,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/input-events-parent/input-events-examples/pom.xml b/input-events-parent/input-events-examples/pom.xml
index 0d4266f782..551a0e66a6 100644
--- a/input-events-parent/input-events-examples/pom.xml
+++ b/input-events-parent/input-events-examples/pom.xml
@@ -51,7 +51,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/jamon-parent/jamon-examples/pom.xml b/jamon-parent/jamon-examples/pom.xml
index 149edd331f..ddd11b799c 100644
--- a/jamon-parent/jamon-examples/pom.xml
+++ b/jamon-parent/jamon-examples/pom.xml
@@ -24,7 +24,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
@@ -40,9 +41,9 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
-
\ No newline at end of file
+
diff --git a/jasperreports-parent/jasperreports-examples/pom.xml b/jasperreports-parent/jasperreports-examples/pom.xml
index cb6b9bc70e..7767a0a772 100644
--- a/jasperreports-parent/jasperreports-examples/pom.xml
+++ b/jasperreports-parent/jasperreports-examples/pom.xml
@@ -38,7 +38,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/jqplot-parent/jqplot-examples/pom.xml b/jqplot-parent/jqplot-examples/pom.xml
index b6526f4d96..cd77bebcca 100644
--- a/jqplot-parent/jqplot-examples/pom.xml
+++ b/jqplot-parent/jqplot-examples/pom.xml
@@ -52,8 +52,8 @@
- org.mortbay.jetty
- maven-jetty-plugin
+ org.eclipse.jetty
+ jetty-maven-plugin
diff --git a/jquery-parent/jquery-examples/pom.xml b/jquery-parent/jquery-examples/pom.xml
index 81c141483e..fc666fa895 100644
--- a/jquery-parent/jquery-examples/pom.xml
+++ b/jquery-parent/jquery-examples/pom.xml
@@ -69,23 +69,18 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
60
src/main/webapp
-
-
- 8080
- 60000
-
-
diff --git a/jwicket-parent/jwicket-examples/pom.xml b/jwicket-parent/jwicket-examples/pom.xml
index 9e76fbddf2..83a9bbd9fc 100644
--- a/jwicket-parent/jwicket-examples/pom.xml
+++ b/jwicket-parent/jwicket-examples/pom.xml
@@ -41,7 +41,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/jwicket-parent/pom.xml b/jwicket-parent/pom.xml
index 568a4d9c97..82a3b9d7a7 100644
--- a/jwicket-parent/pom.xml
+++ b/jwicket-parent/pom.xml
@@ -73,19 +73,19 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty
provided
${jetty.ver}
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
provided
${jetty.ver}
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-management
provided
${jetty.ver}
diff --git a/lightbox2-parent/lightbox2-examples/pom.xml b/lightbox2-parent/lightbox2-examples/pom.xml
index 01eb12432e..56bc89a7f9 100644
--- a/lightbox2-parent/lightbox2-examples/pom.xml
+++ b/lightbox2-parent/lightbox2-examples/pom.xml
@@ -52,8 +52,8 @@
- org.mortbay.jetty
- maven-jetty-plugin
+ org.eclipse.jetty
+ jetty-maven-plugin
diff --git a/mbeanview-parent/mbeanview-examples/pom.xml b/mbeanview-parent/mbeanview-examples/pom.xml
index 2ca02c84f5..ca16b96747 100644
--- a/mbeanview-parent/mbeanview-examples/pom.xml
+++ b/mbeanview-parent/mbeanview-examples/pom.xml
@@ -47,7 +47,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/minis-parent/minis-examples/pom.xml b/minis-parent/minis-examples/pom.xml
index 933efb5a44..5f3114bdc5 100644
--- a/minis-parent/minis-examples/pom.xml
+++ b/minis-parent/minis-examples/pom.xml
@@ -58,7 +58,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/modalx-parent/modalx-examples/pom.xml b/modalx-parent/modalx-examples/pom.xml
index be1809e4e7..5d69ddf670 100644
--- a/modalx-parent/modalx-examples/pom.xml
+++ b/modalx-parent/modalx-examples/pom.xml
@@ -49,13 +49,14 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/nashorn-parent/nashorn-examples/pom.xml b/nashorn-parent/nashorn-examples/pom.xml
index 488e3e5484..fe31c1460b 100644
--- a/nashorn-parent/nashorn-examples/pom.xml
+++ b/nashorn-parent/nashorn-examples/pom.xml
@@ -25,7 +25,6 @@
3.1.0
- 9.1.6.v20160112
true
true
true
@@ -50,8 +49,7 @@
org.eclipse.jetty.aggregate
jetty-all
- ${jetty.version}
- test
+ uber
javax.servlet
@@ -71,4 +69,4 @@
-
\ No newline at end of file
+
diff --git a/objectautocomplete-parent/objectautocomplete-examples/pom.xml b/objectautocomplete-parent/objectautocomplete-examples/pom.xml
index 02eef59656..64ffac4f4c 100644
--- a/objectautocomplete-parent/objectautocomplete-examples/pom.xml
+++ b/objectautocomplete-parent/objectautocomplete-examples/pom.xml
@@ -47,7 +47,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/offline-mode-parent/offline-mode-examples/pom.xml b/offline-mode-parent/offline-mode-examples/pom.xml
index bdf07f793f..d6157e15ef 100644
--- a/offline-mode-parent/offline-mode-examples/pom.xml
+++ b/offline-mode-parent/offline-mode-examples/pom.xml
@@ -25,7 +25,6 @@
3.1.0
- 9.1.6.v20160112
true
true
true
@@ -50,8 +49,7 @@
org.eclipse.jetty.aggregate
jetty-all
- ${jetty.version}
- test
+ uber
javax.servlet
@@ -71,4 +69,4 @@
-
\ No newline at end of file
+
diff --git a/openlayers-parent/openlayers-examples/pom.xml b/openlayers-parent/openlayers-examples/pom.xml
index 9213afadb2..1c9f45f279 100644
--- a/openlayers-parent/openlayers-examples/pom.xml
+++ b/openlayers-parent/openlayers-examples/pom.xml
@@ -59,7 +59,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
${project.groupId}
diff --git a/openlayers3-parent/openlayers3-examples/pom.xml b/openlayers3-parent/openlayers3-examples/pom.xml
index e65202df2b..72845cc938 100644
--- a/openlayers3-parent/openlayers3-examples/pom.xml
+++ b/openlayers3-parent/openlayers3-examples/pom.xml
@@ -66,7 +66,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
@@ -75,8 +76,7 @@
org.eclipse.jetty
jetty-maven-plugin
- 9.2.2.v20140723
-
+
2000000
diff --git a/phonebook/pom.xml b/phonebook/pom.xml
index f9046efcb8..e86e61184e 100644
--- a/phonebook/pom.xml
+++ b/phonebook/pom.xml
@@ -83,8 +83,9 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
provided
+ uber
net.sf.shadesdb
diff --git a/pom.xml b/pom.xml
index 6a25d0180f..aa55d5d14f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -523,9 +523,10 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
${jetty.version}
test
+ uber
org.springframework
@@ -1143,7 +1144,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
${jetty.version}
diff --git a/portlet-parent/wicketstuff-portlet-examples/pom.xml b/portlet-parent/wicketstuff-portlet-examples/pom.xml
index 99007d1ba3..66eb50cc2a 100644
--- a/portlet-parent/wicketstuff-portlet-examples/pom.xml
+++ b/portlet-parent/wicketstuff-portlet-examples/pom.xml
@@ -154,7 +154,7 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
8.1.18.v20150929
@@ -178,8 +178,7 @@
org.eclipse.jetty.aggregate
jetty-all
- ${jetty9.version}
- test
+ uber
diff --git a/scala-extensions-parent/wicket-scala-archetype/src/main/resources/archetype-resources/pom.xml b/scala-extensions-parent/wicket-scala-archetype/src/main/resources/archetype-resources/pom.xml
index 3a8949f908..d6219545d2 100644
--- a/scala-extensions-parent/wicket-scala-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/scala-extensions-parent/wicket-scala-archetype/src/main/resources/archetype-resources/pom.xml
@@ -64,9 +64,10 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
${version.jetty}
provided
+ uber
@@ -152,7 +153,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
${version.jetty}
diff --git a/select2-parent/select2-examples/pom.xml b/select2-parent/select2-examples/pom.xml
index 603c6e088a..19894edc3e 100755
--- a/select2-parent/select2-examples/pom.xml
+++ b/select2-parent/select2-examples/pom.xml
@@ -32,7 +32,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
junit
@@ -43,16 +44,8 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
-
-
-
- 8080
- 3600000
-
-
-
diff --git a/serializer-common/pom.xml b/serializer-common/pom.xml
index 83c18a1198..98e61fd6dc 100644
--- a/serializer-common/pom.xml
+++ b/serializer-common/pom.xml
@@ -24,7 +24,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/serializer-fast/pom.xml b/serializer-fast/pom.xml
index 8fc701c184..212987502f 100644
--- a/serializer-fast/pom.xml
+++ b/serializer-fast/pom.xml
@@ -34,7 +34,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/serializer-fast2/pom.xml b/serializer-fast2/pom.xml
index 0ffe1f9bf1..e06a7645df 100644
--- a/serializer-fast2/pom.xml
+++ b/serializer-fast2/pom.xml
@@ -35,7 +35,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/serializer-kryo/pom.xml b/serializer-kryo/pom.xml
index 94c04aa6b7..ec49614883 100644
--- a/serializer-kryo/pom.xml
+++ b/serializer-kryo/pom.xml
@@ -31,7 +31,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/serializer-kryo2/pom.xml b/serializer-kryo2/pom.xml
index e543bd31c5..69bae4f5bf 100644
--- a/serializer-kryo2/pom.xml
+++ b/serializer-kryo2/pom.xml
@@ -41,7 +41,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/serializer-ui/pom.xml b/serializer-ui/pom.xml
index 8a80ed28cb..4c4bc2499f 100644
--- a/serializer-ui/pom.xml
+++ b/serializer-ui/pom.xml
@@ -39,7 +39,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/shiro-security/wicket-shiro-examples/pom.xml b/shiro-security/wicket-shiro-examples/pom.xml
index 2beb37fb88..c820291bd8 100644
--- a/shiro-security/wicket-shiro-examples/pom.xml
+++ b/shiro-security/wicket-shiro-examples/pom.xml
@@ -59,7 +59,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
provided
diff --git a/stateless-parent/stateless-examples/pom.xml b/stateless-parent/stateless-examples/pom.xml
index df42f2b1ff..c7a64927c5 100644
--- a/stateless-parent/stateless-examples/pom.xml
+++ b/stateless-parent/stateless-examples/pom.xml
@@ -47,7 +47,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/tinymce3-parent/tinymce3-examples/pom.xml b/tinymce3-parent/tinymce3-examples/pom.xml
index 8a0bcb02be..d87bceccb3 100644
--- a/tinymce3-parent/tinymce3-examples/pom.xml
+++ b/tinymce3-parent/tinymce3-examples/pom.xml
@@ -47,7 +47,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/tinymce4-parent/tinymce4-examples/pom.xml b/tinymce4-parent/tinymce4-examples/pom.xml
index 79f47bc986..155a5e6765 100644
--- a/tinymce4-parent/tinymce4-examples/pom.xml
+++ b/tinymce4-parent/tinymce4-examples/pom.xml
@@ -47,7 +47,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/tinymce4-parent/tinymce4-examples/src/test/java/wicket/contrib/examples/tinymce/Start.java b/tinymce4-parent/tinymce4-examples/src/test/java/wicket/contrib/examples/tinymce/Start.java
index b2739d780d..94f655cffa 100644
--- a/tinymce4-parent/tinymce4-examples/src/test/java/wicket/contrib/examples/tinymce/Start.java
+++ b/tinymce4-parent/tinymce4-examples/src/test/java/wicket/contrib/examples/tinymce/Start.java
@@ -1,60 +1,127 @@
+/*
+ * 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 wicket.contrib.examples.tinymce;
-import org.apache.wicket.util.time.Duration;
+import java.lang.management.ManagementFactory;
+
+import javax.management.MBeanServer;
+
+import org.eclipse.jetty.jmx.MBeanContainer;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+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.WebAppContext;
-public class Start
+/**
+ * Separate startup class for people that want to run the examples directly. Use parameter
+ * -Dcom.sun.management.jmxremote to startup JMX (and e.g. connect with jconsole).
+ */
+public class StartExamples
{
- public static void main(String[] args) throws Exception
+ /**
+ * Main function, starts the jetty server.
+ *
+ * @param args
+ */
+ public static void main(String[] args)
{
-// System.setProperty("wicket.configuration", "development");
-
- int timeout = (int)Duration.ONE_HOUR.getMilliseconds();
+ System.setProperty("wicket.configuration", "development");
Server server = new Server();
- SocketConnector connector = new SocketConnector();
- // Set some timeout options to make debugging easier.
- connector.setMaxIdleTime(timeout);
- connector.setSoLingerTime(-1);
- connector.setPort(8080);
- server.addConnector(connector);
+ HttpConfiguration http_config = new HttpConfiguration();
+ http_config.setSecureScheme("https");
+ http_config.setSecurePort(8443);
+ http_config.setOutputBufferSize(32768);
+
+ ServerConnector http = new ServerConnector(server, new HttpConnectionFactory(http_config));
+ http.setPort(8080);
+ http.setIdleTimeout(1000 * 60 * 60);
+
+ server.addConnector(http);
+
+ Resource keystore = Resource.newClassPathResource("/keystore");
+ if (keystore != null && keystore.exists())
+ {
+ // if a keystore for a SSL certificate is available, start a SSL
+ // connector on port 8443.
+ // By default, the quickstart comes with a Apache Wicket Quickstart
+ // Certificate that expires about half way september 2021. Do not
+ // use this certificate anywhere important as the passwords are
+ // available in the source.
+
+ SslContextFactory sslContextFactory = new SslContextFactory();
+ sslContextFactory.setKeyStoreResource(keystore);
+ sslContextFactory.setKeyStorePassword("wicket");
+ sslContextFactory.setKeyManagerPassword("wicket");
- // check if a keystore for a SSL certificate is available, and
- // if so, start a SSL connector on port 8443. By default, the
- // quickstart comes with a Apache Wicket Quickstart Certificate
- // that expires about half way september 2021. Do not use this
- // certificate anywhere important as the passwords are available
- // in the source.
+ HttpConfiguration https_config = new HttpConfiguration(http_config);
+ https_config.addCustomizer(new SecureRequestCustomizer());
+
+ ServerConnector https = new ServerConnector(server, new SslConnectionFactory(
+ sslContextFactory, "http/1.1"), new HttpConnectionFactory(https_config));
+ https.setPort(8443);
+ https.setIdleTimeout(500000);
+
+ server.addConnector(https);
+ System.out.println("SSL access to the examples has been enabled on port 8443");
+ System.out
+ .println("You can access the application using SSL on https://localhost:8443");
+ System.out.println();
+ }
WebAppContext bb = new WebAppContext();
bb.setServer(server);
bb.setContextPath("/");
bb.setWar("src/main/webapp");
- // START JMX SERVER
- // MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
- // MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer);
- // server.getContainer().addEventListener(mBeanContainer);
- // mBeanContainer.start();
+ // uncomment next line if you want to test with JSESSIONID encoded in the urls
+ // ((AbstractSessionManager)
+ // bb.getSessionHandler().getSessionManager()).setUsingCookies(false);
server.setHandler(bb);
+ MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
+ MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer);
+ server.addEventListener(mBeanContainer);
+ server.addBean(mBeanContainer);
+
try
{
- System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP");
server.start();
- System.in.read();
- System.out.println(">>> STOPPING EMBEDDED JETTY SERVER");
- server.stop();
server.join();
}
catch (Exception e)
{
e.printStackTrace();
- System.exit(1);
+ System.exit(100);
}
}
+
+ /**
+ * Construct.
+ */
+ StartExamples()
+ {
+ super();
+ }
}
diff --git a/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/image/ImageUploadContentPanel.java b/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/image/ImageUploadContentPanel.java
index 18657fab5f..60a4f98b7c 100644
--- a/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/image/ImageUploadContentPanel.java
+++ b/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/image/ImageUploadContentPanel.java
@@ -51,7 +51,7 @@ public ImageUploadContentPanel(String pId, String customUploadFolderPath)
private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget pTarget, Form> pForm)
+ protected void onSubmit(AjaxRequestTarget pTarget)
{
FileUpload fileUpload = fileUploadField.getFileUpload();
String fileName = fileUpload.getClientFileName();
@@ -81,7 +81,7 @@ protected void onSubmit(AjaxRequestTarget pTarget, Form> pForm)
}
@Override
- protected void onError(AjaxRequestTarget pTarget, Form> pForm)
+ protected void onError(AjaxRequestTarget pTarget)
{
pTarget.add(feedback);
}
diff --git a/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/image/ImageUploadPanel.java b/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/image/ImageUploadPanel.java
index ea0eb6ff36..47bc46f3e1 100644
--- a/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/image/ImageUploadPanel.java
+++ b/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/image/ImageUploadPanel.java
@@ -3,8 +3,9 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+
import org.apache.wicket.Component;
-import org.apache.wicket.IResourceListener;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
@@ -19,6 +20,7 @@
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
@@ -32,7 +34,7 @@
*
* @author Michal Letynski
*/
-public class ImageUploadPanel extends Panel implements IResourceListener {
+public class ImageUploadPanel extends Panel implements IRequestListener {
private static final long serialVersionUID = -5848356532326545817L;
private static final Logger log = LoggerFactory
@@ -93,7 +95,7 @@ public void onImageUploaded(
modalWindow.close(pTarget);
resetModalContent();
CharSequence url = ImageUploadPanel.this
- .urlFor(IResourceListener.INTERFACE, null);
+ .urlForListener(new PageParameters());
XmlTag xmlImageTag = ImageUploadHelper.createImageTag(
pImageFileDescription, url);
pTarget.appendJavaScript("putImage('"
@@ -122,11 +124,8 @@ public void renderHead(Component c, IHeaderResponse pResponse) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
- public void onResourceRequested() {
+ public void onRequest() {
final String fileName = RequestCycle.get().getRequest()
.getQueryParameters()
.getParameterValue(ImageUploadHelper.IMAGE_FILE_NAME)
diff --git a/twitter-parent/twitter-examples/pom.xml b/twitter-parent/twitter-examples/pom.xml
index ec68aceaf1..cd84a5fcd5 100644
--- a/twitter-parent/twitter-examples/pom.xml
+++ b/twitter-parent/twitter-examples/pom.xml
@@ -48,7 +48,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/urlfragment-parent/urlfragment-example/pom.xml b/urlfragment-parent/urlfragment-example/pom.xml
index bb42cfcc67..28e09051a6 100644
--- a/urlfragment-parent/urlfragment-example/pom.xml
+++ b/urlfragment-parent/urlfragment-example/pom.xml
@@ -81,8 +81,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
- provided
+ jetty-all
+ uber
diff --git a/whiteboard-parent/whiteboard-examples/pom.xml b/whiteboard-parent/whiteboard-examples/pom.xml
index d0d8dfd2e9..1fbb1ee920 100644
--- a/whiteboard-parent/whiteboard-examples/pom.xml
+++ b/whiteboard-parent/whiteboard-examples/pom.xml
@@ -52,8 +52,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
- provided
+ jetty-all
+ uber
@@ -64,7 +64,7 @@
maven-war-plugin
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/wicket-facebook-parent/wicket-facebook-examples/pom.xml b/wicket-facebook-parent/wicket-facebook-examples/pom.xml
index 287654be98..dc2f3bb7a8 100644
--- a/wicket-facebook-parent/wicket-facebook-examples/pom.xml
+++ b/wicket-facebook-parent/wicket-facebook-examples/pom.xml
@@ -50,7 +50,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/wicket-foundation/wicket-foundation-samples/pom.xml b/wicket-foundation/wicket-foundation-samples/pom.xml
index dbf36a4560..5e928c4afb 100644
--- a/wicket-foundation/wicket-foundation-samples/pom.xml
+++ b/wicket-foundation/wicket-foundation-samples/pom.xml
@@ -29,7 +29,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/wicket-html5-parent/wicket-html5-examples/pom.xml b/wicket-html5-parent/wicket-html5-examples/pom.xml
index 6d24ca4b7e..82098dbacd 100644
--- a/wicket-html5-parent/wicket-html5-examples/pom.xml
+++ b/wicket-html5-parent/wicket-html5-examples/pom.xml
@@ -63,7 +63,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/wicket-mount-parent/wicket-mount-example/pom.xml b/wicket-mount-parent/wicket-mount-example/pom.xml
index eb1d171b03..4a62f879ca 100644
--- a/wicket-mount-parent/wicket-mount-example/pom.xml
+++ b/wicket-mount-parent/wicket-mount-example/pom.xml
@@ -47,7 +47,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/wicket-poi-parent/wicket-poi-examples/pom.xml b/wicket-poi-parent/wicket-poi-examples/pom.xml
index 82979284c1..57152e5a22 100644
--- a/wicket-poi-parent/wicket-poi-examples/pom.xml
+++ b/wicket-poi-parent/wicket-poi-examples/pom.xml
@@ -51,13 +51,14 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/wicket-security-parent/archetypes/swarm-quickstart/src/main/resources/archetype-resources/pom.xml b/wicket-security-parent/archetypes/swarm-quickstart/src/main/resources/archetype-resources/pom.xml
index 750be60c65..0526a8de49 100644
--- a/wicket-security-parent/archetypes/swarm-quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/wicket-security-parent/archetypes/swarm-quickstart/src/main/resources/archetype-resources/pom.xml
@@ -57,19 +57,19 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty
${jetty.version}
provided
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
${jetty.version}
provided
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-management
${jetty.version}
provided
diff --git a/wicket-security-parent/examples/all_in_one/pom.xml b/wicket-security-parent/examples/all_in_one/pom.xml
index 7f8e7a1486..2eec5ed185 100644
--- a/wicket-security-parent/examples/all_in_one/pom.xml
+++ b/wicket-security-parent/examples/all_in_one/pom.xml
@@ -79,7 +79,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
maven-jetty-plugin
diff --git a/wicket-security-parent/examples/secureforms-example/pom.xml b/wicket-security-parent/examples/secureforms-example/pom.xml
index 6a09efbef8..30ac82820b 100644
--- a/wicket-security-parent/examples/secureforms-example/pom.xml
+++ b/wicket-security-parent/examples/secureforms-example/pom.xml
@@ -39,7 +39,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
maven-jetty-plugin
@@ -92,19 +92,19 @@
test
- org.mortbay.jetty
+ org.eclipse.jetty
jetty
${jetty.version}
provided
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
${jetty.version}
provided
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-management
${jetty.version}
provided
diff --git a/wicket-security-parent/examples/spring-security/pom.xml b/wicket-security-parent/examples/spring-security/pom.xml
index d368503c2f..84ed749d1c 100644
--- a/wicket-security-parent/examples/spring-security/pom.xml
+++ b/wicket-security-parent/examples/spring-security/pom.xml
@@ -35,7 +35,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
maven-jetty-plugin
@@ -167,17 +167,17 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty
${jetty.version}
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
${jetty.version}
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-management
${jetty.version}
diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml b/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml
index ec265d0511..edd74e8dd0 100644
--- a/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml
+++ b/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml
@@ -92,7 +92,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
${jetty.version}
diff --git a/wicketstuff-datetime-yui-parent/wicketstuff-datetime-yui-examples/pom.xml b/wicketstuff-datetime-yui-parent/wicketstuff-datetime-yui-examples/pom.xml
index 92b36b3a04..d164838d6c 100644
--- a/wicketstuff-datetime-yui-parent/wicketstuff-datetime-yui-examples/pom.xml
+++ b/wicketstuff-datetime-yui-parent/wicketstuff-datetime-yui-examples/pom.xml
@@ -80,9 +80,7 @@
org.eclipse.jetty.aggregate
jetty-all
-
- 9.2.3.v20140905
- test
+ uber
diff --git a/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml b/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml
index d81eb1a86c..71fd5dcc62 100644
--- a/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml
+++ b/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml
@@ -42,7 +42,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/wicketstuff-restannotations-parent/restannotations-examples/pom.xml b/wicketstuff-restannotations-parent/restannotations-examples/pom.xml
index 2d6fa4ef8e..3d5e67a188 100644
--- a/wicketstuff-restannotations-parent/restannotations-examples/pom.xml
+++ b/wicketstuff-restannotations-parent/restannotations-examples/pom.xml
@@ -73,7 +73,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
diff --git a/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml b/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml
index 0fa23fa832..a85a3c27ac 100644
--- a/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml
+++ b/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml
@@ -39,7 +39,8 @@
org.eclipse.jetty.aggregate
- jetty-all-server
+ jetty-all
+ uber
org.slf4j
diff --git a/yui-parent/yui-examples/pom.xml b/yui-parent/yui-examples/pom.xml
index f9375655ad..baae62b514 100644
--- a/yui-parent/yui-examples/pom.xml
+++ b/yui-parent/yui-examples/pom.xml
@@ -58,7 +58,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
maven-jetty-plugin
30
@@ -90,18 +90,18 @@
test
- org.mortbay.jetty
+ org.eclipse.jetty
jetty
${jetty.version}
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
${jetty.version}
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-management
${jetty.version}