butek 02/03/27 08:46:57
Modified: java TODO.txt
java/docs user-guide.html
java/samples/attachments EchoAttachment.java
java/samples/bidbuy TestClient.java v3.java
java/samples/echo EchoService.java
EchoServiceBindingStub.java TestClient.java
java/samples/stock GetInfo.java GetQuote.java GetQuote1.java
java/samples/transport FileTest.java
java/samples/transport/tcp GetQuote.java
java/samples/userguide/example2 CalcClient.java
java/samples/userguide/example3 Client.java
java/samples/userguide/example5 Client.java
java/src/javax/xml/rpc Call.java ParameterMode.java
java/src/org/apache/axis/client Call.java
java/src/org/apache/axis/wsdl/fromJava ClassRep.java
MethodRep.java
java/src/org/apache/axis/wsdl/toJava JavaSkelWriter.java
JavaStubWriter.java
java/test/functional TestTCPTransportSample.java
java/test/outparams TestOutParams.java
Log:
ParameterMode.PARAM_MODE_IN/INOUT/OUT changed in JAX-RPC
version 0.8 to ParameterMode.IN/INOUT/OUT.
I've kept the old stuff and deprecated it.
Revision Changes Path
1.29 +2 -1 xml-axis/java/TODO.txt
Index: TODO.txt
===================================================================
RCS file: /home/cvs/xml-axis/java/TODO.txt,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- TODO.txt 27 Mar 2002 13:35:56 -0000 1.28
+++ TODO.txt 27 Mar 2002 16:46:54 -0000 1.29
@@ -20,7 +20,8 @@
! <> Implement Service.getCalls() method. (maybe)
! <> Implement generated Services' getCalls() method.
! <> Implement Service.getHandlerRegistry() method.
-! <> Remove standard property constants from org.apache.axis.client.Call after a
reasonable period of time has gone by for folks to see the deprecation tags on them.
+! <> Remove standard property constants from org.apache.axis.client.Call after
beta2.
+! <> Remove ParameterMode.PARAM_MODE_* constants after beta2.
SOAP 1.2 SUPPORT
----------------
1.51 +1 -1 xml-axis/java/docs/user-guide.html
Index: user-guide.html
===================================================================
RCS file: /home/cvs/xml-axis/java/docs/user-guide.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- user-guide.html 19 Mar 2002 22:51:14 -0000 1.50
+++ user-guide.html 27 Mar 2002 16:46:55 -0000 1.51
@@ -254,7 +254,7 @@
<div class="example">
<pre> call.addParameter("testParam",
org.apache.axis.encoding.XMLType.XSD_STRING,
-
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);</pre>
+
javax.xml.rpc.ParameterMode.IN);</pre>
</div>
This will assign the name <b>testParam</b> to the 1st (and only) parameter
on the invoke call. This will also define the type of the parameter
(<tt>org.apache.axis.encoding.XMLType.XSD_STRING</tt>)
1.10 +2 -2 xml-axis/java/samples/attachments/EchoAttachment.java
Index: EchoAttachment.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/attachments/EchoAttachment.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EchoAttachment.java 14 Mar 2002 04:20:52 -0000 1.9
+++ EchoAttachment.java 27 Mar 2002 16:46:55 -0000 1.10
@@ -125,7 +125,7 @@
call.addParameter( "source", qnameAttachment,
- ParameterMode.PARAM_MODE_IN ); //Add the file.
+ ParameterMode.IN ); //Add the file.
call.setReturnType( qnameAttachment);
@@ -213,7 +213,7 @@
JAFDataHandlerDeserializerFactory.class);
call.addParameter( "source", XMLType.SOAP_ARRAY , // new
XMLType(qnameAttachment),
- ParameterMode.PARAM_MODE_IN ); //Add the file.
+ ParameterMode.IN ); //Add the file.
call.setReturnType(XMLType.SOAP_ARRAY); // new XMLType(qnameAttachment));
1.22 +1 -1 xml-axis/java/samples/bidbuy/TestClient.java
Index: TestClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/bidbuy/TestClient.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TestClient.java 8 Feb 2002 22:14:10 -0000 1.21
+++ TestClient.java 27 Mar 2002 16:46:55 -0000 1.22
@@ -125,7 +125,7 @@
try {
// Default return type based on what we expect
call.setOperationName( new QName("http://www.soapinterop.org/Bid";,
"Buy" ));
- call.addParameter( "PO", poqn, ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "PO", poqn, ParameterMode.IN );
call.setReturnType( XMLType.XSD_STRING );
LineItem[] li = new LineItem[2];
1.19 +12 -12 xml-axis/java/samples/bidbuy/v3.java
Index: v3.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/bidbuy/v3.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- v3.java 8 Feb 2002 22:14:10 -0000 1.18
+++ v3.java 27 Mar 2002 16:46:55 -0000 1.19
@@ -23,10 +23,10 @@
call.setTargetEndpointAddress( new URL(registryURL) );
call.setOperationName( new QName("http://www.soapinterop.org/Register";,
"Register" ));
- call.addParameter("ServiceName", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
- call.addParameter("ServiceUrl", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
- call.addParameter("ServiceType", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
- call.addParameter("ServiceWSDL", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
+ call.addParameter("ServiceName", XMLType.XSD_STRING, ParameterMode.IN);
+ call.addParameter("ServiceUrl", XMLType.XSD_STRING, ParameterMode.IN);
+ call.addParameter("ServiceType", XMLType.XSD_STRING, ParameterMode.IN);
+ call.addParameter("ServiceWSDL", XMLType.XSD_STRING, ParameterMode.IN);
call.invoke( new Object[] { s.getServiceName(), s.getServiceUrl(),
s.getServiceType(), s.getServiceWsdl() } );
@@ -44,7 +44,7 @@
call.setTargetEndpointAddress( new URL(registryURL) );
call.setOperationName( new QName("http://www.soapinterop.org/Unregister";,
"Unregister" ));
- call.addParameter( "ServiceName", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
+ call.addParameter( "ServiceName", XMLType.XSD_STRING, ParameterMode.IN);
call.invoke( new Object[] { name } );
}
catch( Exception e ) {
@@ -81,7 +81,7 @@
call.setUseSOAPAction( true );
call.setSOAPActionURI( "http://www.soapinterop.org/LookupAsString"; );
call.setOperationName( new QName("http://www.soapinterop.org/Registry";,
"LookupAsString" ));
- call.addParameter( "ServiceType", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
+ call.addParameter( "ServiceType", XMLType.XSD_STRING, ParameterMode.IN);
call.setReturnType( XMLType.XSD_DOUBLE );
String res= (String) call.invoke( new Object[] { "Bid" } );
@@ -129,8 +129,8 @@
call.setReturnType( XMLType.XSD_DOUBLE );
call.setUseSOAPAction( true );
call.setSOAPActionURI( "http://www.soapinterop.org/RequestForQuote"; );
- call.addParameter( "ProductName", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
- call.addParameter( "Quantity", XMLType.XSD_INT, ParameterMode.PARAM_MODE_IN);
+ call.addParameter( "ProductName", XMLType.XSD_STRING, ParameterMode.IN);
+ call.addParameter( "Quantity", XMLType.XSD_INT, ParameterMode.IN);
Object r = call.invoke( new Object[] { "widget", new Integer(10) } );
/*
@@ -163,9 +163,9 @@
call.setSOAPActionURI( "http://www.soapinterop.org/SimpleBuy"; );
call.setOperationName( new QName("http://www.soapinterop.org/Bid";,
"SimpleBuy") );
call.setReturnType( XMLType.XSD_STRING );
- call.addParameter( "Address", XMLType.XSD_STRING, ParameterMode.PARAM_MODE_IN
);
- call.addParameter( "ProductName", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
- call.addParameter( "Quantity", XMLType.XSD_INT, ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "Address", XMLType.XSD_STRING, ParameterMode.IN );
+ call.addParameter( "ProductName", XMLType.XSD_STRING, ParameterMode.IN);
+ call.addParameter( "Quantity", XMLType.XSD_INT, ParameterMode.IN );
String res = (String) call.invoke(new Object[] { "123 Main St.",
"Widget",
@@ -243,7 +243,7 @@
"06883"),
lineItems );
- call.addParameter( "PO", poqn, ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "PO", poqn, ParameterMode.IN );
call.setOperationName( new QName("http://www.soapinterop.org/Bid";, "Buy") );
String res = (String) call.invoke( new Object[] { po } );
1.21 +44 -44 xml-axis/java/samples/echo/EchoService.java
Index: EchoService.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/echo/EchoService.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- EchoService.java 13 Mar 2002 19:50:58 -0000 1.20
+++ EchoService.java 27 Mar 2002 16:46:55 -0000 1.21
@@ -108,8 +108,8 @@
"inputString"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoStringArray",
new String[] {
@@ -117,8 +117,8 @@
"inputStringArray"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoInteger",
new String[] {
@@ -126,8 +126,8 @@
"inputInteger"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoIntegerArray",
new String[] {
@@ -135,8 +135,8 @@
"inputIntegerArray"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoFloat",
new String[] {
@@ -144,8 +144,8 @@
"inputFloat"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoFloatArray",
new String[] {
@@ -153,8 +153,8 @@
"inputFloatArray"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoStruct",
new String[] {
@@ -162,8 +162,8 @@
"inputStruct"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoStructArray",
new String[] {
@@ -171,8 +171,8 @@
"inputStructArray"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoVoid",
new String[] {
@@ -184,8 +184,8 @@
"inputBase64"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoHexBinary",
new String[] {
@@ -193,8 +193,8 @@
"inputHexBinary"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoDate",
new String[] {
@@ -202,8 +202,8 @@
"inputDate"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoDecimal",
new String[] {
@@ -211,8 +211,8 @@
"inputDecimal"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoBoolean",
new String[] {
@@ -220,8 +220,8 @@
"inputBoolean"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoMap",
new String[] {
@@ -229,8 +229,8 @@
"inputMap"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoMapArray",
new String[] {
@@ -238,8 +238,8 @@
"inputMapArray"
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoStructAsSimpleTypes",
new String[] {
@@ -251,10 +251,10 @@
},
new ParameterMode[] {
null,
- ParameterMode.PARAM_MODE_IN,
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_OUT,
+ ParameterMode.IN,
+ ParameterMode.OUT,
+ ParameterMode.OUT,
+ ParameterMode.OUT,
}, null, null, null);
skel.add("echoSimpleTypesAsStruct",
new String[] {
@@ -264,10 +264,10 @@
"inputFloat",
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN,
- ParameterMode.PARAM_MODE_IN,
- ParameterMode.PARAM_MODE_IN,
+ ParameterMode.OUT,
+ ParameterMode.IN,
+ ParameterMode.IN,
+ ParameterMode.IN,
}, null, null, null);
skel.add("echo2DStringArray",
new String[] {
@@ -275,8 +275,8 @@
"input2DStringArray",
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoNestedStruct",
new String[] {
@@ -284,8 +284,8 @@
"inputStruct",
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
skel.add("echoNestedArray",
new String[] {
@@ -293,8 +293,8 @@
"inputStruct",
},
new ParameterMode[] {
- ParameterMode.PARAM_MODE_OUT,
- ParameterMode.PARAM_MODE_IN
+ ParameterMode.OUT,
+ ParameterMode.IN
}, null, null, null);
}
1.5 +25 -25 xml-axis/java/samples/echo/EchoServiceBindingStub.java
Index: EchoServiceBindingStub.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/echo/EchoServiceBindingStub.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EchoServiceBindingStub.java 15 Mar 2002 15:35:07 -0000 1.4
+++ EchoServiceBindingStub.java 27 Mar 2002 16:46:55 -0000 1.5
@@ -161,7 +161,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputString", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "string"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputString", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "string"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "string"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoString" : "";
@@ -186,7 +186,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputStringArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfstring"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputStringArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfstring"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfstring"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoStringArray" : "";
@@ -212,7 +212,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputInteger", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "int"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputInteger", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "int"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "int"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoInteger" : "";
@@ -236,7 +236,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputIntegerArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfint"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputIntegerArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfint"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfint"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoIntegerArray" : "";
@@ -261,7 +261,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputFloat", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "float"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputFloat", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "float"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "float"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoFloat" : "";
@@ -285,7 +285,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputFloatArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOffloat"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputFloatArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOffloat"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOffloat"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoFloatArray" : "";
@@ -310,7 +310,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputStruct", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStruct"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputStruct", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStruct"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStruct"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoStruct" : "";
@@ -334,7 +334,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputStructArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfSOAPStruct"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputStructArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfSOAPStruct"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfSOAPStruct"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoStructArray" : "";
@@ -379,7 +379,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputBase64", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "base64Binary"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputBase64", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "base64Binary"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "base64Binary"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoBase64" : "";
@@ -404,7 +404,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputHexBinary", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "hexBinary"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputHexBinary", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "hexBinary"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "hexBinary"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoHexBinary" : "";
@@ -429,7 +429,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputDate", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "dateTime"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputDate", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "dateTime"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "dateTime"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoDate" : "";
@@ -453,7 +453,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputDecimal", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "decimal"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputDecimal", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "decimal"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "decimal"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoDecimal" : "";
@@ -477,7 +477,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputBoolean", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "boolean"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputBoolean", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "boolean"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "boolean"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoBoolean" : "";
@@ -501,7 +501,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputMap", new
javax.xml.rpc.namespace.QName("http://xml.apache.org/xml-soap";, "Map"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputMap", new
javax.xml.rpc.namespace.QName("http://xml.apache.org/xml-soap";, "Map"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://xml.apache.org/xml-soap";, "Map"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoMap" : "";
@@ -525,7 +525,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputMapArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/";, "ArrayOf_tns2_Map"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputMapArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/";, "ArrayOf_tns2_Map"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/";, "ArrayOf_tns2_Map"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoMapArray" : "";
@@ -550,10 +550,10 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputStruct", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStruct"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
- call.addParameter("outputString", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "string"),
javax.xml.rpc.ParameterMode.PARAM_MODE_OUT);
- call.addParameter("outputInteger", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "int"),
javax.xml.rpc.ParameterMode.PARAM_MODE_OUT);
- call.addParameter("outputFloat", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "float"),
javax.xml.rpc.ParameterMode.PARAM_MODE_OUT);
+ call.addParameter("inputStruct", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStruct"),
javax.xml.rpc.ParameterMode.IN);
+ call.addParameter("outputString", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "string"),
javax.xml.rpc.ParameterMode.OUT);
+ call.addParameter("outputInteger", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "int"),
javax.xml.rpc.ParameterMode.OUT);
+ call.addParameter("outputFloat", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "float"),
javax.xml.rpc.ParameterMode.OUT);
call.setReturnType(XMLType.AXIS_VOID);
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoStructAsSimpleTypes" : "";
@@ -585,9 +585,9 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputString", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "string"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
- call.addParameter("inputInteger", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "int"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
- call.addParameter("inputFloat", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "float"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputString", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "string"),
javax.xml.rpc.ParameterMode.IN);
+ call.addParameter("inputInteger", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "int"),
javax.xml.rpc.ParameterMode.IN);
+ call.addParameter("inputFloat", new
javax.xml.rpc.namespace.QName("http://www.w3.org/2001/XMLSchema";, "float"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStruct"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoSimpleTypesAsStruct" : "";
@@ -612,7 +612,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("input2DStringArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfstring"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("input2DStringArray", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfstring"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "ArrayOfstring"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echo2DStringArray" : "";
@@ -638,7 +638,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputStruct", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStructStruct"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputStruct", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStructStruct"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPStructStruct"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoNestedStruct" : "";
@@ -663,7 +663,7 @@
throw new org.apache.axis.NoEndPointException();
}
org.apache.axis.client.Call call = getCall();
- call.addParameter("inputStruct", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPArrayStruct"),
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ call.addParameter("inputStruct", new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPArrayStruct"),
javax.xml.rpc.ParameterMode.IN);
call.setReturnType(new
javax.xml.rpc.namespace.QName("http://soapinterop.org/xsd";, "SOAPArrayStruct"));
call.setUseSOAPAction(true);
String methodName = (addMethodToAction) ? "echoNestedArray" : "";
1.56 +0 -11 xml-axis/java/samples/echo/TestClient.java
Index: TestClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/echo/TestClient.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- TestClient.java 21 Feb 2002 14:58:41 -0000 1.55
+++ TestClient.java 27 Mar 2002 16:46:55 -0000 1.56
@@ -56,21 +56,10 @@
package samples.echo ;
import org.apache.axis.AxisFault;
-import org.apache.axis.client.Call;
-import org.apache.axis.client.Service;
-import org.apache.axis.encoding.ser.BeanSerializerFactory;
-import org.apache.axis.encoding.ser.BeanDeserializerFactory;
-import org.apache.axis.encoding.ser.ArraySerializerFactory;
-import org.apache.axis.encoding.ser.ArrayDeserializerFactory;
-import org.apache.axis.encoding.TypeMappingRegistry;
-import org.apache.axis.encoding.TypeMapping;
import org.apache.axis.encoding.Hex;
-import org.apache.axis.Constants;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Options;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.rpc.namespace.QName;
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.util.Date;
1.20 +2 -2 xml-axis/java/samples/stock/GetInfo.java
Index: GetInfo.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/stock/GetInfo.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GetInfo.java 8 Feb 2002 22:14:11 -0000 1.19
+++ GetInfo.java 27 Mar 2002 16:46:55 -0000 1.20
@@ -87,8 +87,8 @@
call.setTargetEndpointAddress( new java.net.URL(opts.getURL()) );
call.setOperationName( new QName("urn:cominfo", "getInfo") );
- call.addParameter( "symbol", XMLType.XSD_STRING, ParameterMode.PARAM_MODE_IN
);
- call.addParameter( "info", XMLType.XSD_STRING, ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "symbol", XMLType.XSD_STRING, ParameterMode.IN );
+ call.addParameter( "info", XMLType.XSD_STRING, ParameterMode.IN );
call.setUsername( opts.getUser() );
call.setPassword( opts.getPassword() );
1.39 +1 -1 xml-axis/java/samples/stock/GetQuote.java
Index: GetQuote.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/stock/GetQuote.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- GetQuote.java 12 Mar 2002 21:00:34 -0000 1.38
+++ GetQuote.java 27 Mar 2002 16:46:55 -0000 1.39
@@ -107,7 +107,7 @@
call.setTargetEndpointAddress( url );
call.setOperationName( new QName("urn:xmltoday-delayed-quotes",
"getQuote") );
- call.addParameter( "symbol", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "symbol", XMLType.XSD_STRING, ParameterMode.IN );
call.setReturnType( XMLType.XSD_FLOAT );
// TESTING HACK BY ROBJ
1.21 +1 -1 xml-axis/java/samples/stock/GetQuote1.java
Index: GetQuote1.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/stock/GetQuote1.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- GetQuote1.java 8 Feb 2002 22:14:11 -0000 1.20
+++ GetQuote1.java 27 Mar 2002 16:46:56 -0000 1.21
@@ -156,7 +156,7 @@
call.setSOAPActionURI( "getQuote" );
call.setEncodingStyle( "http://schemas.xmlsoap.org/soap/encoding/"; );
call.setOperationName( new QName("urn:xmltoday-delayed-quotes", "getQuote") );
- call.addParameter( "symbol", XMLType.XSD_STRING, ParameterMode.PARAM_MODE_IN
);
+ call.addParameter( "symbol", XMLType.XSD_STRING, ParameterMode.IN );
call.setReturnType( XMLType.XSD_FLOAT );
/* Define some service specific properties */
1.27 +1 -1 xml-axis/java/samples/transport/FileTest.java
Index: FileTest.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/FileTest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- FileTest.java 14 Feb 2002 22:46:34 -0000 1.26
+++ FileTest.java 27 Mar 2002 16:46:56 -0000 1.27
@@ -49,7 +49,7 @@
Call call = (Call) service.createCall();
call.setOperationName( new QName("urn:xmltoday-delayed-quotes", "getQuote")
);
- call.addParameter( "symbol", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "symbol", XMLType.XSD_STRING, ParameterMode.IN );
call.setReturnType( XMLType.XSD_FLOAT );
call.setTransport( new FileTransport() );
call.setUsername(opts.getUser() );
1.20 +1 -1 xml-axis/java/samples/transport/tcp/GetQuote.java
Index: GetQuote.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/tcp/GetQuote.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GetQuote.java 8 Feb 2002 22:14:11 -0000 1.19
+++ GetQuote.java 27 Mar 2002 16:46:56 -0000 1.20
@@ -108,7 +108,7 @@
call.setTargetEndpointAddress( new URL(opts.getURL()) );
call.setOperationName( new QName("urn:xmltoday-delayed-quotes", "getQuote")
);
- call.addParameter( "symbol", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "symbol", XMLType.XSD_STRING, ParameterMode.IN );
call.setReturnType( XMLType.XSD_FLOAT );
// TESTING HACK BY ROBJ
1.10 +2 -2 xml-axis/java/samples/userguide/example2/CalcClient.java
Index: CalcClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/userguide/example2/CalcClient.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CalcClient.java 13 Mar 2002 17:06:33 -0000 1.9
+++ CalcClient.java 27 Mar 2002 16:46:56 -0000 1.10
@@ -91,8 +91,8 @@
call.setTargetEndpointAddress( new java.net.URL(endpoint) );
call.setOperationName( method );
- call.addParameter( "op1", XMLType.XSD_INT, ParameterMode.PARAM_MODE_IN );
- call.addParameter( "op2", XMLType.XSD_INT, ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "op1", XMLType.XSD_INT, ParameterMode.IN );
+ call.addParameter( "op2", XMLType.XSD_INT, ParameterMode.IN );
call.setReturnType( XMLType.XSD_INT );
Integer ret = (Integer) call.invoke( new Object [] { i1, i2 });
1.10 +1 -1 xml-axis/java/samples/userguide/example3/Client.java
Index: Client.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/userguide/example3/Client.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Client.java 8 Mar 2002 23:12:56 -0000 1.9
+++ Client.java 27 Mar 2002 16:46:56 -0000 1.10
@@ -85,7 +85,7 @@
call.setTargetEndpointAddress( new java.net.URL(endpointURL) );
call.setOperationName( new QName("MyService", "serviceMethod") );
- call.addParameter( "arg1", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN);
+ call.addParameter( "arg1", XMLType.XSD_STRING, ParameterMode.IN);
call.setReturnType( org.apache.axis.encoding.XMLType.XSD_STRING );
String ret = (String) call.invoke( new Object[] { textToSend } );
1.15 +1 -1 xml-axis/java/samples/userguide/example5/Client.java
Index: Client.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/userguide/example5/Client.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Client.java 9 Mar 2002 20:14:02 -0000 1.14
+++ Client.java 27 Mar 2002 16:46:56 -0000 1.15
@@ -90,7 +90,7 @@
try {
call.setTargetEndpointAddress( new java.net.URL(options.getURL()) );
call.setOperationName( new QName("OrderProcessor", "processOrder") );
- call.addParameter( "arg1", qn, ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "arg1", qn, ParameterMode.IN );
call.setReturnType( org.apache.axis.encoding.XMLType.XSD_STRING );
result = (String) call.invoke( new Object[] { order } );
1.11 +2 -4 xml-axis/java/src/javax/xml/rpc/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/Call.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Call.java 23 Mar 2002 02:18:18 -0000 1.10
+++ Call.java 27 Mar 2002 16:46:56 -0000 1.11
@@ -121,8 +121,7 @@
*
* @param paramName - Name of the parameter
* @param xmlType - XML datatype of the parameter
- * @param parameterMode - Mode of the parameter-whether PARAM_MODE_IN,
- * PARAM_MODE_OUT or PARAM_MODE_INOUT
+ * @param parameterMode - Mode of the parameter-whether IN, OUT or INOUT
* @exception JAXRPCException - if isParameterAndReturnSpecRequired returns
* false, then addParameter will throw
* JAXRPCException.
@@ -140,8 +139,7 @@
* @param paramName - Name of the parameter
* @param xmlType - XML datatype of the parameter
* @param javaType - The Java class of the parameter
- * @param parameterMode - Mode of the parameter-whether PARAM_MODE_IN,
- * PARAM_MODE_OUT or PARAM_MODE_INOUT
+ * @param parameterMode - Mode of the parameter-whether IN, OUT or INOUT
* @exception JAXRPCException - if isParameterAndReturnSpecRequired returns
* false, then addParameter will throw
* JAXRPCException.
1.2 +17 -6 xml-axis/java/src/javax/xml/rpc/ParameterMode.java
Index: ParameterMode.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/ParameterMode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParameterMode.java 4 Jan 2002 22:31:00 -0000 1.1
+++ ParameterMode.java 27 Mar 2002 16:46:56 -0000 1.2
@@ -61,12 +61,23 @@
public class ParameterMode {
private final String mode;
- public static final ParameterMode PARAM_MODE_IN =
- new ParameterMode("PARAM_MODE_IN");
- public static final ParameterMode PARAM_MODE_INOUT =
- new ParameterMode("PARAM_MODE_INOUT");
- public static final ParameterMode PARAM_MODE_OUT =
- new ParameterMode("PARAM_MODE_OUT");
+ public static final ParameterMode IN = new ParameterMode("IN");
+ public static final ParameterMode INOUT = new ParameterMode("INOUT");
+ public static final ParameterMode OUT = new ParameterMode("OUT");
+
+ /**
+ * @deprecated Use ParameterMode.IN instead.
+ */
+// public static final ParameterMode PARAM_MODE_IN = IN;
+ /**
+ * @deprecated Use ParameterMode.INOUT instead.
+ */
+// public static final ParameterMode PARAM_MODE_INOUT = INOUT;
+ /**
+ * @deprecated Use ParameterMode.OUT instead.
+ */
+// public static final ParameterMode PARAM_MODE_OUT = OUT;
+
private ParameterMode(String mode) {
this.mode = mode;
1.107 +7 -11 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- Call.java 26 Mar 2002 16:40:34 -0000 1.106
+++ Call.java 27 Mar 2002 16:46:56 -0000 1.107
@@ -694,8 +694,7 @@
*
* @param paramName Name that will be used for the parameter in the XML
* @param xmlType XMLType of the parameter
- * @param parameterMode one of PARAM_MODE_IN, PARAM_MODE_OUT
- * or PARAM_MODE_INOUT
+ * @param parameterMode one of IN, OUT or INOUT
*/
public void addParameter(QName paramName, QName xmlType,
ParameterMode parameterMode) {
@@ -712,8 +711,7 @@
* @param paramName Name that will be used for the parameter in the XML
* @param xmlType XMLType of the parameter
* @param javaType - The Java class of the parameter
- * @param parameterMode one of PARAM_MODE_IN, PARAM_MODE_OUT
- * or PARAM_MODE_INOUT
+ * @param parameterMode one of IN, OUT or INOUT
*/
public void addParameter(QName paramName, QName xmlType,
Class javaType, ParameterMode parameterMode) {
@@ -727,9 +725,9 @@
param.setTypeQName( xmlType );
param.setJavaType( javaType );
byte mode = ParameterDesc.IN;
- if (parameterMode == ParameterMode.PARAM_MODE_INOUT) {
+ if (parameterMode == ParameterMode.INOUT) {
mode = ParameterDesc.INOUT;
- } else if (parameterMode == ParameterMode.PARAM_MODE_OUT) {
+ } else if (parameterMode == ParameterMode.OUT) {
mode = ParameterDesc.OUT;
}
param.setMode(mode);
@@ -747,8 +745,7 @@
*
* @param paramName Name that will be used for the parameter in the XML
* @param xmlType XMLType of the parameter
- * @param parameterMode one of PARAM_MODE_IN, PARAM_MODE_OUT
- * or PARAM_MODE_INOUT
+ * @param parameterMode one of IN, OUT or INOUT
*/
public void addParameter(String paramName, QName xmlType,
ParameterMode parameterMode) {
@@ -765,8 +762,7 @@
* @param paramName - Name of the parameter
* @param xmlType - XML datatype of the parameter
* @param javaType - The Java class of the parameter
- * @param parameterMode - Mode of the parameter-whether PARAM_MODE_IN,
- * PARAM_MODE_OUT or PARAM_MODE_INOUT
+ * @param parameterMode - Mode of the parameter-whether IN, OUT or INOUT
* @exception JAXRPCException - if isParameterAndReturnSpecRequired returns
* false, then addParameter will throw
* JAXRPCException.
@@ -1056,7 +1052,7 @@
QName qname = new QName(type.getNamespaceURI(),
type.getLocalPart());
- ParameterMode mode = ParameterMode.PARAM_MODE_IN;
+ ParameterMode mode = ParameterMode.IN;
this.addParameter( name, qname, mode );
}
}
1.24 +3 -3 xml-axis/java/src/org/apache/axis/wsdl/fromJava/ClassRep.java
Index: ClassRep.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/ClassRep.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ClassRep.java 12 Mar 2002 17:41:06 -0000 1.23
+++ ClassRep.java 27 Mar 2002 16:46:56 -0000 1.24
@@ -591,13 +591,13 @@
*/
protected ParameterMode[] getParameterModes(Method method) {
ParameterMode[] modes = new
ParameterMode[method.getParameterTypes().length+1];
- modes[0] = ParameterMode.PARAM_MODE_OUT;
+ modes[0] = ParameterMode.OUT;
for (int i=0; i < method.getParameterTypes().length; i++) {
Class type = method.getParameterTypes()[i];
if (JavaUtils.getHolderValueType(type) != null) {
- modes[i+1] = ParameterMode.PARAM_MODE_INOUT;
+ modes[i+1] = ParameterMode.INOUT;
} else {
- modes[i+1] = ParameterMode.PARAM_MODE_IN;
+ modes[i+1] = ParameterMode.IN;
}
}
return modes;
1.10 +2 -2 xml-axis/java/src/org/apache/axis/wsdl/fromJava/MethodRep.java
Index: MethodRep.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/MethodRep.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MethodRep.java 27 Feb 2002 20:31:10 -0000 1.9
+++ MethodRep.java 27 Mar 2002 16:46:56 -0000 1.10
@@ -98,9 +98,9 @@
if (pmodes != null) {
modes = new short[pmodes.length];
for (int i=0; i < modes.length; i++) {
- if (pmodes[i] != null &&
pmodes[i].equals(ParameterMode.PARAM_MODE_IN)) {
+ if (pmodes[i] != null && pmodes[i].equals(ParameterMode.IN)) {
modes[i] = ParamRep.IN;
- } else if (pmodes[i] != null &&
pmodes[i].equals(ParameterMode.PARAM_MODE_INOUT)) {
+ } else if (pmodes[i] != null &&
pmodes[i].equals(ParameterMode.INOUT)) {
modes[i] = ParamRep.INOUT;
} else {
modes[i] = ParamRep.OUT;
1.19 +4 -4
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
Index: JavaSkelWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JavaSkelWriter.java 19 Mar 2002 20:15:28 -0000 1.18
+++ JavaSkelWriter.java 27 Mar 2002 16:46:56 -0000 1.19
@@ -202,18 +202,18 @@
pw.println(" },");
pw.println(" new javax.xml.rpc.ParameterMode[] {");
if (parameters.returnType != null) {
- pw.println("
javax.xml.rpc.ParameterMode.PARAM_MODE_OUT,");
+ pw.println("
javax.xml.rpc.ParameterMode.OUT,");
} else {
pw.println(" null,");
}
for (int j=0; j < parameters.list.size(); j++) {
Parameter p = (Parameter) parameters.list.get(j);
if (p.getMode() == Parameter.IN)
- pw.println("
javax.xml.rpc.ParameterMode.PARAM_MODE_IN,");
+ pw.println("
javax.xml.rpc.ParameterMode.IN,");
else if (p.getMode() == Parameter.OUT)
- pw.println("
javax.xml.rpc.ParameterMode.PARAM_MODE_INOUT,");
+ pw.println("
javax.xml.rpc.ParameterMode.INOUT,");
else
- pw.println("
javax.xml.rpc.ParameterMode.PARAM_MODE_OUT,");
+ pw.println("
javax.xml.rpc.ParameterMode.OUT,");
}
pw.println(" },");
1.51 +3 -3
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
Index: JavaStubWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- JavaStubWriter.java 21 Mar 2002 16:20:48 -0000 1.50
+++ JavaStubWriter.java 27 Mar 2002 16:46:57 -0000 1.51
@@ -519,15 +519,15 @@
paramQName.getLocalPart() + "\");");
if (p.getMode() == Parameter.IN) {
pw.println(" call.addParameter(" + qnName + ", "
- + typeString + ",
javax.xml.rpc.ParameterMode.PARAM_MODE_IN);");
+ + typeString + ", javax.xml.rpc.ParameterMode.IN);");
}
else if (p.getMode() == Parameter.INOUT) {
pw.println(" call.addParameter(" + qnName + ", "
- + typeString + ",
javax.xml.rpc.ParameterMode.PARAM_MODE_INOUT);");
+ + typeString + ", javax.xml.rpc.ParameterMode.INOUT);");
}
else { // p.getMode() == Parameter.OUT
pw.println(" call.addParameter(" + qnName + ", "
- + typeString + ",
javax.xml.rpc.ParameterMode.PARAM_MODE_OUT);");
+ + typeString + ", javax.xml.rpc.ParameterMode.OUT);");
}
}
// set output type
1.24 +1 -1 xml-axis/java/test/functional/TestTCPTransportSample.java
Index: TestTCPTransportSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestTCPTransportSample.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TestTCPTransportSample.java 19 Feb 2002 17:38:22 -0000 1.23
+++ TestTCPTransportSample.java 27 Mar 2002 16:46:57 -0000 1.24
@@ -116,7 +116,7 @@
call.setTargetEndpointAddress( new URL("tcp://localhost:8088") );
call.setOperationName( new QName("urn:xmltoday-delayed-quotes",
"getQuote") );
- call.addParameter( "symbol", XMLType.XSD_STRING,
ParameterMode.PARAM_MODE_IN );
+ call.addParameter( "symbol", XMLType.XSD_STRING, ParameterMode.IN );
call.setReturnType( XMLType.XSD_FLOAT );
Object ret = call.invoke(
1.12 +1 -1 xml-axis/java/test/outparams/TestOutParams.java
Index: TestOutParams.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/outparams/TestOutParams.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TestOutParams.java 15 Mar 2002 17:15:52 -0000 1.11
+++ TestOutParams.java 27 Mar 2002 16:46:57 -0000 1.12
@@ -77,7 +77,7 @@
client.addParameter(
new QName("", "string"),
XMLType.XSD_STRING,
- javax.xml.rpc.ParameterMode.PARAM_MODE_IN);
+ javax.xml.rpc.ParameterMode.IN);
client.setReturnType(XMLType.XSD_INT);
// Invoke the Axis server
Object ret = client.invoke(serviceURN, "method",
