Author: ehillenius
Date: Sun Jan 14 10:58:35 2007
New Revision: 496115
URL: http://svn.apache.org/viewvc?view=rev&rev=496115
Log:
updated Jetty
Removed:
incubator/wicket/branches/wicket-1.x/wicket-quickstart/src/main/resources/jetty-config.xml
Modified:
incubator/wicket/branches/wicket-1.x/wicket-quickstart/.classpath
incubator/wicket/branches/wicket-1.x/wicket-quickstart/.project
incubator/wicket/branches/wicket-1.x/wicket-quickstart/pom.xml
incubator/wicket/branches/wicket-1.x/wicket-quickstart/src/main/java/wicket/quickstart/Start.java
Modified: incubator/wicket/branches/wicket-1.x/wicket-quickstart/.classpath
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-quickstart/.classpath?view=diff&rev=496115&r1=496114&r2=496115
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-quickstart/.classpath (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-quickstart/.classpath Sun Jan
14 10:58:35 2007
@@ -1,15 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="var"
path="M2_REPO/jetty/org.mortbay.jetty/4.2.24/org.mortbay.jetty-4.2.24.jar"/>
- <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"
sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"
sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/tomcat/jasper-compiler/4.1.30/jasper-compiler-4.1.30.jar"
sourcepath="M2_REPO/tomcat/jasper-compiler/4.1.30/jasper-compiler-4.1.30-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/tomcat/jasper-runtime/4.1.30/jasper-runtime-4.1.30.jar"
sourcepath="M2_REPO/tomcat/jasper-runtime/4.1.30/jasper-runtime-4.1.30-sources.jar"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/mx4j/mx4j-tools/3.0.1/mx4j-tools-3.0.1.jar"
sourcepath="M2_REPO/mx4j/mx4j-tools/3.0.1/mx4j-tools-3.0.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mortbay/jetty/jetty-management/6.0.1/jetty-management-6.0.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1.jar"
sourcepath="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.0.1/servlet-api-2.5-6.0.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mortbay/jetty/jetty-util/6.0.1/jetty-util-6.0.1.jar"
sourcepath="M2_REPO/org/mortbay/jetty/jetty-util/6.0.1/jetty-util-6.0.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"
sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"
sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/portlet/portlet-api/1.0/portlet-api-1.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mortbay/jetty/jetty/6.0.1/jetty-6.0.1.jar"
sourcepath="M2_REPO/org/mortbay/jetty/jetty/6.0.1/jetty-6.0.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar"
sourcepath="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1-sources.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/wicket"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/wicket-extensions"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: incubator/wicket/branches/wicket-1.x/wicket-quickstart/.project
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-quickstart/.project?view=diff&rev=496115&r1=496114&r2=496115
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-quickstart/.project (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-quickstart/.project Sun Jan 14
10:58:35 2007
@@ -1,6 +1,6 @@
<projectDescription>
<name>wicket-quickstart</name>
- <comment></comment>
+ <comment>Wicket Quickstart is designed to get you up and coding your Wicket
applications within minutes. No more creating your own project and having to
download dependencies yourself. This is an all-in-one package allowing you to
concentrate on your application, and Quickstart on the project
structure.</comment>
<projects/>
<buildSpec>
<buildCommand>
Modified: incubator/wicket/branches/wicket-1.x/wicket-quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-quickstart/pom.xml?view=diff&rev=496115&r1=496114&r2=496115
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-quickstart/pom.xml (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-quickstart/pom.xml Sun Jan 14
10:58:35 2007
@@ -42,26 +42,20 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
</dependency>
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>4.2.24</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>4.1.30</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>4.1.30</version>
- <type>jar</type>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-management</artifactId>
+ <version>6.0.1</version>
</dependency>
</dependencies>
Modified:
incubator/wicket/branches/wicket-1.x/wicket-quickstart/src/main/java/wicket/quickstart/Start.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-quickstart/src/main/java/wicket/quickstart/Start.java?view=diff&rev=496115&r1=496114&r2=496115
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket-quickstart/src/main/java/wicket/quickstart/Start.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket-quickstart/src/main/java/wicket/quickstart/Start.java
Sun Jan 14 10:58:35 2007
@@ -16,11 +16,12 @@
*/
package wicket.quickstart;
-import java.net.URL;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
+import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.webapp.WebAppContext;
/**
* Seperate startup class for people that want to run the examples directly.
@@ -47,31 +48,31 @@
*/
public static void main(String[] args)
{
- Server jettyServer = null;
+ Server server = new Server();
+ SelectChannelConnector connector = new SelectChannelConnector();
+ connector.setPort(8080);
+ server.setConnectors(new Connector[] { connector });
+
+ WebAppContext web = new WebAppContext();
+ web.setContextPath("/wicket-examples");
+ web.setWar("src/main/webapp");
+ server.addHandler(web);
+
+ // uncomment this to enable JMX (need Java 5)
+ // MBeanServer mBeanServer =
ManagementFactory.getPlatformMBeanServer();
+ // MBeanContainer mBeanContainer = new
MBeanContainer(mBeanServer);
+ // server.getContainer().addEventListener(mBeanContainer);
+ // mBeanContainer.start();
+
try
{
- URL jettyConfig = new
URL("file:src/main/resources/jetty-config.xml");
- if (jettyConfig == null)
- {
- log.fatal("Unable to locate
jetty-test-config.xml on the classpath");
- }
- jettyServer = new Server(jettyConfig);
- jettyServer.start();
+ server.start();
+ server.join();
}
catch (Exception e)
{
- log.fatal("Could not start the Jetty server: " + e);
- if (jettyServer != null)
- {
- try
- {
- jettyServer.stop();
- }
- catch (InterruptedException e1)
- {
- log.fatal("Unable to stop the jetty
server: " + e1);
- }
- }
+ e.printStackTrace();
+ System.exit(100);
}
}
}
