Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/activemq/browse/AMQ-2600 - jetty 7 - some more fixes 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@908433 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2010-02-10 10:09:22 +00:00
parent fa9f4ac9cc
commit 5a7ceacce9
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-web-demo/pom.xml
View File

@ -38,7 +38,7 @@
<version>${jetty-version}</version> <version>${jetty-version}</version>
<configuration> <configuration>
<connectors> <connectors>
<connector implementation="org.eclipse.jetty.nio.SelectChannelConnector"> <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>${jetty.port}</port> <port>${jetty.port}</port>
<maxIdleTime>60000</maxIdleTime> <maxIdleTime>60000</maxIdleTime>
</connector> </connector>

1
activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
View File

@ -264,6 +264,7 @@ public class MessageListenerServlet extends MessageServletSupport {
} }
Continuation continuation = ContinuationSupport.getContinuation(request); Continuation continuation = ContinuationSupport.getContinuation(request);
continuation.setTimeout(timeout);
Listener listener = getListener(request); Listener listener = getListener(request);
if (listener != null && continuation != null && !continuation.isSuspended()) { if (listener != null && continuation != null && !continuation.isSuspended()) {
listener.access(); listener.access();

13
assembly/src/release/conf/jetty.xml
View File

@ -25,7 +25,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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"> <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"> <bean id="handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
<property name="handlers"> <property name="handlers">
<list> <list>
<!-- <ref bean="contexts"/> <ref bean="contexts"/>
<bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/> -->
<bean class="org.eclipse.jetty.webapp.WebAppContext"> <bean class="org.eclipse.jetty.webapp.WebAppContext">
<property name="contextPath" value="/admin"/> <property name="contextPath" value="/admin"/>
<property name="resourceBase" value="${activemq.base}/webapps/admin"/> <property name="resourceBase" value="${activemq.base}/webapps/admin"/>
@ -53,16 +52,20 @@
<property name="resourceBase" value="${activemq.base}/webapps/camel"/> <property name="resourceBase" value="${activemq.base}/webapps/camel"/>
<property name="logUrlOnStart" value="true"/> <property name="logUrlOnStart" value="true"/>
</bean> </bean>
-->
<bean class="org.eclipse.jetty.webapp.WebAppContext"> <bean class="org.eclipse.jetty.webapp.WebAppContext">
<property name="contextPath" value="/demo"/> <property name="contextPath" value="/demo"/>
<property name="resourceBase" value="${activemq.base}/webapps/demo"/> <property name="resourceBase" value="${activemq.base}/webapps/demo"/>
<property name="logUrlOnStart" value="true"/> <property name="logUrlOnStart" value="true"/>
</bean> </bean>
<!--
<bean class="org.eclipse.jetty.webapp.WebAppContext"> <bean class="org.eclipse.jetty.webapp.WebAppContext">
<property name="contextPath" value="/fileserver"/> <property name="contextPath" value="/fileserver"/>
<property name="resourceBase" value="${activemq.base}/webapps/fileserver"/> <property name="resourceBase" value="${activemq.base}/webapps/fileserver"/>
<property name="logUrlOnStart" value="true"/> <property name="logUrlOnStart" value="true"/>
</bean>--> </bean>
-->
<bean id="defaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
</list> </list>
</property> </property>
</bean> </bean>
@ -70,4 +73,4 @@
</bean> </bean>
</beans> </beans>