antelder 2002/10/15 00:41:36
Modified: java/src/org/apache/wsif/providers/java WSIFPort_Java.java
java/src/org/apache/wsif/providers/jms WSIFPort_Jms.java
java/src/org/apache/wsif/providers/ejb WSIFPort_EJB.java
Log:
Finish bugzilla bug 13038 - Update remaining providers to correctly choose binding
Revision Changes Path
1.9 +5 -6
xml-axis-wsif/java/src/org/apache/wsif/providers/java/WSIFPort_Java.java
Index: WSIFPort_Java.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/java/WSIFPort_Java.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WSIFPort_Java.java 9 Oct 2002 16:07:16 -0000 1.8
+++ WSIFPort_Java.java 15 Oct 2002 07:41:36 -0000 1.9
@@ -68,15 +68,16 @@
import javax.wsdl.Port;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFException;
-import org.apache.wsif.WSIFMessage;
import org.apache.wsif.WSIFOperation;
import org.apache.wsif.base.WSIFDefaultPort;
import org.apache.wsif.logging.Trc;
import org.apache.wsif.providers.WSIFDynamicTypeMap;
-import org.apache.wsif.wsdl.extensions.java.JavaAddress;
+import org.apache.wsif.util.WSIFUtils;
import org.apache.wsif.wsdl.extensions.format.TypeMap;
import org.apache.wsif.wsdl.extensions.format.TypeMapping;
+import org.apache.wsif.wsdl.extensions.java.JavaAddress;
/**
* Java WSIF Port.
@@ -154,10 +155,8 @@
if (operation == null) {
BindingOperation bindingOperationModel =
- fieldPortModel.getBinding().getBindingOperation(
- name,
- inputName,
- outputName);
+ WSIFUtils.getBindingOperation(
+ fieldPortModel.getBinding(), name, inputName, outputName );
if (bindingOperationModel != null) {
operation =
1.11 +3 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/jms/WSIFPort_Jms.java
Index: WSIFPort_Jms.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/WSIFPort_Jms.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WSIFPort_Jms.java 3 Sep 2002 14:04:43 -0000 1.10
+++ WSIFPort_Jms.java 15 Oct 2002 07:41:36 -0000 1.11
@@ -74,6 +74,7 @@
import org.apache.wsif.logging.Trc;
import org.apache.wsif.providers.WSIFDynamicTypeMap;
import org.apache.wsif.util.WSIFProperties;
+import org.apache.wsif.util.WSIFUtils;
import org.apache.wsif.util.jms.WSIFJMSDestination;
import org.apache.wsif.util.jms.WSIFJMSFinder;
import org.apache.wsif.wsdl.extensions.jms.JMSAddress;
@@ -175,7 +176,8 @@
if (operation == null) {
BindingOperation bindingOperationModel =
- fieldPortModel.getBinding().getBindingOperation(name, inputName,
outputName);
+ WSIFUtils.getBindingOperation(
+ fieldPortModel.getBinding(), name, inputName, outputName );
if (bindingOperationModel != null) {
operation =
1.7 +4 -5
xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFPort_EJB.java
Index: WSIFPort_EJB.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFPort_EJB.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WSIFPort_EJB.java 19 Jul 2002 15:46:31 -0000 1.6
+++ WSIFPort_EJB.java 15 Oct 2002 07:41:36 -0000 1.7
@@ -57,7 +57,6 @@
package org.apache.wsif.providers.ejb;
-import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Hashtable;
@@ -67,17 +66,16 @@
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
import javax.naming.InitialContext;
-import javax.naming.NoInitialContextException;
import javax.wsdl.BindingOperation;
import javax.wsdl.Definition;
import javax.wsdl.Port;
import javax.wsdl.extensions.ExtensibilityElement;
+
import org.apache.wsif.WSIFException;
-import org.apache.wsif.WSIFMessage;
import org.apache.wsif.WSIFOperation;
-import org.apache.wsif.base.WSIFDefaultPort;
import org.apache.wsif.logging.Trc;
import org.apache.wsif.providers.WSIFDynamicTypeMap;
+import org.apache.wsif.util.WSIFUtils;
import org.apache.wsif.wsdl.extensions.ejb.EJBAddress;
/**
@@ -129,7 +127,8 @@
if (operation == null) {
BindingOperation bindingOperationModel =
- fieldPortModel.getBinding().getBindingOperation(name, inputName,
outputName);
+ WSIFUtils.getBindingOperation(
+ fieldPortModel.getBinding(), name, inputName, outputName );
if (bindingOperationModel != null) {
operation = new WSIFOperation_EJB(fieldPortModel,
bindingOperationModel, this);
