activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r908433 - in /activemq/trunk: activemq-web-demo/pom.xml activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java assembly/src/release/conf/jetty.xml
Date Wed, 10 Feb 2010 10:09:22 GMT
Author: dejanb
Date: Wed Feb 10 10:09:22 2010
New Revision: 908433

URL: http://svn.apache.org/viewvc?rev=908433&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2600 - jetty 7 - some more fixes

Modified:
    activemq/trunk/activemq-web-demo/pom.xml
    activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
    activemq/trunk/assembly/src/release/conf/jetty.xml

Modified: activemq/trunk/activemq-web-demo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/pom.xml?rev=908433&r1=908432&r2=908433&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/pom.xml (original)
+++ activemq/trunk/activemq-web-demo/pom.xml Wed Feb 10 10:09:22 2010
@@ -38,7 +38,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/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=908433&r1=908432&r2=908433&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
Wed Feb 10 10:09:22 2010
@@ -264,6 +264,7 @@
         }
 
         Continuation continuation = ContinuationSupport.getContinuation(request);
+        continuation.setTimeout(timeout);
         Listener listener = getListener(request);
         if (listener != null && continuation != null && !continuation.isSuspended())
{
             listener.access();

Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=908433&r1=908432&r2=908433&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Wed Feb 10 10:09:22 2010
@@ -25,7 +25,7 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
  
-  <!--  <bean id="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-->
+  <bean id="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
  
   <bean id="Server" class="org.eclipse.jetty.server.Server" init-method="start" destroy-method="stop">
  
@@ -41,8 +41,7 @@
       <bean id="handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
         <property name="handlers">
           <list>
-            <!--  <ref bean="contexts"/>
-            <bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-->
+            <ref bean="contexts"/>
             <bean class="org.eclipse.jetty.webapp.WebAppContext">
               <property name="contextPath" value="/admin"/>
               <property name="resourceBase" value="${activemq.base}/webapps/admin"/>
@@ -53,16 +52,20 @@
               <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"/>
               <property name="logUrlOnStart" value="true"/>
             </bean>
+            <!--
             <bean class="org.eclipse.jetty.webapp.WebAppContext">
               <property name="contextPath" value="/fileserver"/>
               <property name="resourceBase" value="${activemq.base}/webapps/fileserver"/>
               <property name="logUrlOnStart" value="true"/>
-            </bean>-->
+            </bean>
+            -->
+            <bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
           </list>
         </property>
       </bean>
@@ -70,4 +73,4 @@
  
   </bean>
  
-</beans>
\ No newline at end of file
+</beans>



Mime
View raw message