From commits-return-13016-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Feb 09 18:08:15 2010 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 25399 invoked from network); 9 Feb 2010 18:08:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Feb 2010 18:08:15 -0000 Received: (qmail 20374 invoked by uid 500); 9 Feb 2010 18:08:15 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 20349 invoked by uid 500); 9 Feb 2010 18:08:15 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 20340 invoked by uid 99); 9 Feb 2010 18:08:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2010 18:08:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2010 18:08:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7F9C823888E7; Tue, 9 Feb 2010 18:07:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r908136 - in /activemq/trunk: ./ activemq-fileserver/ activemq-fileserver/src/main/java/org/apache/activemq/util/ activemq-fileserver/src/test/java/org/apache/activemq/util/ activemq-optional/ activemq-optional/src/main/java/org/apache/acti... Date: Tue, 09 Feb 2010 18:07:41 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100209180743.7F9C823888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Tue Feb 9 18:07:38 2010 New Revision: 908136 URL: http://svn.apache.org/viewvc?rev=908136&view=rev Log: https://issues.apache.org/activemq/browse/AMQ-2600 - jetty 7 initial commit - web console working, need more work on enabling other apps Modified: activemq/trunk/activemq-fileserver/pom.xml activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java activemq/trunk/activemq-fileserver/src/test/java/org/apache/activemq/util/RestFilterTest.java activemq/trunk/activemq-optional/pom.xml activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java activemq/trunk/activemq-web-console/pom.xml activemq/trunk/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java activemq/trunk/activemq-web-demo/pom.xml activemq/trunk/activemq-web/pom.xml activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java activemq/trunk/assembly/pom.xml activemq/trunk/assembly/src/main/descriptors/common-bin.xml activemq/trunk/assembly/src/release/conf/jetty.xml activemq/trunk/pom.xml Modified: activemq/trunk/activemq-fileserver/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/pom.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-fileserver/pom.xml (original) +++ activemq/trunk/activemq-fileserver/pom.xml Tue Feb 9 18:07:38 2010 @@ -34,11 +34,11 @@ org.mortbay.jetty - maven-jetty-plugin + jetty-maven-plugin ${jetty-version} - + ${jetty.port} 60000 @@ -90,8 +90,8 @@ - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all-server Modified: activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java (original) +++ activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java Tue Feb 9 18:07:38 2010 @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import org.mortbay.log.Log; +import org.eclipse.jetty.util.log.Log; public class FilenameGuardFilter implements Filter { Modified: activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java (original) +++ activemq/trunk/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java Tue Feb 9 18:07:38 2010 @@ -36,9 +36,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.mortbay.log.Log; -import org.mortbay.util.IO; -import org.mortbay.util.URIUtil; +import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.URIUtil; +import org.eclipse.jetty.util.log.Log; /** *

