You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2006/10/27 19:01:35 UTC
svn commit: r468454 - in
/incubator/wicket/branches/wicket-1.x/wicket-spring-examples: .classpath
.project pom.xml src/main/launcher/jetty/StartSpringExamples.java
Author: ehillenius
Date: Fri Oct 27 10:01:34 2006
New Revision: 468454
URL: http://svn.apache.org/viewvc?view=rev&rev=468454
Log:
updated jetty
Modified:
incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.classpath
incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.project
incubator/wicket/branches/wicket-1.x/wicket-spring-examples/pom.xml
incubator/wicket/branches/wicket-1.x/wicket-spring-examples/src/main/launcher/jetty/StartSpringExamples.java
Modified: incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.classpath
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.classpath?view=diff&rev=468454&r1=468453&r2=468454
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.classpath (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.classpath Fri Oct 27 10:01:34 2006
@@ -1,21 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/main/launcher"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar" kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar" kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar" kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
- <classpathentry sourcepath="M2_REPO/org/springframework/spring/1.2.6/spring-1.2.6-sources.jar" kind="var" path="M2_REPO/org/springframework/spring/1.2.6/spring-1.2.6.jar"/>
- <classpathentry sourcepath="M2_REPO/asm/asm/1.5.3/asm-1.5.3-sources.jar" kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/jetty/jasper-runtime/4.2.20RC0/jasper-runtime-4.2.20RC0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jetty/jetty/4.2.9/jetty-4.2.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/jetty/jasper-compiler/4.2.20RC0/jasper-compiler-4.2.20RC0.jar"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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/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/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/asm/asm/1.5.3/asm-1.5.3.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/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/servlet-api-2.5/6.0.1/servlet-api-2.5-6.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar" sourcepath="M2_REPO/org/springframework/spring/2.0/spring-2.0-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/portlet/portlet-api/1.0/portlet-api-1.0.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 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/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/>
+ <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/org/mortbay/jetty/jetty-management/6.0.1/jetty-management-6.0.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/wicket"/>
<classpathentry combineaccessrules="false" kind="src" path="/wicket-extensions"/>
<classpathentry combineaccessrules="false" kind="src" path="/wicket-spring"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/wicket-spring-annot"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.project
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.project?view=diff&rev=468454&r1=468453&r2=468454
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.project (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-spring-examples/.project Fri Oct 27 10:01:34 2006
@@ -1,6 +1,6 @@
<projectDescription>
<name>wicket-spring-examples</name>
- <comment/>
+ <comment>Wicket is a Java open source, component based web application framework.</comment>
<projects/>
<buildSpec>
<buildCommand>
Modified: incubator/wicket/branches/wicket-1.x/wicket-spring-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring-examples/pom.xml?view=diff&rev=468454&r1=468453&r2=468454
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-spring-examples/pom.xml (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-spring-examples/pom.xml Fri Oct 27 10:01:34 2006
@@ -27,27 +27,21 @@
</dependency>
<!-- jetty launcher dependencies -->
-
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>4.2.9</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>4.2.20RC0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>4.2.20RC0</version>
- <scope>provided</scope>
- </dependency>
+ <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-spring-examples/src/main/launcher/jetty/StartSpringExamples.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring-examples/src/main/launcher/jetty/StartSpringExamples.java?view=diff&rev=468454&r1=468453&r2=468454
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-spring-examples/src/main/launcher/jetty/StartSpringExamples.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-spring-examples/src/main/launcher/jetty/StartSpringExamples.java Fri Oct 27 10:01:34 2006
@@ -17,64 +17,50 @@
*/
package jetty;
-import java.net.URL;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.BasicConfigurator;
+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.
*/
-public class StartSpringExamples
-{
- /**
- * Used for logging.
- */
- private static Log log = LogFactory.getLog(StartSpringExamples.class);
-
- /**
- * Construct.
- */
- StartSpringExamples()
- {
- super();
- }
+public class StartSpringExamples {
/**
* Main function, starts the jetty server.
*
* @param args
*/
- public static void main(String[] args)
- {
- BasicConfigurator.configure();
- Server jettyServer = null;
- try
- {
- URL jettyConfig = new URL("file:src/main/launcher/jetty-config.xml");
- if (jettyConfig == null)
- {
- log.fatal("Unable to locate jetty-config.xml on the classpath");
- }
- jettyServer = new Server(jettyConfig);
- jettyServer.start();
- }
- 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);
- }
- }
+ public static void main(String[] args) {
+ 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/webapp");
+ server.addHandler(web);
+
+ // MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
+ // MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer);
+ // server.getContainer().addEventListener(mBeanContainer);
+ // mBeanContainer.start();
+
+ try {
+ server.start();
+ server.join();
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.exit(100);
}
+ }
+
+ /**
+ * Construct.
+ */
+ StartSpringExamples() {
+ super();
}
}