activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r908492 - in /activemq/trunk: activemq-web-console/ activemq-web-console/src/test/java/org/apache/activemq/web/tool/ activemq-web/src/main/java/org/apache/activemq/web/ activemq-web/src/test/java/org/apache/activemq/web/ assembly/src/releas...
Date Wed, 10 Feb 2010 13:28:07 GMT
Author: dejanb
Date: Wed Feb 10 13:28:07 2010
New Revision: 908492

URL: http://svn.apache.org/viewvc?rev=908492&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2600 - jetty 7 - testing/including camel web
app and other small changes

Modified:
    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/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/src/release/conf/jetty.xml

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=908492&r1=908491&r2=908492&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Wed Feb 10 13:28:07 2010
@@ -56,7 +56,7 @@
         <version>${jetty-version}</version>
         <configuration>
           <connectors>
-            <connector implementation="org.eclipse.jetty.nio.SelectChannelConnector">
+            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
               <port>${jetty.port}</port>
               <maxIdleTime>60000</maxIdleTime>
             </connector>

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=908492&r1=908491&r2=908492&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
Wed Feb 10 13:28:07 2010
@@ -18,7 +18,6 @@
 package org.apache.activemq.web.tool;
 
 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;
@@ -57,9 +56,7 @@
         context.setResourceBase(WEBAPP_DIR);
         context.setContextPath(WEBAPP_CTX);
         context.setServer(server);
-        /*server.setHandlers(new Handler[] {
-            context
-        });*/
+        server.setHandler(context);
         server.setConnectors(new Connector[] {
             connector
         });

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=908492&r1=908491&r2=908492&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
Wed Feb 10 13:28:07 2010
@@ -205,6 +205,7 @@
 
                     // Get the continuation object (may wait and/or retry
                     // request here).
+                    continuation.setTimeout(timeout);
                     continuation.suspend();
                 }
 

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=908492&r1=908491&r2=908492&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 Wed
Feb 10 13:28:07 2010
@@ -72,9 +72,7 @@
         context.setResourceBase(WEBAPP_DIR);
         context.setContextPath(WEBAPP_CTX);
         context.setServer(server);
-        /*server.setHandlers(new Handler[] {
-            context
-        });*/
+        server.setHandler(context);
         server.setConnectors(new Connector[] {
             connector
         });

Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=908492&r1=908491&r2=908492&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Wed Feb 10 13:28:07 2010
@@ -47,12 +47,11 @@
               <property name="resourceBase" value="${activemq.base}/webapps/admin"/>
               <property name="logUrlOnStart" value="true"/>
             </bean>
-            <!--<bean class="org.eclipse.jetty.webapp.WebAppContext">
+            <bean class="org.eclipse.jetty.webapp.WebAppContext">
               <property name="contextPath" value="/camel"/>
               <property name="resourceBase" value="${activemq.base}/webapps/camel"/>
               <property name="logUrlOnStart" value="true"/>
             </bean>
-            -->
             <bean class="org.eclipse.jetty.webapp.WebAppContext">
               <property name="contextPath" value="/demo"/>
               <property name="resourceBase" value="${activemq.base}/webapps/demo"/>



Mime
View raw message