You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2009/05/15 17:59:08 UTC
svn commit: r775206 - in /activemq/trunk/activemq-optional: ./
src/main/java/org/apache/activemq/transport/http/
src/test/java/org/apache/activemq/transport/http/ src/test/resources/
Author: dejanb
Date: Fri May 15 15:59:08 2009
New Revision: 775206
URL: http://svn.apache.org/viewvc?rev=775206&view=rev
Log:
fix for https://issues.apache.org/activemq/browse/AMQ-2238 - http transport spring test and improvements
Added:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java
activemq/trunk/activemq-optional/src/test/resources/spring-http.xml
Modified:
activemq/trunk/activemq-optional/ (props changed)
activemq/trunk/activemq-optional/pom.xml
activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java
Propchange: activemq/trunk/activemq-optional/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 15 15:59:08 2009
@@ -9,3 +9,4 @@
surefire-classloader.properties
surefire.properties
eclipse-classes
+activemq-data
Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=775206&r1=775205&r2=775206&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Fri May 15 15:59:08 2009
@@ -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>
Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java?rev=775206&r1=775205&r2=775206&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java (original)
+++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java Fri May 15 15:59:08 2009
@@ -21,7 +21,7 @@
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 @@
}
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() {
Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java?rev=775206&r1=775205&r2=775206&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java Fri May 15 15:59:08 2009
@@ -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;
Added: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java?rev=775206&view=auto
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java (added)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpSpringTest.java Fri May 15 15:59:08 2009
@@ -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);
+ }
+
+}
Added: activemq/trunk/activemq-optional/src/test/resources/spring-http.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/resources/spring-http.xml?rev=775206&view=auto
==============================================================================
--- activemq/trunk/activemq-optional/src/test/resources/spring-http.xml (added)
+++ activemq/trunk/activemq-optional/src/test/resources/spring-http.xml Fri May 15 15:59:08 2009
@@ -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 -->