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 - testing/including camel web app and other small changes 

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

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

@ -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>

5
activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java
View File

@ -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 @@ public final class Main {
context.setResourceBase(WEBAPP_DIR);
context.setContextPath(WEBAPP_CTX);
context.setServer(server);
/*server.setHandlers(new Handler[] {
context
});*/
server.setHandler(context);
server.setConnectors(new Connector[] {
connector
});

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

@ -205,6 +205,7 @@ public class MessageServlet extends MessageServletSupport {
// Get the continuation object (may wait and/or retry
// request here).
continuation.setTimeout(timeout);
continuation.suspend();
}

4
activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
View File

@ -72,9 +72,7 @@ public final class JettyServer {
context.setResourceBase(WEBAPP_DIR);
context.setContextPath(WEBAPP_CTX);
context.setServer(server);
/*server.setHandlers(new Handler[] {
context
});*/
server.setHandler(context);
server.setConnectors(new Connector[] {
connector
});

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

@ -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"/>