whitlock 2002/06/27 03:40:33
Modified: java/src/org/apache/wsif/providers/soap/apacheaxis
WSIFOperation_ApacheAxis.java WSIFJmsSender.java
Log:
Make WSIF use axis nightly build 240602
Revision Changes Path
1.12 +11 -18
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WSIFOperation_ApacheAxis.java 25 Jun 2002 11:04:40 -0000 1.11
+++ WSIFOperation_ApacheAxis.java 27 Jun 2002 10:40:33 -0000 1.12
@@ -71,6 +71,7 @@
import javax.wsdl.Output;
import javax.wsdl.Part;
import javax.xml.rpc.JAXRPCException;
+import javax.xml.namespace.QName;
import org.apache.axis.AxisFault;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
@@ -415,21 +416,18 @@
objClass = wsifdynamictypemapping.getJavaType();
namespaceURI =
wsifdynamictypemapping.getXmlType().getNamespaceURI();
localPart = wsifdynamictypemapping.getXmlType().getLocalPart();
- javax.xml.rpc.namespace.QName qn =
- new javax.xml.rpc.namespace.QName(namespaceURI, localPart);
+ QName qn = new QName(namespaceURI, localPart);
BeanSerializerFactory bsf = new BeanSerializerFactory(objClass, qn);
BeanDeserializerFactory bdf = new BeanDeserializerFactory(objClass,
qn);
tm.register(objClass, qn, bsf, bdf);
}
Message resMsg = msgContext.getResponseMessage();
- org.apache.axis.SOAPPart soapPart = resMsg.getSOAPPart();
-
- SOAPEnvelope resEnv = (SOAPEnvelope) soapPart.getAsSOAPEnvelope();
+ SOAPEnvelope resEnv = resMsg.getSOAPEnvelope();
Object b = resEnv.getFirstBody();
if (b instanceof SOAPFaultElement) {
- return ((SOAPFaultElement) b).getFault();
+ return new AxisFault(b.toString());
}
// RPCElement body = (RPCElement)resEnv.getFirstBody();
@@ -610,8 +608,7 @@
objClass = wsifdynamictypemapping.getJavaType();
namespaceURI = wsifdynamictypemapping.getXmlType().getNamespaceURI();
localPart = wsifdynamictypemapping.getXmlType().getLocalPart();
- javax.xml.rpc.namespace.QName qn =
- new javax.xml.rpc.namespace.QName(namespaceURI, localPart);
+ QName qn = new QName(namespaceURI, localPart);
BeanSerializerFactory bsf = new BeanSerializerFactory(objClass, qn);
BeanDeserializerFactory bdf = new BeanDeserializerFactory(objClass, qn);
call.registerTypeMapping(objClass, qn, bsf, bdf);
@@ -642,18 +639,16 @@
for (int j = 0; j < i; j++) {
Part part2 = (Part) ((List) (obj)).get(j);
names[j] = part2.getName();
- javax.xml.namespace.QName qname1 = part2.getTypeName();
+ QName qname1 = part2.getTypeName();
if (qname1 == null)
throw new WSIFException("part " + names[j] + " must have type
name declared");
javax.xml.rpc.encoding.TypeMapping tm =
registry.getTypeMapping("http://schemas.xmlsoap.org/soap/encoding/";);
if (tm instanceof org.apache.axis.encoding.TypeMapping) {
- types[j] =
- ((org.apache.axis.encoding.TypeMapping)
tm).getClassForQName(
- new javax.xml.rpc.namespace.QName(
- qname1.getNamespaceURI(),
- qname1.getLocalPart()));
+ types[j] = ((org.apache.axis.encoding.TypeMapping) tm)
+ .getClassForQName(
+ new
QName(qname1.getNamespaceURI(),qname1.getLocalPart()));
}
}
@@ -677,15 +672,13 @@
}
}
if (part != null) {
- javax.xml.namespace.QName qname = part.getTypeName();
+ QName qname = part.getTypeName();
javax.xml.rpc.encoding.TypeMapping tm =
registry.getTypeMapping("http://schemas.xmlsoap.org/soap/encoding/";);
if (tm instanceof org.apache.axis.encoding.TypeMapping) {
returnType =
((org.apache.axis.encoding.TypeMapping)
tm).getClassForQName(
- new javax.xml.rpc.namespace.QName(
- qname.getNamespaceURI(),
- qname.getLocalPart()));
+ new
QName(qname.getNamespaceURI(),qname.getLocalPart()));
}
}
}
1.3 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFJmsSender.java
Index: WSIFJmsSender.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFJmsSender.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSIFJmsSender.java 20 Jun 2002 14:49:20 -0000 1.2
+++ WSIFJmsSender.java 27 Jun 2002 10:40:33 -0000 1.3
@@ -90,7 +90,7 @@
(WSIFJMSDestination)
messageContext.getProperty(WSIFJmsTransport.DESTINATION);
Message message = messageContext.getRequestMessage();
- String contents = message.getSOAPPart().getAsString();
+ String contents = message.getSOAPPartAsString();
if (asyncMode) {
performAsyncSend(messageContext, dest, contents);
