mirror of https://github.com/apache/activemq.git
fix for https://issues.apache.org/activemq/browse/AMQ-2238 - http transport spring test and improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@775206 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan
parent
634a52a4a2
commit
7310949981
|
|
@ -143,7 +143,31 @@
|
|||
<artifactId>spring-beans</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-aop</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-jms</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-jms</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-spring</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jettison</groupId>
|
||||
<artifactId>jettison</artifactId>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import java.io.DataOutputStream;
|
|||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
|
|
@ -187,8 +187,7 @@ public class HttpTunnelServlet extends HttpServlet {
|
|||
}
|
||||
|
||||
protected BlockingQueueTransport createTransportChannel() {
|
||||
// return new BlockingQueueTransport(new LinkedBlockingQueue<Object>());
|
||||
return new BlockingQueueTransport(new ArrayBlockingQueue<Object>(10));
|
||||
return new BlockingQueueTransport(new LinkedBlockingQueue<Object>());
|
||||
}
|
||||
|
||||
protected TextWireFormat createWireFormat() {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,19 @@
|
|||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You 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 javax.jms.Connection;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You 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.spring.SpringTestSupport;
|
||||
|
||||
public class HttpSpringTest extends SpringTestSupport {
|
||||
|
||||
public void testHttpTransportWithSpring() throws Exception {
|
||||
String config = "spring-http.xml";
|
||||
assertSenderConfig(config);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
contributor license agreements. See the NOTICE file distributed with
|
||||
this work for additional information regarding copyright ownership.
|
||||
The ASF licenses this file to You 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.
|
||||
-->
|
||||
|
||||
<!-- START SNIPPET: spring -->
|
||||
<beans
|
||||
xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:amq="http://activemq.apache.org/schema/core"
|
||||
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-2.0.xsd
|
||||
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
|
||||
|
||||
<!-- lets create an embedded ActiveMQ Broker -->
|
||||
<amq:broker useJmx="false" persistent="true" deleteAllMessagesOnStartup="true">
|
||||
<amq:transportConnectors>
|
||||
<amq:transportConnector uri="http://localhost:8081" />
|
||||
</amq:transportConnectors>
|
||||
</amq:broker>
|
||||
|
||||
<!-- ActiveMQ destinations to use -->
|
||||
<amq:queue id="destination" physicalName="org.apache.activemq.spring.Test.spring.http"/>
|
||||
|
||||
<!-- JMS ConnectionFactory to use, configuring the embedded broker using XML -->
|
||||
<amq:connectionFactory id="jmsFactory" brokerURL="http://localhost:8081"/>
|
||||
|
||||
|
||||
<!-- Spring JMS Template -->
|
||||
<bean id="myJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
|
||||
<property name="connectionFactory">
|
||||
<!-- lets wrap in a pool to avoid creating a connection per send -->
|
||||
<bean class="org.springframework.jms.connection.SingleConnectionFactory">
|
||||
<property name="targetConnectionFactory">
|
||||
<ref local="jmsFactory" />
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
|
||||
<property name="connectionFactory" ref="jmsFactory"/>
|
||||
</bean>
|
||||
|
||||
<!-- a sample POJO which uses a Spring JmsTemplate -->
|
||||
<bean id="producer" class="org.apache.activemq.spring.SpringProducer">
|
||||
<property name="template">
|
||||
<ref bean="myJmsTemplate"></ref>
|
||||
</property>
|
||||
|
||||
<property name="destination">
|
||||
<ref bean="destination" />
|
||||
</property>
|
||||
|
||||
<property name="messageCount">
|
||||
<value>100</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- a sample POJO consumer -->
|
||||
<bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
|
||||
<property name="template" ref="consumerJmsTemplate"/>
|
||||
<property name="destination" ref="destination"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
||||
<!-- END SNIPPET: spring -->
|
||||
Loading…
Reference in New Issue