Author: ffang
Date: Sat Oct 25 17:23:28 2008
New Revision: 707921
URL: http://svn.apache.org/viewvc?rev=707921&view=rev
Log:
[SM-1664]CxfBcJmsTest will fail on slow machine which is caused by jms client
timeout
Added:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_test_timeout.xml
(with props)
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_transport.xml
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world.wsdl
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java?rev=707921&r1=707920&r2=707921&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
Sat Oct 25 17:23:28 2008
@@ -23,6 +23,10 @@
import java.util.Map;
import javax.xml.namespace.QName;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.ServerLauncher;
import org.apache.hello_world_soap_http.BadRecordLitFault;
import org.apache.hello_world_soap_http.Greeter;
@@ -100,6 +104,10 @@
}
public void testJMSTransport() throws Exception {
+ SpringBusFactory bf = new SpringBusFactory();
+ Bus testBus =
bf.createBus("org/apache/servicemix/cxfbc/jms_test_timeout.xml");
+ BusFactory.setDefaultBus(testBus);
+
URL wsdl =
getWSDLURL("org/apache/servicemix/cxfbc/ws/security/hello_world.wsdl");
QName serviceName = getServiceName(new QName(
Added:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_test_timeout.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_test_timeout.xml?rev=707921&view=auto
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_test_timeout.xml
(added)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_test_timeout.xml
Sat Oct 25 17:23:28 2008
@@ -0,0 +1,36 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:jms="http://cxf.apache.org/transports/jms";
+ xsi:schemaLocation="
+ http://cxf.apache.org/transports/jms
http://cxf.apache.org/schemas/configuration/jms.xsd
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ ">
+ <!--
+ Configure the JMS Client Receive Timeout so the CxfBcJmsTest
+ passes on slow machines.
+ -->
+ <jms:conduit
name="{http://apache.org/hello_world_soap_http}HelloWorldPort.jms-conduit";
abstract="true">
+ <jms:clientConfig clientReceiveTimeout="20000"/>
+ </jms:conduit>
+ <jms:conduit
name="{http://apache.org/hello_world_soap_http}HelloWorldPortProxy.jms-conduit";
abstract="true">
+ <jms:clientConfig clientReceiveTimeout="20000"/>
+ </jms:conduit>
+
+</beans>
Propchange:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_test_timeout.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_test_timeout.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_test_timeout.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_transport.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_transport.xml?rev=707921&r1=707920&r2=707921&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_transport.xml
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/jms_transport.xml
Sat Oct 25 17:23:28 2008
@@ -45,6 +45,8 @@
</cxfse:outFaultInterceptors>
</cxfse:endpoint-->
<cxfbc:consumer
wsdl="org/apache/servicemix/cxfbc/ws/security/hello_world.wsdl"
+ service="greeter:HelloWorldService"
+ endpoint="HelloWorldPort"
targetEndpoint="HelloWorldPortProxy"
targetService="greeter:HelloWorldService"
targetInterface="greeter:Greeter"
@@ -66,6 +68,7 @@
service="greeter:HelloWorldService"
endpoint="HelloWorldPortProxy"
interfaceName="greeter:Greetr"
+ busCfg="org/apache/servicemix/cxfbc/jms_test_timeout.xml"
>
<cxfbc:inInterceptors>
<bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world.wsdl
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world.wsdl?rev=707921&r1=707920&r2=707921&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world.wsdl
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world.wsdl
Sat Oct 25 17:23:28 2008
@@ -49,7 +49,17 @@
<jms:server durableSubscriberName="CXF_subscriber"/>
</port>
+ <port binding="tns:Greeter_SOAPBinding" name="HelloWorldPortProxy">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
jndiDestinationName="dynamicQueues/test.jmstransport.text">
<jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61616"/>
+ </jms:address>
+
+ <jms:server durableSubscriberName="CXF_subscriber"/>
+ </port>
</service>
+
+
</wsdl:definitions>
