You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tuscany.apache.org by Raymond Feng <en...@gmail.com> on 2009/10/11 07:30:54 UTC
Adding Jetty7 based http host, was: Re: svn commit: r824025
Hi,
I just added a Jetty7 based http host (under o.a.t.sca.http.jetty7) . Jetty
7 is now an Eclipse project and they just made a release [1].
[1] http://www.infoq.com/news/2009/10/jetty-7-0-released
Thanks,
Raymond
--------------------------------------------------
From: <rf...@apache.org>
Sent: Saturday, October 10, 2009 10:27 PM
To: <co...@tuscany.apache.org>
Subject: svn commit: r824025 - in /tuscany/java/sca/modules/host-jetty7: ./
META-INF/ src/main/java/org/apache/tuscany/sca/http/jetty/
src/main/java/org/apache/tuscany/sca/http/jetty7/
src/main/resources/META-INF/services/
src/test/java/org/apache/tuscany/sca/h...
> Author: rfeng
> Date: Sun Oct 11 05:27:16 2009
> New Revision: 824025
>
> URL: http://svn.apache.org/viewvc?rev=824025&view=rev
> Log:
> Add http host for jetty 7 (org.eclipse.jetty)
>
> Added:
> tuscany/java/sca/modules/host-jetty7/
> - copied from r823669, tuscany/java/sca/modules/host-jetty/
>
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/
> - copied from r823669,
> tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/
>
> tuscany/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/
> - copied from r823669,
> tuscany/java/sca/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/
> Removed:
>
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty/
>
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyLogger.java
>
> tuscany/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty/
> Modified:
> tuscany/java/sca/modules/host-jetty7/META-INF/MANIFEST.MF
> tuscany/java/sca/modules/host-jetty7/pom.xml
>
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
>
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
>
> tuscany/java/sca/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
>
> tuscany/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
>
> Modified: tuscany/java/sca/modules/host-jetty7/META-INF/MANIFEST.MF
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty7/META-INF/MANIFEST.MF?rev=824025&r1=823669&r2=824025&view=diff
> ==============================================================================
> --- tuscany/java/sca/modules/host-jetty7/META-INF/MANIFEST.MF (original)
> +++ tuscany/java/sca/modules/host-jetty7/META-INF/MANIFEST.MF Sun Oct 11
> 05:27:16 2009
> @@ -1,7 +1,7 @@
> Manifest-Version: 1.0
> Private-Package: org.apache.tuscany.sca.http.jetty;version="2.0.0"
> Tool: Bnd-0.0.255
> -Bundle-Name: Apache Tuscany SCA Jetty Servlet Host Extension
> +Bundle-Name: Apache Tuscany SCA Jetty7 Servlet Host Extension
> Created-By: 1.6.0_07 (Sun Microsystems Inc.)
> Bundle-Vendor: The Apache Software Foundation
> Bundle-Version: 2.0.0
> @@ -15,15 +15,15 @@
> org.apache.tuscany.sca.core;version="2.0.0",
> org.apache.tuscany.sca.host.http;version="2.0.0",
> org.apache.tuscany.sca.work;version="2.0.0",
> - org.mortbay.component;version="6.1.19",
> - org.mortbay.jetty;version="6.1.19",
> - org.mortbay.jetty.handler;version="6.1.19",
> - org.mortbay.jetty.nio;version="6.1.19",
> - org.mortbay.jetty.security;version="6.1.19",
> - org.mortbay.jetty.servlet;version="6.1.19",
> - org.mortbay.log;version="6.1.19",
> - org.mortbay.resource;version="6.1.19",
> - org.mortbay.thread;version="6.1.19"
> -Bundle-SymbolicName: org.apache.tuscany.sca.host.jetty
> + org.eclipse.jetty.util.component;version="7.0.0.v20091005",
> + org.eclipse.jetty;version="7.0.0.v20091005",
> + org.eclipse.jetty.handler;version="7.0.0.v20091005",
> + org.eclipse.jetty.nio;version="7.0.0.v20091005",
> + org.eclipse.jetty.security;version="7.0.0.v20091005",
> + org.eclipse.jetty.servlet;version="7.0.0.v20091005",
> + org.eclipse.jetty.util.log;version="7.0.0.v20091005",
> + org.eclipse.jetty.util.resource;version="7.0.0.v20091005",
> + org.eclipse.jetty.util.thread;version="7.0.0.v20091005"
> +Bundle-SymbolicName: org.apache.tuscany.sca.host.jetty7
> Bundle-DocURL: http://www.apache.org/
> Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
>
> Modified: tuscany/java/sca/modules/host-jetty7/pom.xml
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty7/pom.xml?rev=824025&r1=823669&r2=824025&view=diff
> ==============================================================================
> --- tuscany/java/sca/modules/host-jetty7/pom.xml (original)
> +++ tuscany/java/sca/modules/host-jetty7/pom.xml Sun Oct 11 05:27:16 2009
> @@ -25,8 +25,8 @@
> <version>2.0-SNAPSHOT</version>
> <relativePath>../pom.xml</relativePath>
> </parent>
> - <artifactId>tuscany-host-jetty</artifactId>
> - <name>Apache Tuscany SCA Jetty Servlet Host Extension</name>
> + <artifactId>tuscany-host-jetty7</artifactId>
> + <name>Apache Tuscany SCA Jetty7 Servlet Host Extension</name>
>
> <dependencies>
> <dependency>
> @@ -36,27 +36,15 @@
> </dependency>
>
> <dependency>
> - <groupId>org.mortbay.jetty</groupId>
> - <artifactId>jetty</artifactId>
> - <version>6.1.19</version>
> - <exclusions>
> - <exclusion>
> - <groupId>org.mortbay.jetty</groupId>
> - <artifactId>servlet-api</artifactId>
> - </exclusion>
> - </exclusions>
> + <groupId>org.eclipse.jetty</groupId>
> + <artifactId>jetty-server</artifactId>
> + <version>7.0.0.v20091005</version>
> </dependency>
>
> <dependency>
> - <groupId>org.mortbay.jetty</groupId>
> - <artifactId>jetty-util</artifactId>
> - <version>6.1.19</version>
> - <exclusions>
> - <exclusion>
> - <groupId>org.mortbay.jetty</groupId>
> - <artifactId>servlet-api</artifactId>
> - </exclusion>
> - </exclusions>
> + <groupId>org.eclipse.jetty</groupId>
> + <artifactId>jetty-servlet</artifactId>
> + <version>7.0.0.v20091005</version>
> </dependency>
>
> <dependency>
>
> Modified:
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java?rev=824025&r1=823669&r2=824025&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
> (original)
> +++
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
> Sun Oct 11 05:27:16 2009
> @@ -17,16 +17,16 @@
> * under the License.
> */
>
> -package org.apache.tuscany.sca.http.jetty;
> +package org.apache.tuscany.sca.http.jetty7;
>
> import java.io.File;
> import java.io.IOException;
> import java.net.MalformedURLException;
> import java.net.URL;
>
> -import org.mortbay.jetty.servlet.DefaultServlet;
> -import org.mortbay.resource.Resource;
> -import org.mortbay.resource.URLResource;
> +import org.eclipse.jetty.servlet.DefaultServlet;
> +import org.eclipse.jetty.util.resource.Resource;
> +import org.eclipse.jetty.util.resource.URLResource;
>
> /**
> * Customizes the Jetty default Servlet.
>
> Modified:
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java?rev=824025&r1=823669&r2=824025&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
> (original)
> +++
> tuscany/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
> Sun Oct 11 05:27:16 2009
> @@ -16,7 +16,7 @@
> * specific language governing permissions and limitations
> * under the License.
> */
> -package org.apache.tuscany.sca.http.jetty;
> +package org.apache.tuscany.sca.http.jetty7;
>
> import java.net.InetAddress;
> import java.net.MalformedURLException;
> @@ -34,7 +34,6 @@
> import java.util.Map;
> import java.util.Set;
> import java.util.Map.Entry;
> -import java.util.logging.Logger;
>
> import javax.servlet.RequestDispatcher;
> import javax.servlet.Servlet;
> @@ -47,18 +46,20 @@
> import org.apache.tuscany.sca.host.http.ServletHost;
> import org.apache.tuscany.sca.host.http.ServletMappingException;
> import org.apache.tuscany.sca.work.WorkScheduler;
> -import org.mortbay.jetty.Connector;
> -import org.mortbay.jetty.Server;
> -import org.mortbay.jetty.handler.ContextHandler;
> -import org.mortbay.jetty.nio.SelectChannelConnector;
> -import org.mortbay.jetty.security.SslSocketConnector;
> -import org.mortbay.jetty.servlet.DefaultServlet;
> -import org.mortbay.jetty.servlet.ServletHandler;
> -import org.mortbay.jetty.servlet.ServletHolder;
> -import org.mortbay.jetty.servlet.ServletMapping;
> -import org.mortbay.jetty.servlet.SessionHandler;
> -import org.mortbay.log.Log;
> -import org.mortbay.thread.ThreadPool;
> +import org.eclipse.jetty.server.Connector;
> +import org.eclipse.jetty.server.Server;
> +import org.eclipse.jetty.server.handler.ContextHandler;
> +import org.eclipse.jetty.server.nio.SelectChannelConnector;
> +import org.eclipse.jetty.server.session.SessionHandler;
> +import org.eclipse.jetty.server.ssl.SslSocketConnector;
> +import org.eclipse.jetty.servlet.DefaultServlet;
> +import org.eclipse.jetty.servlet.ServletHandler;
> +import org.eclipse.jetty.servlet.ServletHolder;
> +import org.eclipse.jetty.servlet.ServletMapping;
> +import org.eclipse.jetty.util.log.JavaUtilLog;
> +import org.eclipse.jetty.util.log.Log;
> +import org.eclipse.jetty.util.log.Logger;
> +import org.eclipse.jetty.util.thread.ThreadPool;
>
> /**
> * Implements an HTTP transport service using Jetty.
> @@ -66,7 +67,7 @@
> * @version $Rev$ $Date$
> */
> public class JettyServer implements ServletHost, LifeCycleListener {
> - private static final Logger logger =
> Logger.getLogger(JettyServer.class.getName());
> + private static final java.util.logging.Logger logger =
> java.util.logging.Logger.getLogger(JettyServer.class.getName());
>
> private final Object joinLock = new Object();
> private String trustStore;
> @@ -106,7 +107,7 @@
> private Map<Integer, Port> ports = new HashMap<Integer, Port>();
>
> private String contextPath = "/";
> - private org.mortbay.log.Logger jettyLogger;
> + private Logger jettyLogger;
>
> public JettyServer(ExtensionPointRegistry registry) {
>
> this(registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(WorkScheduler.class));
> @@ -228,7 +229,7 @@
>
> SessionHandler sessionHandler = new SessionHandler();
> ServletHandler servletHandler = new ServletHandler();
> - sessionHandler.addHandler(servletHandler);
> + sessionHandler.setHandler(servletHandler);
>
> contextHandler.setHandler(sessionHandler);
>
> @@ -509,12 +510,11 @@
>
> public void start() {
> try {
> - jettyLogger = Log.getLog();
> + jettyLogger = new JavaUtilLog(JettyServer.class.getName());
> + Log.setLog(jettyLogger);
> } catch (Throwable e) {
> // Ignore
> - } finally {
> - Log.setLog(new JettyLogger());
> - }
> + }
> }
>
> }
>
> Modified:
> tuscany/java/sca/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost?rev=824025&r1=823669&r2=824025&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
> (original)
> +++
> tuscany/java/sca/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
> Sun Oct 11 05:27:16 2009
> @@ -15,4 +15,4 @@
> # specific language governing permissions and limitations
> # under the License.
> # Implementation class for the ServletHost
> -org.apache.tuscany.sca.http.jetty.JettyServer;name=jetty,ranking=100
> \ No newline at end of file
> +org.apache.tuscany.sca.http.jetty7.JettyServer;name=jetty7,ranking=50
> \ No newline at end of file
>
> Modified:
> tuscany/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
> URL:
> http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java?rev=824025&r1=823669&r2=824025&view=diff
> ==============================================================================
> ---
> tuscany/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
> (original)
> +++
> tuscany/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
> Sun Oct 11 05:27:16 2009
> @@ -16,7 +16,7 @@
> * specific language governing permissions and limitations
> * under the License.
> */
> -package org.apache.tuscany.sca.http.jetty;
> +package org.apache.tuscany.sca.http.jetty7;
>
> import java.io.BufferedReader;
> import java.io.IOException;
> @@ -39,6 +39,7 @@
> import junit.framework.TestCase;
>
> import org.apache.tuscany.sca.host.http.DefaultResourceServlet;
> +import org.apache.tuscany.sca.http.jetty7.JettyServer;
> import org.apache.tuscany.sca.work.NotificationListener;
> import org.apache.tuscany.sca.work.WorkScheduler;
>
> @@ -103,6 +104,7 @@
> System.setProperty("javax.net.ssl.keyStore",
> "target/test-classes/tuscany.keyStore");
> System.setProperty("javax.net.ssl.keyStorePassword", "apache");
> System.setProperty("jetty.ssl.password", "apache");
> + System.setProperty("org.eclipse.jetty.ssl.password", "apache");
> JettyServer service = new JettyServer(workScheduler);
> service.start();
> TestServlet servlet = new TestServlet();
> @@ -112,6 +114,7 @@
> System.clearProperty("javax.net.ssl.keyStore");
> System.clearProperty("javax.net.ssl.keyStorePassword");
> System.clearProperty("jetty.ssl.password");
> + System.clearProperty("org.eclipse.jetty.ssl.password");
> }
> System.setProperty("javax.net.ssl.trustStore",
> "target/test-classes/tuscany.keyStore");
> System.setProperty("javax.net.ssl.trustStorePassword", "apache");
>
>