- Refactored the HttpEmbeddedTunnelServlet to make it easier to reuse.

- Ported the 3.x HttpSpringEmbeddedTunnelServlet to 4.x.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389632 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrian T. Co 2006-03-28 23:51:05 +00:00
parent 449981be9d
commit cd3f28f669
2 changed files with 60 additions and 10 deletions

View File

@ -32,14 +32,24 @@ import java.net.URI;
public class HttpEmbeddedTunnelServlet extends HttpTunnelServlet {
private static final long serialVersionUID = -3705734740251302361L;
private BrokerService broker;
private HttpTransportServer transportConnector;
protected BrokerService broker;
protected HttpTransportServer transportConnector;
public synchronized void init() throws ServletException {
// lets initialize the ActiveMQ broker
try {
if (broker == null) {
broker = createBroker();
// Add the servlet connector
String url = getConnectorURL();
transportConnector = new HttpTransportServer(new URI(url));
broker.addConnector(transportConnector);
String brokerURL = getServletContext().getInitParameter("org.apache.activemq.brokerURL");
if (brokerURL != null) {
log("Listening for internal communication on: " + brokerURL);
}
}
broker.start();
}
@ -59,14 +69,6 @@ public class HttpEmbeddedTunnelServlet extends HttpTunnelServlet {
*/
protected BrokerService createBroker() throws Exception {
BrokerService answer = new BrokerService();
String url = getConnectorURL();
transportConnector = new HttpTransportServer(new URI(url));
answer.addConnector(transportConnector);
String brokerURL = getServletContext().getInitParameter("org.apache.activemq.brokerURL");
if (brokerURL != null) {
log("Listening for internal communication on: " + brokerURL);
}
return answer;
}

View File

@ -0,0 +1,48 @@
/**
*
* Copyright 2004 Protique Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
**/
package org.apache.activemq.transport.http;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
import org.springframework.core.io.ClassPathResource;
/**
* This servlet embeds an ActiveMQ broker inside a servlet engine which is
* ideal for deploying ActiveMQ inside a WAR and using this servlet as a HTTP tunnel.
*
* @version $Revision$
*/
public class HttpSpringEmbeddedTunnelServlet extends HttpEmbeddedTunnelServlet {
/**
* Factory method to create a new broker
*/
protected BrokerService createBroker() throws Exception {
String configFile = getServletContext().getInitParameter("org.activemq.config.file");
if (configFile == null) {
configFile="activemq.xml";
}
BrokerFactoryBean factory = new BrokerFactoryBean(new ClassPathResource(configFile));
factory.afterPropertiesSet();
return factory.getBroker();
}
}