You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by an...@apache.org on 2002/07/04 14:35:00 UTC
cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis WSIFPort_ApacheAxis.java WSIFOperation_ApacheAxis.java
antelder 2002/07/04 05:35:00
Modified: java/src/org/apache/wsif/providers/soap/apacheaxis
WSIFPort_ApacheAxis.java
WSIFOperation_ApacheAxis.java
Log:
Move instantiating the Call object from the opertation to the port
Revision Changes Path
1.5 +33 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFPort_ApacheAxis.java
Index: WSIFPort_ApacheAxis.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFPort_ApacheAxis.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSIFPort_ApacheAxis.java 19 Jun 2002 15:33:40 -0000 1.4
+++ WSIFPort_ApacheAxis.java 4 Jul 2002 12:35:00 -0000 1.5
@@ -82,7 +82,15 @@
import javax.wsdl.extensions.soap.SOAPFault;
import javax.wsdl.extensions.soap.SOAPHeader;
import javax.wsdl.extensions.soap.SOAPOperation;
+
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.namespace.QName;
+
+import org.apache.axis.client.Call;
import org.apache.axis.client.Transport;
+import org.apache.axis.encoding.TypeMappingRegistry;
+import org.apache.axis.encoding.ser.BeanDeserializerFactory;
+import org.apache.axis.encoding.ser.BeanSerializerFactory;
import org.apache.axis.transport.http.HTTPTransport;
import org.apache.wsif.WSIFException;
import org.apache.wsif.WSIFMessage;
@@ -90,6 +98,7 @@
import org.apache.wsif.base.WSIFDefaultPort;
import org.apache.wsif.logging.Tr;
import org.apache.wsif.providers.WSIFDynamicTypeMap;
+import org.apache.wsif.providers.WSIFDynamicTypeMapping;
import org.apache.wsif.util.WSIFProperties;
import org.apache.wsif.util.jms.WSIFJMSDestination;
import org.apache.wsif.util.jms.WSIFJMSFinder;
@@ -99,6 +108,7 @@
/**
* @author Mark Whitlock <wh...@apache.org>
+ * @author Ant Elder <an...@uk.ibm.com>
*/
public class WSIFPort_ApacheAxis extends WSIFDefaultPort {
@@ -109,6 +119,8 @@
protected int transportcode;
protected Transport st;
protected List jmsAddressPropVals = null;
+ protected Call call;
+
private static final boolean DEBUG = false;
private static final int HTTP_TRANSPORT = 1;
private static final int JMS_TRANSPORT = 2;
@@ -422,6 +434,27 @@
Tr.entry(this);
Tr.exit(st);
return st;
+ }
+
+ public Call getCall() throws WSIFException {
+ Tr.entry(this);
+ if ( call == null ) {
+ Transport axistransport = getAxisTransport();
+ java.net.URL url = getEndPoint();
+ try {
+ if (url != null) {
+ call = new Call(url);
+ if (axistransport != null) {
+ axistransport.setUrl(url.toString());
+ }
+ } else
+ call = new Call( new org.apache.axis.client.Service() );
+ } catch (JAXRPCException e) {
+ throw new WSIFException(e.toString());
+ }
+ }
+ Tr.exit(call);
+ return call;
}
public void setDefinition(Definition definition1) {
1.13 +2 -15 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
Index: WSIFOperation_ApacheAxis.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WSIFOperation_ApacheAxis.java 27 Jun 2002 10:40:33 -0000 1.12
+++ WSIFOperation_ApacheAxis.java 4 Jul 2002 12:35:00 -0000 1.13
@@ -104,6 +104,7 @@
/**
* @author Mark Whitlock <wh...@apache.org>
+ * @author Ant Elder <an...@uk.ibm.com>
*/
public class WSIFOperation_ApacheAxis
extends WSIFDefaultOperation
@@ -506,22 +507,8 @@
throws WSIFException {
Tr.entry(this, wsifmessage, wsifmessage1, wsifmessage2);
- Call call = null;
+ Call call = portInstance.getCall();
Transport axistransport = getTransport();
-
- java.net.URL url = portInstance.getEndPoint();
- try {
- if (url != null) {
- call = new Call(url);
- if (axistransport != null) {
- axistransport.setUrl(url.toString());
- }
- } else
- call = new Call(new Service());
- } catch (JAXRPCException e) {
- e.printStackTrace();
- throw new WSIFException(e.toString());
- }
WSIFJMSDestination dest = null;
if (axistransport != null) {