You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2011/01/18 08:06:32 UTC
svn commit: r1060215 - in /wicket/trunk: ./
archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
testing/wicket-threadtest/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/
testing/wicket-thr...
Author: dashorst
Date: Tue Jan 18 07:06:32 2011
New Revision: 1060215
URL: http://svn.apache.org/viewvc?rev=1060215&view=rev
Log:
Fixes WICKET-3344
Modified:
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
wicket/trunk/pom.xml
wicket/trunk/testing/wicket-threadtest/pom.xml
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java
wicket/trunk/testing/wicket-threadtest/src/main/webapp/WEB-INF/web.xml
wicket/trunk/wicket-examples/pom.xml
wicket/trunk/wicket-examples/src/main/webapp/WEB-INF/web.xml
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
Modified: wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Tue Jan 18 07:06:32 2011
@@ -1,34 +1,32 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<display-name>${artifactId}</display-name>
- <!--
- There are three means to configure Wickets configuration mode and they are
- tested in the order given.
- 1) A system property: -Dwicket.configuration
- 2) servlet specific <init-param>
- 3) context specific <context-param>
- The value might be either "development" (reloading when templates change)
- or "deployment". If no configuration is found, "development" is the default.
- -->
+ <!--
+ There are three means to configure Wickets configuration mode and they
+ are tested in the order given.
+
+ 1) A system property: -Dwicket.configuration
+ 2) servlet specific <init-param>
+ 3) context specific <context-param>
+
+ The value might be either "development" (reloading when templates change) or
+ "deployment". If no configuration is found, "development" is the default. -->
<filter>
<filter-name>wicket.${artifactId}</filter-name>
- <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+ <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
<param-value>${package}.WicketApplication</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>wicket.${artifactId}</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>wicket.${artifactId}</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
</web-app>
Modified: wicket/trunk/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Tue Jan 18 07:06:32 2011
@@ -32,7 +32,7 @@
<description>Wicket is a Java-based open source component web application framework.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jetty.version>6.1.25</jetty.version>
+ <jetty.version>7.2.2.v20101205</jetty.version>
</properties>
<profiles>
@@ -346,7 +346,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -382,17 +382,11 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
<version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.mortbay.jetty</groupId>-->
- <!--<artifactId>servlet-api-2.5</artifactId>-->
- <!--<version>${jetty.version}</version>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
@@ -400,18 +394,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
@@ -721,7 +703,7 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
<scanIntervalSeconds>60</scanIntervalSeconds>
Modified: wicket/trunk/testing/wicket-threadtest/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/pom.xml?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/pom.xml (original)
+++ wicket/trunk/testing/wicket-threadtest/pom.xml Tue Jan 18 07:06:32 2011
@@ -43,12 +43,8 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
</dependency>
<dependency>
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java Tue Jan 18 07:06:32 2011
@@ -26,8 +26,8 @@ import org.apache.commons.httpclient.par
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
import org.apache.wicket.threadtest.tester.CommandRunner.CommandRunnerObserver;
import org.apache.wicket.util.time.Duration;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,7 +91,7 @@ public final class Tester implements Com
// start up server
server = new Server(port);
WebAppContext ctx = new WebAppContext("./src/main/webapp", "/");
- server.addHandler(ctx);
+ server.setHandler(ctx);
try
{
server.start();
Modified: wicket/trunk/testing/wicket-threadtest/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/webapp/WEB-INF/web.xml?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/webapp/WEB-INF/web.xml (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/webapp/WEB-INF/web.xml Tue Jan 18 07:06:32 2011
@@ -15,11 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<display-name>Wicket Thread Test</display-name>
Modified: wicket/trunk/wicket-examples/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Tue Jan 18 07:06:32 2011
@@ -89,16 +89,8 @@
<artifactId>httpunit</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-management</artifactId>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -150,7 +142,7 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: wicket/trunk/wicket-examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/webapp/WEB-INF/web.xml?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/webapp/WEB-INF/web.xml (original)
+++ wicket/trunk/wicket-examples/src/main/webapp/WEB-INF/web.xml Tue Jan 18 07:06:32 2011
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<display-name>Wicket Examples</display-name>
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/JettyTestCaseDecorator.java Tue Jan 18 07:06:32 2011
@@ -19,10 +19,10 @@ package org.apache.wicket.examples;
import junit.extensions.TestSetup;
import junit.framework.Test;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
/**
* Test decorator that starts a jetty instance
@@ -73,7 +73,7 @@ public class JettyTestCaseDecorator exte
{
web.setWar(webappLocation);
}
- server.addHandler(web);
+ server.setHandler(web);
server.start();
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java?rev=1060215&r1=1060214&r2=1060215&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java Tue Jan 18 07:06:32 2011
@@ -20,9 +20,11 @@ import java.lang.management.ManagementFa
import javax.management.MBeanServer;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.management.MBeanContainer;
+import org.eclipse.jetty.jmx.MBeanContainer;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
/**
* Seperate startup class for people that want to run the examples directly. Use parameter
@@ -41,16 +43,29 @@ public class StartExamples
*/
public static void main(String[] args)
{
- Server server = new Server(8080);
- WebAppContext web = new WebAppContext(server, "src/main/webapp", "/wicket-examples");
+ Server server = new Server();
+ SocketConnector connector = new SocketConnector();
+
+ // Set some timeout options to make debugging easier.
+ connector.setMaxIdleTime(1000 * 60 * 60);
+ connector.setSoLingerTime(-1);
+ connector.setPort(8080);
+ server.setConnectors(new Connector[] { connector });
+
+ WebAppContext bb = new WebAppContext();
+ bb.setServer(server);
+ bb.setContextPath("/");
+ bb.setWar("src/main/webapp");
+
+ server.setHandler(bb);
MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer);
server.getContainer().addEventListener(mBeanContainer);
- mBeanContainer.start();
try
{
+ mBeanContainer.start();
server.start();
server.join();
}