Modified: activemq/trunk/activemq-fileserver/src/test/java/org/apache/activemq/util/RestFilterTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/src/test/java/org/apache/activemq/util/RestFilterTest.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-fileserver/src/test/java/org/apache/activemq/util/RestFilterTest.java (original) +++ activemq/trunk/activemq-fileserver/src/test/java/org/apache/activemq/util/RestFilterTest.java Tue Feb 9 18:07:38 2010 @@ -25,7 +25,7 @@ import junit.framework.TestCase; -import org.mortbay.util.IO; +import org.eclipse.jetty.util.IO; public class RestFilterTest extends TestCase { Modified: activemq/trunk/activemq-optional/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-optional/pom.xml (original) +++ activemq/trunk/activemq-optional/pom.xml Tue Feb 9 18:07:38 2010 @@ -86,8 +86,13 @@ - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all-server + + + org.eclipse.jetty + jetty-webapp + ${jetty-version} Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java Tue Feb 9 18:07:38 2010 @@ -16,10 +16,10 @@ */ package org.apache.activemq.tool; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.bio.SocketConnector; -import org.mortbay.jetty.webapp.WebAppContext; +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; /** * @version $Revision$ Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/discovery/http/EmbeddedJettyServer.java Tue Feb 9 18:07:38 2010 @@ -18,10 +18,10 @@ import java.net.URI; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.servlet.ServletContextHandler; public class EmbeddedJettyServer implements org.apache.activemq.Service { @@ -34,7 +34,7 @@ URI uri = new URI(agent.getRegistryURL()); server = new Server(); - Context context = new Context(Context.NO_SECURITY | Context.NO_SESSIONS); + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS); context.setContextPath("/"); ServletHolder holder = new ServletHolder(); Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java Tue Feb 9 18:07:38 2010 @@ -24,14 +24,14 @@ import org.apache.activemq.transport.util.TextWireFormat; import org.apache.activemq.transport.xstream.XStreamWireFormat; import org.apache.activemq.util.ServiceStopper; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.bio.SocketConnector; -import org.mortbay.jetty.handler.ContextHandler; -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.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.bio.SocketConnector; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.server.session.SessionHandler; +import org.eclipse.jetty.servlet.ServletHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.servlet.ServletMapping; /** * @version $Revision$ Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java Tue Feb 9 18:07:38 2010 @@ -19,7 +19,7 @@ import java.net.URI; import org.apache.activemq.transport.http.HttpTransportServer; -import org.mortbay.jetty.security.SslSocketConnector; +import org.eclipse.jetty.server.ssl.SslSocketConnector; public class HttpsTransportServer extends HttpTransportServer { Modified: activemq/trunk/activemq-web-console/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/pom.xml (original) +++ activemq/trunk/activemq-web-console/pom.xml Tue Feb 9 18:07:38 2010 @@ -52,11 +52,11 @@ org.mortbay.jetty - maven-jetty-plugin + jetty-maven-plugin ${jetty-version} - + ${jetty.port} 60000 @@ -130,14 +130,6 @@ - - - mortbay-repo - mortbay-repo - http://www.mortbay.org/maven2/snapshot - - - @@ -203,18 +195,13 @@ - org.mortbay.jetty - jetty - test - - - org.mortbay.jetty - jetty-util + org.eclipse.jetty.aggregate + jetty-all-server test org.mortbay.jetty - jsp-2.1 + jsp-2.1-glassfish provided Modified: activemq/trunk/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java (original) +++ activemq/trunk/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java Tue Feb 9 18:07:38 2010 @@ -17,11 +17,11 @@ package org.apache.activemq.web.tool; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -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.Handler; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; /** * A simple bootstrap class for starting Jetty in your IDE using the local web @@ -57,9 +57,9 @@ context.setResourceBase(WEBAPP_DIR); context.setContextPath(WEBAPP_CTX); context.setServer(server); - server.setHandlers(new Handler[] { + /*server.setHandlers(new Handler[] { context - }); + });*/ server.setConnectors(new Connector[] { connector }); Modified: activemq/trunk/activemq-web-demo/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/pom.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-web-demo/pom.xml (original) +++ activemq/trunk/activemq-web-demo/pom.xml Tue Feb 9 18:07:38 2010 @@ -34,11 +34,11 @@ org.mortbay.jetty - maven-jetty-plugin + jetty-maven-plugin ${jetty-version} - + ${jetty.port} 60000 @@ -92,8 +92,8 @@ - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all-server test Modified: activemq/trunk/activemq-web/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/pom.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-web/pom.xml (original) +++ activemq/trunk/activemq-web/pom.xml Tue Feb 9 18:07:38 2010 @@ -53,16 +53,23 @@ geronimo-servlet_2.5_spec provided - + - org.mortbay.jetty - jetty-util + org.eclipse.jetty.aggregate + jetty-all-server + test - org.mortbay.jetty - jetty - test + org.eclipse.jetty + jetty-websocket + ${jetty-version} + + + + org.eclipse.jetty + jetty-continuation + ${jetty-version} Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java (original) +++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java Tue Feb 9 18:07:38 2010 @@ -40,8 +40,8 @@ import org.apache.activemq.MessageAvailableListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.mortbay.util.ajax.Continuation; -import org.mortbay.util.ajax.ContinuationSupport; +import org.eclipse.jetty.continuation.Continuation; +import org.eclipse.jetty.continuation.ContinuationSupport; /** * A servlet for sending and receiving messages to/from JMS destinations using @@ -263,9 +263,9 @@ LOG.debug("doMessage timeout=" + timeout); } - Continuation continuation = ContinuationSupport.getContinuation(request, client); + Continuation continuation = ContinuationSupport.getContinuation(request); Listener listener = getListener(request); - if (listener != null && continuation != null && !continuation.isPending()) { + if (listener != null && continuation != null && !continuation.isSuspended()) { listener.access(); } @@ -298,7 +298,7 @@ // Get the continuation object (may wait and/or retry // request here). - continuation.suspend(timeout); + continuation.suspend(); } listener.setContinuation(null); Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java (original) +++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java Tue Feb 9 18:07:38 2010 @@ -30,24 +30,18 @@ import javax.jms.ObjectMessage; import javax.jms.TextMessage; import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.activemq.MessageAvailableConsumer; import org.apache.activemq.MessageAvailableListener; -import org.apache.activemq.camel.converter.ActiveMQMessageConverter; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQTextMessage; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.ExchangePattern; -import org.apache.camel.Producer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.mortbay.util.ajax.Continuation; -import org.mortbay.util.ajax.ContinuationSupport; +import org.eclipse.jetty.continuation.Continuation; +import org.eclipse.jetty.continuation.ContinuationSupport; /** * A servlet for sending and receiving messages to/from JMS destinations using @@ -204,14 +198,14 @@ // Get an existing Continuation or create a new one if there are // no events. if (message == null) { - continuation = ContinuationSupport.getContinuation(request, consumer); + continuation = ContinuationSupport.getContinuation(request); // register this continuation with our listener. listener.setContinuation(continuation); // Get the continuation object (may wait and/or retry // request here). - continuation.suspend(timeout); + continuation.suspend(); } // Try again now Modified: activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java (original) +++ activemq/trunk/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java Tue Feb 9 18:07:38 2010 @@ -19,11 +19,11 @@ import org.apache.activemq.broker.BrokerService; import org.apache.activemq.demo.DefaultQueueSender; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -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.Handler; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; /** * A simple bootstrap class for starting Jetty in your IDE using the local web @@ -72,9 +72,9 @@ context.setResourceBase(WEBAPP_DIR); context.setContextPath(WEBAPP_CTX); context.setServer(server); - server.setHandlers(new Handler[] { + /*server.setHandlers(new Handler[] { context - }); + });*/ server.setConnectors(new Connector[] { connector }); Modified: activemq/trunk/assembly/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/assembly/pom.xml (original) +++ activemq/trunk/assembly/pom.xml Tue Feb 9 18:07:38 2010 @@ -261,16 +261,13 @@ - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all-server - org.mortbay.jetty - jetty-util - - - org.mortbay.jetty - jetty-xbean + org.eclipse.jdt + core + 3.1.1 org.apache.derby @@ -307,7 +304,7 @@ org.mortbay.jetty - jsp-2.1 + jsp-2.1-glassfish Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original) +++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Feb 9 18:07:38 2010 @@ -209,7 +209,7 @@ org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec org.apache.xbean:xbean-spring - org.mortbay.jetty:jetty-client + org.eclipse.jetty:jetty-client org.springframework:spring-aop org.springframework:spring-core org.springframework:spring-beans @@ -233,16 +233,14 @@ org.springframework:spring-web org.springframework:spring-webmvc - org.mortbay.jetty:jetty - org.mortbay.jetty:jetty-util - org.mortbay.jetty:jetty-xbean + org.eclipse.jetty.aggregate:jetty-all-server org.apache.geronimo.specs:geronimo-servlet_2.5_spec org.slf4j:slf4j-api org.slf4j:slf4j-jcl - org.mortbay.jetty:jsp-2.1 - org.mortbay.jetty:jsp-api-2.1 + org.mortbay.jetty:jsp-2.1-glassfish + org.mortbay.jetty:jsp-api-2.1-glassfish org.eclipse.jdt:core org.apache.ant:ant Modified: activemq/trunk/assembly/src/release/conf/jetty.xml URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/assembly/src/release/conf/jetty.xml (original) +++ activemq/trunk/assembly/src/release/conf/jetty.xml Tue Feb 9 18:07:38 2010 @@ -20,17 +20,54 @@ e.g. --> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: activemq/trunk/pom.xml URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=908136&r1=908135&r2=908136&view=diff ============================================================================== --- activemq/trunk/pom.xml (original) +++ activemq/trunk/pom.xml Tue Feb 9 18:07:38 2010 @@ -61,7 +61,8 @@ 0.1.8 1.7.2.2 1.0 - 6.1.9 + 7.0.1.v20091125 + 2.1.v20100127 1.1 2.5.1 4.5 @@ -156,7 +157,7 @@ com.springsource.repository.bundles.external SpringSource Enterprise Bundle Repository - External Bundle Releases http://repository.springsource.com/maven/bundles/external - + @@ -755,25 +756,13 @@ org.mortbay.jetty - jsp-2.1 - ${jetty-version} - - - - org.mortbay.jetty - jetty-util - ${jetty-version} + jsp-2.1-glassfish + ${jsp-version} - org.mortbay.jetty - jetty-xbean - ${jetty-version} - - - - org.mortbay.jetty - jetty + org.eclipse.jetty.aggregate + jetty-all-server ${jetty-version} @@ -1008,7 +997,7 @@ - org.mortbay.jetty + org.eclipse.jetty maven-jetty-plugin ${jetty-version}