Author: ningjiang
Date: Fri Oct 27 06:32:01 2006
New Revision: 468375
URL: http://svn.apache.org/viewvc?view=rev&rev=468375
Log:
[CXF-165] Upgrade CXF jms transport to use ActiveMQ 4.0.2
Modified:
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/transports/jms/pom.xml
incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
incubator/cxf/trunk/systests/pom.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/EmbeddedJMSBrokerLauncher.java
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test.wsdl
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=468375&r1=468374&r2=468375
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Fri Oct 27 06:32:01 2006
@@ -155,6 +155,7 @@
<spring.version>2.0</spring.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
<derby.version>10.1.1.0</derby.version>
+ <activemq-version>4.0.2</activemq-version>
<eclipse.workspace.dir>${basedir}/${topDirectoryLocation}/../workspace</eclipse.workspace.dir>
@@ -657,11 +658,11 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <!--repository>
+ <repository>
<id>ActiveMQ</id>
<name>ActiveMQ Maven2 Temp Repository</name>
-
<url>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC3/maven2</url>
- </repository-->
+
<url>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC5/maven2</url>
+ </repository>
<repository>
<id>java.net</id>
<name>java.net Maven Repository</name>
Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=468375&r1=468374&r2=468375
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Fri Oct 27 06:32:01 2006
@@ -113,81 +113,11 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>3.2</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>activesoap</groupId>
- <artifactId>jaxp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- </exclusion>
- <exclusion>
- <groupId>howl</groupId>
- <artifactId>howl-logger</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>activemq</groupId>
- <artifactId>smack</artifactId>
- </exclusion>
- <exclusion>
- <groupId>activemq</groupId>
- <artifactId>smackx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </exclusion>
- <exclusion>
- <groupId>axion</groupId>
- <artifactId>axion</artifactId>
- </exclusion>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlbeans</groupId>
- <artifactId>xmlpublic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean_xpath</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activemq-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified:
incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java?view=diff&rev=468375&r1=468374&r2=468375
==============================================================================
---
incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
(original)
+++
incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
Fri Oct 27 06:32:01 2006
@@ -22,8 +22,8 @@
import junit.extensions.TestSetup;
import junit.framework.TestSuite;
-import org.activemq.broker.impl.BrokerContainerImpl;
-import org.activemq.store.vm.VMPersistenceAdapter;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
class JMSBrokerSetup extends TestSetup {
@@ -82,12 +82,12 @@
public void run() {
try {
- ContainerWapper container;
- synchronized (this) {
- container = new ContainerWapper();
- container.addConnector(brokerUrl);
- container.setPersistenceAdapter(new
VMPersistenceAdapter());
- container.start();
+ //ContainerWapper container;
+ BrokerService broker = new BrokerService();
+ synchronized (this) {
+ broker.setPersistenceAdapter(new
MemoryPersistenceAdapter());
+ broker.addConnector(brokerUrl);
+ broker.start();
Thread.sleep(200);
notifyAll();
}
@@ -95,9 +95,9 @@
while (!shutdownBroker) {
wait(1000);
}
- }
- container.shutdown();
- container = null;
+ }
+ broker.stop();
+ broker = null;
} catch (Exception e) {
exception = e;
e.printStackTrace();
@@ -107,10 +107,10 @@
}
- class ContainerWapper extends BrokerContainerImpl {
+ /*class ContainerWapper extends BrokerContainerImpl {
public void shutdown() {
super.containerShutdown();
}
- }
+ }*/
}
Modified: incubator/cxf/trunk/systests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=468375&r1=468374&r2=468375
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Fri Oct 27 06:32:01 2006
@@ -135,7 +135,21 @@
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activemq-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!--dependency>
<groupId>activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>3.2</version>
@@ -210,7 +224,7 @@
<artifactId>xbean</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/EmbeddedJMSBrokerLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/EmbeddedJMSBrokerLauncher.java?view=diff&rev=468375&r1=468374&r2=468375
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/EmbeddedJMSBrokerLauncher.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/EmbeddedJMSBrokerLauncher.java
Fri Oct 27 06:32:01 2006
@@ -18,30 +18,29 @@
*/
package org.apache.cxf.systest.jms;
-import org.activemq.broker.BrokerContainer;
-import org.activemq.broker.impl.BrokerContainerImpl;
-import org.activemq.store.vm.VMPersistenceAdapter;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.cxf.systest.common.TestServerBase;
public class EmbeddedJMSBrokerLauncher extends TestServerBase {
- BrokerContainer container;
+ BrokerService broker;
final String brokerUrl1 = "tcp://localhost:61500";
public void tearDown() throws Exception {
- if (container != null) {
- container.stop();
+ if (broker != null) {
+ broker.stop();
}
}
public void run() {
try {
- container = new BrokerContainerImpl();
- container.addConnector(brokerUrl1);
- container.setPersistenceAdapter(new VMPersistenceAdapter());
- container.start();
+ broker = new BrokerService();
+ broker.setPersistenceAdapter(new MemoryPersistenceAdapter());
+ broker.addConnector(brokerUrl1);
+ broker.start();
} catch (Exception e) {
e.printStackTrace();
}
Modified:
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl?view=diff&rev=468375&r1=468374&r2=468375
==============================================================================
---
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
(original)
+++
incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_doc_lit.wsdl
Fri Oct 27 06:32:01 2006
@@ -187,7 +187,7 @@
<jms:address
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/routertest.SOAPService2Q.text">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
</wsdl:port>
@@ -202,7 +202,7 @@
<jms:address
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/routertest.SOAPService4Q.text">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
</wsdl:port>
@@ -224,7 +224,7 @@
<jms:address
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/routertest.XMLService2Q.text">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
</wsdl:port>
@@ -234,7 +234,7 @@
<jms:address
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/routertest.XMLService3Q.text">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
</wsdl:port>
Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test.wsdl?view=diff&rev=468375&r1=468374&r2=468375
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test.wsdl
(original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test.wsdl Fri Oct
27 06:32:01 2006
@@ -338,7 +338,7 @@
<jms:address
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/test.jmstransport.text">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
@@ -352,7 +352,7 @@
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/test.jmstransport.binary"
jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
@@ -367,7 +367,7 @@
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/test.jmstransport.binary"
jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary.reply">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
@@ -383,7 +383,7 @@
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/test.jmstransport.text"
jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.reply">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
@@ -396,7 +396,7 @@
<jms:address
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/test.jmstransport.oneway">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
@@ -410,7 +410,7 @@
destinationStyle="topic"
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicTopics/test.jmstransport.oneway.topic">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
</port>
@@ -422,7 +422,7 @@
jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/test.jms.addr.queue"
jndiReplyDestinationName="dynamicQueues/test.jms.addr.reply.queue">
- <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
<jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
</jms:address>
<wswa:UsingAddressing
xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
