antelder 2002/06/07 03:57:13
Modified: java/test/async AddressBook.wsdl AsyncTest.java
AsyncAddressBookTest.java Stockquote.wsdl
java/test/util WSIFTestRunner.java
Log:
remove ctrl-m's and fix corraltion service shutdown
Revision Changes Path
1.2 +4 -4 xml-axis-wsif/java/test/async/AddressBook.wsdl
Index: AddressBook.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/async/AddressBook.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddressBook.wsdl 7 Jun 2002 08:42:28 -0000 1.1
+++ AddressBook.wsdl 7 Jun 2002 10:57:12 -0000 1.2
@@ -45,8 +45,8 @@
</message>
<message name="GetAddressFromNameRequestMessage">
- <part name="name" type="xsd:string"/>
- <part name="partJmsReplyTo" type="xsd:string"/>
+ <part name="name" type="xsd:string"/>
+ <part name="partJmsReplyTo" type="xsd:string"/>
</message>
<message name="GetAddressFromNameResponseMessage">
@@ -123,8 +123,8 @@
</operation>
<operation name="getAddressFromName">
<soap:operation soapAction=""/>
- <input name="GetAddressFromNameRequest">
- <jms:property name="JMSReplyTo" part="partJmsReplyTo"/>
+ <input name="GetAddressFromNameRequest">
+ <jms:property name="JMSReplyTo" part="partJmsReplyTo"/>
<soap:body use="encoded"
namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
1.3 +0 -1 xml-axis-wsif/java/test/async/AsyncTest.java
Index: AsyncTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/async/AsyncTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AsyncTest.java 7 Jun 2002 08:42:28 -0000 1.2
+++ AsyncTest.java 7 Jun 2002 10:57:12 -0000 1.3
@@ -254,7 +254,6 @@
}
listener.stop();
-
((WSIFDefaultCorrelationService)WSIFCorrelationServiceLocator.getCorrelationService()).shutdown();
if ("axis".equals(protocol)) {
WSIFServiceImpl.setDynamicWSIFProvider(
1.3 +0 -1 xml-axis-wsif/java/test/async/AsyncAddressBookTest.java
Index: AsyncAddressBookTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/async/AsyncAddressBookTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AsyncAddressBookTest.java 7 Jun 2002 08:42:28 -0000 1.2
+++ AsyncAddressBookTest.java 7 Jun 2002 10:57:12 -0000 1.3
@@ -211,7 +211,6 @@
assertTrue(false);
} finally {
listener.stop();
-
((WSIFDefaultCorrelationService)WSIFCorrelationServiceLocator.getCorrelationService()).shutdown();
if (protocol.equals("axis")) {
WSIFServiceImpl.setDynamicWSIFProvider(
"http://schemas.xmlsoap.org/wsdl/soap/";,
1.2 +120 -120 xml-axis-wsif/java/test/async/Stockquote.wsdl
Index: Stockquote.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/async/Stockquote.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Stockquote.wsdl 7 Jun 2002 08:42:28 -0000 1.1
+++ Stockquote.wsdl 7 Jun 2002 10:57:12 -0000 1.2
@@ -1,121 +1,121 @@
-<?xml version="1.0" ?>
-
-<definitions targetNamespace="http://wsifservice.stockquote/";
- xmlns:tns="http://wsifservice.stockquote/";
- xmlns:xsd="http://www.w3.org/1999/XMLSchema";
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
- xmlns:jms="http://schemas.xmlsoap.org/wsdl/jms";
- xmlns:format="http://schemas.xmlsoap.org/wsdl/formatbinding/";
- xmlns:java="http://schemas.xmlsoap.org/wsdl/java/";
- xmlns="http://schemas.xmlsoap.org/wsdl/";>
-
- <message name="GetQuoteInput">
- <part name="symbol" type="xsd:string"/>
- <part name="partJmsReplyTo" type="xsd:string"/>
- </message>
-
- <message name="GetQuoteOutput">
- <part name="quote" type="xsd:float"/>
- </message>
-
- <portType name="StockquotePT">
- <operation name="getQuote">
- <input message="tns:GetQuoteInput"/>
- <output message="tns:GetQuoteOutput"/>
- </operation>
- </portType>
-
- <binding name="JavaBinding" type="tns:StockquotePT">
- <java:binding/>
- <format:typeMapping encoding="Java" style="Java">
- <format:typeMap typeName="xsd:string" formatType="java.lang.String" />
- </format:typeMapping>
- <operation name="getQuote">
- <java:operation
- methodName="getQuote"
- parameterOrder="symbol"
- methodType="instance" />
- <input/>
- <output/>
- </operation>
- </binding>
-
- <binding name="SOAPHttpBinding" type="tns:StockquotePT">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="getQuote">
- <soap:operation soapAction="http://example.com/GetTradePrice"/>
- <input>
- <soap:body use="encoded" namespace="urn:xmltoday-delayed-quotes"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded" namespace="urn:xmltoday-delayed-quotes"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
- </binding>
-
- <binding name="SOAPJmsBinding" type="tns:StockquotePT">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/jms"/>
- <operation name="getQuote">
- <soap:operation soapAction="http://example.com/GetTradePrice"/>
- <input>
- <jms:property name="JMSReplyTo" part="partJmsReplyTo"/>
- <soap:body use="encoded" namespace="urn:xmltoday-delayed-quotes"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded" namespace="urn:xmltoday-delayed-quotes"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
- </binding>
-
- <binding name="NativeJmsBinding" type="tns:StockquotePT">
- <jms:binding type="ObjectMessage"/>
-
- <format:typeMapping encoding="Java">
- <format:typeMap formatType="java.lang.String" typeName="xsd:string"/>
- </format:typeMapping>
-
-
- <operation name="getQuote">
- <input>
- <jms:property name="JMSReplyTo" part="partJmsReplyTo"/>
- <jms:property name="JMSPriority" part="partJmsPriority"/>
-
- <jms:body parts="symbol" use="encoded"/>
- </input>
- <output>
-<!-- <jms:property name="JMSExpiration" part="expiration"/>
--->
- <jms:body parts="quote" use="encoded"/>
- </output>
- </operation>
- </binding>
-
- <service name="StockquoteService">
- <documentation>Stock quote service</documentation>
- <port name="SOAPPort" binding="tns:SOAPHttpBinding">
- <soap:address location="http://localhost:8080/soap/servlet/rpcrouter"/>
- </port>
- <port name="JavaPort" binding="tns:JavaBinding">
- <java:address className="stockquote.wsiftypes.StockQuote"/>
- </port>
- <port name="SOAPJMSPort" binding="tns:SOAPJmsBinding">
- <jms:address jndiDestinationName="SoapJmsStockquoteQueue"
- destinationStyle="queue"
- jndiConnectionFactoryName="WSIFSampleQCF"
-
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file://C:/JNDI-Directory"/>
- </port>
- <port name="NativeJmsPort" binding="tns:NativeJmsBinding">
- <jms:address jndiDestinationName="JmsStockQuoteQueue"
- destinationStyle="queue"
- jndiConnectionFactoryName="WSIFSampleQCF"
-
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file://C:/JNDI-Directory"/>
- </port>
- </service>
-
+<?xml version="1.0" ?>
+
+<definitions targetNamespace="http://wsifservice.stockquote/";
+ xmlns:tns="http://wsifservice.stockquote/";
+ xmlns:xsd="http://www.w3.org/1999/XMLSchema";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:jms="http://schemas.xmlsoap.org/wsdl/jms";
+ xmlns:format="http://schemas.xmlsoap.org/wsdl/formatbinding/";
+ xmlns:java="http://schemas.xmlsoap.org/wsdl/java/";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";>
+
+ <message name="GetQuoteInput">
+ <part name="symbol" type="xsd:string"/>
+ <part name="partJmsReplyTo" type="xsd:string"/>
+ </message>
+
+ <message name="GetQuoteOutput">
+ <part name="quote" type="xsd:float"/>
+ </message>
+
+ <portType name="StockquotePT">
+ <operation name="getQuote">
+ <input message="tns:GetQuoteInput"/>
+ <output message="tns:GetQuoteOutput"/>
+ </operation>
+ </portType>
+
+ <binding name="JavaBinding" type="tns:StockquotePT">
+ <java:binding/>
+ <format:typeMapping encoding="Java" style="Java">
+ <format:typeMap typeName="xsd:string" formatType="java.lang.String" />
+ </format:typeMapping>
+ <operation name="getQuote">
+ <java:operation
+ methodName="getQuote"
+ parameterOrder="symbol"
+ methodType="instance" />
+ <input/>
+ <output/>
+ </operation>
+ </binding>
+
+ <binding name="SOAPHttpBinding" type="tns:StockquotePT">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="getQuote">
+ <soap:operation soapAction="http://example.com/GetTradePrice"/>
+ <input>
+ <soap:body use="encoded" namespace="urn:xmltoday-delayed-quotes"
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </input>
+ <output>
+ <soap:body use="encoded" namespace="urn:xmltoday-delayed-quotes"
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </output>
+ </operation>
+ </binding>
+
+ <binding name="SOAPJmsBinding" type="tns:StockquotePT">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/jms"/>
+ <operation name="getQuote">
+ <soap:operation soapAction="http://example.com/GetTradePrice"/>
+ <input>
+ <jms:property name="JMSReplyTo" part="partJmsReplyTo"/>
+ <soap:body use="encoded" namespace="urn:xmltoday-delayed-quotes"
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </input>
+ <output>
+ <soap:body use="encoded" namespace="urn:xmltoday-delayed-quotes"
+ encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ </output>
+ </operation>
+ </binding>
+
+ <binding name="NativeJmsBinding" type="tns:StockquotePT">
+ <jms:binding type="ObjectMessage"/>
+
+ <format:typeMapping encoding="Java">
+ <format:typeMap formatType="java.lang.String" typeName="xsd:string"/>
+ </format:typeMapping>
+
+
+ <operation name="getQuote">
+ <input>
+ <jms:property name="JMSReplyTo" part="partJmsReplyTo"/>
+ <jms:property name="JMSPriority" part="partJmsPriority"/>
+
+ <jms:body parts="symbol" use="encoded"/>
+ </input>
+ <output>
+<!-- <jms:property name="JMSExpiration" part="expiration"/>
+-->
+ <jms:body parts="quote" use="encoded"/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name="StockquoteService">
+ <documentation>Stock quote service</documentation>
+ <port name="SOAPPort" binding="tns:SOAPHttpBinding">
+ <soap:address location="http://localhost:8080/soap/servlet/rpcrouter"/>
+ </port>
+ <port name="JavaPort" binding="tns:JavaBinding">
+ <java:address className="stockquote.wsiftypes.StockQuote"/>
+ </port>
+ <port name="SOAPJMSPort" binding="tns:SOAPJmsBinding">
+ <jms:address jndiDestinationName="SoapJmsStockquoteQueue"
+ destinationStyle="queue"
+ jndiConnectionFactoryName="WSIFSampleQCF"
+
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
+ jndiProviderURL="file://C:/JNDI-Directory"/>
+ </port>
+ <port name="NativeJmsPort" binding="tns:NativeJmsBinding">
+ <jms:address jndiDestinationName="JmsStockQuoteQueue"
+ destinationStyle="queue"
+ jndiConnectionFactoryName="WSIFSampleQCF"
+
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
+ jndiProviderURL="file://C:/JNDI-Directory"/>
+ </port>
+ </service>
+
</definitions>
1.3 +4 -0 xml-axis-wsif/java/test/util/WSIFTestRunner.java
Index: WSIFTestRunner.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/util/WSIFTestRunner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSIFTestRunner.java 7 Jun 2002 08:33:16 -0000 1.2
+++ WSIFTestRunner.java 7 Jun 2002 10:57:13 -0000 1.3
@@ -67,6 +67,8 @@
import junit.textui.TestRunner;
import org.apache.wsif.util.jms.JMS2HTTPBridge;
import org.apache.wsif.util.jms.JMS2HTTPBridgeDestination;
+import org.apache.wsif.util.WSIFDefaultCorrelationService;
+import org.apache.wsif.util.WSIFCorrelationServiceLocator;
import providers.ProvidersInitialisationTest;
import shop.ShoppingCartTest;
import soapinterop.InteropTest;
@@ -132,6 +134,8 @@
jmsAb.interrupt();
if (jmsSq != null)
jmsSq.interrupt();
+
((WSIFDefaultCorrelationService)WSIFCorrelationServiceLocator.getCorrelationService()).shutdown();
+
}
public static Test suite() {
