gdaniels 02/03/23 07:54:25
Modified: java/src/org/apache/axis/description ServiceDesc.java
java/src/org/apache/axis/message RPCElement.java
java/test/RPCDispatch TestSerializedRPC.java
Log:
Change signature of loadServiceDescByIntrospection to take a standard
java Class instead of a JavaClass.
Revision Changes Path
1.4 +2 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceDesc.java 22 Mar 2002 16:08:31 -0000 1.3
+++ ServiceDesc.java 23 Mar 2002 15:54:24 -0000 1.4
@@ -54,7 +54,6 @@
*/
package org.apache.axis.description;
-import org.apache.axis.utils.cache.JavaClass;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.encoding.TypeMapping;
@@ -86,13 +85,13 @@
* Fill in what we can of the service description by introspecting a
* Java class. Only do this if we haven't already been filled in.
*/
- public void loadServiceDescByIntrospection(JavaClass jc, TypeMapping tm)
+ public void loadServiceDescByIntrospection(Class jc, TypeMapping tm)
{
if (hasOperationData)
return;
ArrayList allowedMethods = null;
- Method [] methods = jc.getJavaClass().getDeclaredMethods();
+ Method [] methods = jc.getDeclaredMethods();
for (int i = 0; i < methods.length; i++) {
String methodName = methods[i].getName();
1.44 +10 -12 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- RPCElement.java 22 Mar 2002 16:08:32 -0000 1.43
+++ RPCElement.java 23 Mar 2002 15:54:24 -0000 1.44
@@ -55,28 +55,23 @@
package org.apache.axis.message;
-import org.apache.axis.encoding.DeserializationContext;
-import org.apache.axis.encoding.SerializationContext;
-import org.apache.axis.encoding.TypeMapping;
import org.apache.axis.Constants;
-import org.apache.axis.MessageContext;
-import org.apache.axis.Handler;
import org.apache.axis.Message;
-import org.apache.axis.wsdl.toJava.Utils;
-import org.apache.axis.providers.java.RPCProvider;
+import org.apache.axis.MessageContext;
import org.apache.axis.description.OperationDesc;
import org.apache.axis.description.ServiceDesc;
+import org.apache.axis.encoding.DeserializationContext;
+import org.apache.axis.encoding.SerializationContext;
+import org.apache.axis.encoding.TypeMapping;
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.utils.cache.ClassCache;
import org.apache.axis.utils.cache.JavaClass;
-import org.apache.axis.utils.JavaUtils;
+import org.apache.axis.wsdl.toJava.Utils;
import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.SAXException;
import javax.xml.rpc.namespace.QName;
import java.util.Vector;
-import java.lang.reflect.Method;
public class RPCElement extends SOAPBodyElement
{
@@ -177,8 +172,11 @@
} catch (ClassNotFoundException e) {
throw new SAXException(e);
}
- TypeMapping tm =
(TypeMapping)msgContext.getTypeMappingRegistry().getTypeMapping(msgContext.getEncodingStyle());
- serviceDesc.loadServiceDescByIntrospection(jc, tm);
+ TypeMapping tm = (TypeMapping)msgContext.
+ getTypeMappingRegistry().
+ getTypeMapping(msgContext.getEncodingStyle());
+ serviceDesc.loadServiceDescByIntrospection(jc.getJavaClass(),
+ tm);
}
if (serviceDesc != null) {
1.30 +7 -10 xml-axis/java/test/RPCDispatch/TestSerializedRPC.java
Index: TestSerializedRPC.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/RPCDispatch/TestSerializedRPC.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TestSerializedRPC.java 23 Mar 2002 02:16:47 -0000 1.29
+++ TestSerializedRPC.java 23 Mar 2002 15:54:25 -0000 1.30
@@ -3,24 +3,21 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
import org.apache.axis.Constants;
-import org.apache.axis.Handler;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
-import org.apache.axis.description.ServiceDesc;
-import org.apache.axis.description.OperationDesc;
-import org.apache.axis.providers.java.RPCProvider;
import org.apache.axis.configuration.SimpleProvider;
-import org.apache.axis.encoding.ser.BeanSerializerFactory;
-import org.apache.axis.encoding.ser.BeanDeserializerFactory;
-import org.apache.axis.encoding.TypeMappingRegistry;
+import org.apache.axis.description.OperationDesc;
+import org.apache.axis.description.ServiceDesc;
import org.apache.axis.encoding.TypeMapping;
+import org.apache.axis.encoding.TypeMappingRegistry;
+import org.apache.axis.encoding.ser.BeanDeserializerFactory;
+import org.apache.axis.encoding.ser.BeanSerializerFactory;
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.message.RPCElement;
import org.apache.axis.message.RPCParam;
import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.providers.java.RPCProvider;
import org.apache.axis.server.AxisServer;
-import org.apache.axis.utils.cache.JavaClass;
-
import org.xml.sax.SAXException;
import javax.xml.rpc.namespace.QName;
@@ -79,7 +76,7 @@
tm.register(javaType, xmlType, sf, df);
ServiceDesc desc = new ServiceDesc();
- desc.loadServiceDescByIntrospection(new JavaClass(Service.class), tm);
+ desc.loadServiceDescByIntrospection(Service.class, tm);
reverse.setServiceDescription(desc);
// Now we've got the service description loaded up. We're going to
