gdaniels 2002/09/29 12:35:52
Modified: java/src/org/apache/axis/description ServiceDesc.java
java/src/org/apache/axis/encoding
SerializationContextImpl.java
java/src/org/apache/axis/message RPCParam.java
RPCElement.java
java/test/wsdl/inout inout.wsdl
Log:
Cleanup a few imports, and...
1) Make the return type of message-style OperationDescs anyType
(should help WSDL generation)
2) Fix inout.wsdl to use the correct fault message name
Revision Changes Path
1.64 +3 -0 xml-axis/java/src/org/apache/axis/description/ServiceDesc.java
Index: ServiceDesc.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/ServiceDesc.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ServiceDesc.java 27 Sep 2002 21:24:54 -0000 1.63
+++ ServiceDesc.java 29 Sep 2002 19:35:52 -0000 1.64
@@ -56,6 +56,7 @@
import org.apache.axis.AxisServiceConfig;
import org.apache.axis.InternalException;
+import org.apache.axis.Constants;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPBodyElement;
import org.apache.axis.components.logger.LogFactory;
@@ -1041,6 +1042,8 @@
throw new InternalException("Couldn't match method to any of the
allowable message-style patterns!");
}
operation.setMessageOperationStyle(messageOperType);
+ operation.setReturnClass(Object.class);
+ operation.setReturnType(Constants.XSD_ANYTYPE);
} else {
// For other styles, continue here.
Class retClass = method.getReturnType();
1.76 +1 -1
xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
Index: SerializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- SerializationContextImpl.java 25 Sep 2002 18:56:16 -0000 1.75
+++ SerializationContextImpl.java 29 Sep 2002 19:35:52 -0000 1.76
@@ -1277,7 +1277,7 @@
* Attempts to get a serializer for the indicated javaType and xmlType.
* @param javaType is the type of the object
* @param xmlType is the preferred qname type.
- * @param actualXmlType is set to a QNameHolder or null.
+ * @param actualXMLType is set to a QNameHolder or null.
* If a QNameHolder, the actual xmlType is returned.
* @return found class/serializer or null
**/
1.51 +0 -1 xml-axis/java/src/org/apache/axis/message/RPCParam.java
Index: RPCParam.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCParam.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- RPCParam.java 18 Sep 2002 16:10:28 -0000 1.50
+++ RPCParam.java 29 Sep 2002 19:35:52 -0000 1.51
@@ -55,7 +55,6 @@
package org.apache.axis.message;
import org.apache.axis.encoding.SerializationContext;
-import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
import org.apache.axis.description.ParameterDesc;
1.76 +0 -2 xml-axis/java/src/org/apache/axis/message/RPCElement.java
Index: RPCElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCElement.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- RPCElement.java 18 Sep 2002 16:10:28 -0000 1.75
+++ RPCElement.java 29 Sep 2002 19:35:52 -0000 1.76
@@ -56,7 +56,6 @@
package org.apache.axis.message;
import org.apache.axis.AxisFault;
-import org.apache.axis.Constants;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.description.OperationDesc;
@@ -65,7 +64,6 @@
import org.apache.axis.encoding.SerializationContext;
import org.apache.axis.enum.Style;
import org.apache.axis.handlers.soap.SOAPService;
-import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
import org.apache.axis.wsdl.toJava.Utils;
import org.xml.sax.Attributes;
1.3 +1 -1 xml-axis/java/test/wsdl/inout/inout.wsdl
Index: inout.wsdl
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/inout/inout.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inout.wsdl 31 Jul 2002 20:47:01 -0000 1.2
+++ inout.wsdl 29 Sep 2002 19:35:52 -0000 1.3
@@ -34,7 +34,7 @@
</types>
<!-- message declns -->
- <message name="TestFailedMessage"/>
+ <message name="TestFailed"/>
<message name="Msg0"/>
