antelder 2002/06/25 01:35:07 Modified: java/test/org/apache/wsif/util/jms NativeJMSRequestListener.java java/test/jms JmsTest.java Jms.wsdl Log: Add Native JMS provider to the JmsTest testcase Revision Changes Path 1.5 +1 -0 xml-axis-wsif/java/test/org/apache/wsif/util/jms/NativeJMSRequestListener.java Index: NativeJMSRequestListener.java =================================================================== RCS file: /home/cvs/xml-axis-wsif/java/test/org/apache/wsif/util/jms/NativeJMSRequestListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NativeJMSRequestListener.java 21 Jun 2002 13:17:06 -0000 1.4 +++ NativeJMSRequestListener.java 25 Jun 2002 08:35:07 -0000 1.5 @@ -214,6 +214,7 @@ sendReply( msg, reply ); } else if ( addr && name ) { abAddEntry( (ObjectMessage) msg ); + sendReply( msg, "input only, so no reply" ); //TODO jms test needs this??? } else if ( addr && firstName && lastName ) { abAddEntryFL( (ObjectMessage) msg ); } else if ( name ) { 1.7 +102 -0 xml-axis-wsif/java/test/jms/JmsTest.java Index: JmsTest.java =================================================================== RCS file: /home/cvs/xml-axis-wsif/java/test/jms/JmsTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JmsTest.java 24 Jun 2002 13:11:20 -0000 1.6 +++ JmsTest.java 25 Jun 2002 08:35:07 -0000 1.7 @@ -97,6 +97,7 @@ private final static String SOAP = "soap"; private final static String AXIS = "axis"; private final static String JAVA = "java"; + private final static String NJMS = "njms"; private final static String REPLYTOQ = "AddressBookReplyTo"; private final static int PERS = DeliveryMode.PERSISTENT; private final static int NPERS = DeliveryMode.NON_PERSISTENT; @@ -442,6 +443,107 @@ public void testAxisBindPrVals() { doit("bindpv", AXIS, REPLYTOQ, 3, PERS, 0, BPV); } + + + public void testNativeJMSDefault() { + doit("NJdefault", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSDefaultAlt() { + doit("NJdefault-alt", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadQcfMixQ() { + doit("NJbad-qcfmixq", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadMixQ() { + doit("NJbad-mixq", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadMixIcf() { + doit("NJbad-mixicf", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadQcf() { + doit("NJbad-qcf", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadQ() { + doit("NJbad-queue", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadAltQ() { + doit("NJbad-altqueue", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadStyle() { + doit("NJbad-style", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadIcf() { + doit("NJbad-icf", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadJurl() { + doit("NJbad-jurl", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadNoQ() { + doit("NJbad-noq", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadNoStyle() { + doit("NJbad-nostyle", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadNoQcf() { + doit("NJbad-noqcf", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadNoIcfJurl() { + doit("NJbad-noicfjurl", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadAltAndQ() { + doit("NJbad-altandq", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadTopic() { + doit("NJbad-topic", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadImplSpec() { + doit("NJbad-implspec", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadMqAndJndi() { + doit("NJbad-mqandjndi", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadNothing() { + doit("NJbad-nothing", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSBadNoBinding() { + doit("NJbad-nobinding", NJMS, REPLYTOQ, 3, NPERS, 0, null); + } + public void testNativeJMSNullReplyTo() { + doit("NJdefault", NJMS, null, 3, NPERS, 0, null); + } + public void testNativeJMSShortReplyTo() { + doit("NJdefault", NJMS, "", 3, NPERS, 0, null); + } + public void testNativeJMSBadReplyTo() { + doit("NJbaddefault", NJMS, "trash", 3, NPERS, 0, null); + } + public void testNativeJMSZeroPriority() { + doit("NJdefault", NJMS, REPLYTOQ, 0, NPERS, 0, null); + } + public void testNativeJMSNegPriority() { + doit("NJbaddefault", NJMS, REPLYTOQ, -1, NPERS, 0, null); + } + public void testNativeJMSBigPriority() { + doit("NJbaddefault", NJMS, REPLYTOQ, 57, NPERS, 0, null); + } + public void testNativeJMSPersistent() { + doit("NJdefault", NJMS, REPLYTOQ, 3, PERS, 0, null); + } + public void testNativeJMSBadPers() { + doit("NJbad-persist", NJMS, REPLYTOQ, 3, PERS, 0, null); + } +// public void testNativeJMSNonPers() { TODO - doesn't work! +// doit("NJnonpersist", NJMS, REPLYTOQ, 3, NPERS, 0, null); +// } + public void testNativeJMSUserProp() { + doit("NJdefault", NJMS, REPLYTOQ, 3, NPERS, 0, UP); + } + public void testNativeJMSAddrPrVals() { + doit("NJaddrpv", NJMS, REPLYTOQ, 3, PERS, 0, APV); + } + public void testNativeJMSBindPrVals() { + doit("NJbindpv", NJMS, REPLYTOQ, 3, PERS, 0, BPV); + } public void testJavaNoAttrs() { doit("java-noattrs", JAVA, null, 3, NPERS, 0, null); 1.5 +303 -1 xml-axis-wsif/java/test/jms/Jms.wsdl Index: Jms.wsdl =================================================================== RCS file: /home/cvs/xml-axis-wsif/java/test/jms/Jms.wsdl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Jms.wsdl 19 Jun 2002 14:07:24 -0000 1.4 +++ Jms.wsdl 25 Jun 2002 08:35:07 -0000 1.5 @@ -5,7 +5,7 @@ xmlns:typens="http://wsiftypes.addressbook/" 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: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/"> @@ -335,6 +335,104 @@ </operation> </binding> + <binding name="NJBindPV" type="tns:AddressBook"> + <jms:binding type="ObjectMessage"/> + <format:typeMapping encoding="Java" style="Java"> + <format:typeMap typeName="typens:address" formatType="com.ibm.www.namespace.wsif.samples.ab.types.Address" /> + <format:typeMap typeName="xsd:string" formatType="java.lang.String" /> + </format:typeMapping> + <operation name="addEntry"> + <input name="AddEntryRequest"> + <jms:property name="JMSDeliveryMode" part="requestDeliveryMode" /> + <jms:propertyValue name="JMSReplyTo" type="xsd:string" value="AddressBookReplyTo"/> + </input> + <output name="AddEntryResponse"> + </output> + </operation> + <operation name="addEntry"> + <input name="AddEntryJmsPropRequest"> + <jms:property name="JMSPriority" part="requestPriority" /> + <jms:property name="JMSReplyTo" part="requestReplyTo" /> + <jms:property name="JMSDeliveryMode" part="requestDeliveryMode" /> + <jms:property name="JMSTimeToLive" part="requestTimeToLive" /> + </input> + <output name="AddEntryJmsPropResponse"> + </output> + </operation> + <operation name="addEntry"> + <input name="AddEntryUserPropRequest"> + <jms:property name="JMSDeliveryMode" part="requestDeliveryMode" /> + <jms:property name="MyBooleanProperty" part="requestUPBoolean" /> + <jms:property name="MyByteProperty" part="requestUPByte" /> + <jms:property name="MyShortProperty" part="requestUPShort" /> + <jms:property name="MyIntProperty" part="requestUPInt" /> + <jms:property name="MyLongProperty" part="requestUPLong" /> + <jms:property name="MyFloatProperty" part="requestUPFloat" /> + <jms:property name="MyDoubleProperty" part="requestUPDouble" /> + <jms:property name="MyStringProperty" part="requestUPString" /> + <jms:property name="MyObjectProperty" part="requestUPObject" /> + </input> + <output name="AddEntryUserPropResponse"> + </output> + </operation> + <operation name="getAddressFromName"> + <input name="GetAddressFromNameRequest"> + <jms:property name="JMSDeliveryMode" part="requestDeliveryMode" /> + <jms:propertyValue name="JMSReplyTo" type="xsd:string" value="AddressBookReplyTo"/> + </input> + <output name="GetAddressFromNameResponse"> + </output> + </operation> + </binding> + + <binding name="NativeJmsBinding" type="tns:AddressBook"> + <jms:binding type="ObjectMessage"/> + <format:typeMapping encoding="Java" style="Java"> + <format:typeMap typeName="typens:address" formatType="com.ibm.www.namespace.wsif.samples.ab.types.Address" /> + <format:typeMap typeName="xsd:string" formatType="java.lang.String" /> + </format:typeMapping> + <operation name="addEntry"> + <input name="AddEntryRequest"> + <jms:property name="JMSDeliveryMode" part="requestDeliveryMode" /> + </input> + <output name="AddEntryResponse"> + </output> + </operation> + <operation name="addEntry"> + <input name="AddEntryJmsPropRequest"> + <jms:property name="JMSPriority" part="requestPriority" /> + <jms:property name="JMSReplyTo" part="requestReplyTo" /> + <jms:property name="JMSDeliveryMode" part="requestDeliveryMode" /> + <jms:property name="JMSTimeToLive" part="requestTimeToLive" /> + </input> + <output name="AddEntryJmsPropResponse"> + </output> + </operation> + <operation name="addEntry"> + <input name="AddEntryUserPropRequest"> + <jms:property name="JMSDeliveryMode" part="requestDeliveryMode" /> + <jms:property name="MyBooleanProperty" part="requestUPBoolean" /> + <jms:property name="MyByteProperty" part="requestUPByte" /> + <jms:property name="MyShortProperty" part="requestUPShort" /> + <jms:property name="MyIntProperty" part="requestUPInt" /> + <jms:property name="MyLongProperty" part="requestUPLong" /> + <jms:property name="MyFloatProperty" part="requestUPFloat" /> + <jms:property name="MyDoubleProperty" part="requestUPDouble" /> + <jms:property name="MyStringProperty" part="requestUPString" /> + <jms:property name="MyObjectProperty" part="requestUPObject" /> + </input> + <output name="AddEntryUserPropResponse"> + </output> + </operation> + <operation name="getAddressFromName"> + <input name="GetAddressFromNameRequest"> + <jms:property name="JMSDeliveryMode" part="requestDeliveryMode" /> + </input> + <output name="GetAddressFromNameResponse"> + </output> + </operation> + </binding> + <!-- service decln --> <service name="AddressBookService"> <port name="default" binding="tns:SOAPJmsBinding"> @@ -544,6 +642,210 @@ jndiConnectionFactoryName="TempQCF" initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" jndiProviderURL="file:///JNDI-Directory"> + <jms:propertyValue name="JMSReplyTo" type="xsd:string" value="trash"/> + </jms:address> + </port> + <port name="NJdefault" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbaddefault" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJdefault-alt" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jmsProviderDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-qcfmixq" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="WSIFSampleQCF" + destinationStyle="queue" + jndiConnectionFactoryName="NativeJmsRequestQueue" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-mixq" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="WSIFSampleQCF" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-mixicf" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.ibm.wsif.test.WSIFTestRunner" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-qcf" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="trash" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-queue" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="trash" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-altqueue" binding="tns:NativeJmsBinding"> + <jms:address jmsProviderDestinationName="trash" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-style" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="trash" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-icf" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="trash" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-jurl" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="trash"/> + </port> + <port name="NJbad-noq" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-nostyle" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-noqcf" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-noicfjurl" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF"/> + </port> + <port name="NJbad-altandq" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + jmsProviderDestinationName="SoapJmsAddressBookQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-topic" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="topic" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-implspec" binding="tns:NativeJmsBinding"> + <jms:address jmsImplementationSpecificURI="mq://qmgr/qname"/> + </port> + <port name="NJbad-mqandjndi" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory" + jmsImplementationSpecificURI="mq://qmgr/qname"/> + </port> + <port name="NJbad-nothing" binding="tns:NativeJmsBinding"> + <jms:address /> + </port> + <port name="NJbad-nobinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="WSIFSampleQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJbad-persist" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="TempQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJnonpersist" binding="tns:NativeJmsBinding"> + <jms:address jmsVendorURI="http://ibm.com/ns/mqseries" + jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="TempQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"/> + </port> + <port name="NJaddrpv" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="TempQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"> + <jms:propertyValue name="JMSReplyTo" type="xsd:string" value="AddressBookReplyTo"/> + </jms:address> + </port> + <port name="NJbindpv" binding="tns:NJBindPV"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="TempQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"> + </jms:address> + </port> + <port name="NJadbipv" binding="tns:NJBindPV"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="TempQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"> + <jms:propertyValue name="JMSReplyTo" type="xsd:string" value="trash"/> + </jms:address> + </port> + <port name="NJovpv" binding="tns:NativeJmsBinding"> + <jms:address jndiDestinationName="NativeJmsRequestQueue" + destinationStyle="queue" + jndiConnectionFactoryName="TempQCF" + initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory" + jndiProviderURL="file://C:/JNDI-Directory"> <jms:propertyValue name="JMSReplyTo" type="xsd:string" value="trash"/> </jms:address> </port>