dims 02/05/13 07:49:01
Modified: java/src/javax/xml/rpc Call.java Service.java Stub.java
java/src/javax/xml/rpc/encoding Deserializer.java
DeserializerFactory.java SerializerFactory.java
java/src/javax/xml/rpc/handler HandlerRegistry.java
java/src/org/apache/axis/client Call.java Service.java
Stub.java
java/test/wsdl/types DynamicProxyTestCase.java
Log:
Part II - Updating to JAXRPC 0.9 (see javadoc at
http://java.sun.com/xml/downloads/jaxrpc-0_9-javadocs/)
Revision Changes Path
1.12 +1 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Call.java 27 Mar 2002 16:46:56 -0000 1.11
+++ Call.java 13 May 2002 14:49:00 -0000 1.12
@@ -87,8 +87,6 @@
// Constants for the standard properties
public static final String ENCODINGSTYLE_URI_PROPERTY =
"javax.xml.rpc.encodingstyle.namespace.uri";
- public static final String ENDPOINT_ADDRESS_PROPERTY =
- "javax.xml.rpc.service.endpoint.address";
public static final String OPERATION_STYLE_PROPERTY =
"javax.xml.rpc.soap.operation.style";
public static final String PASSWORD_PROPERTY =
@@ -110,7 +108,7 @@
* metadata and the user is not allowed to mess with it. These methods
* throw JAXRPCException if this method returns false.
*/
- public boolean isParameterAndReturnSpecRequired();
+ public boolean isParameterAndReturnSpecRequired(QName operationName);
/**
* Adds a parameter type and mode for a specific operation. Note that the
1.9 +3 -2 xml-axis/java/src/javax/xml/rpc/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/Service.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Service.java 26 Mar 2002 22:34:23 -0000 1.8
+++ Service.java 13 May 2002 14:49:00 -0000 1.9
@@ -168,7 +168,7 @@
* @throws ServiceException - If this Service class does not have access
* to the required WSDL metadata or if an illegal portName is specified.
*/
- public Call[] getCalls() throws ServiceException;
+ public Call[] getCalls(QName portName) throws ServiceException;
/**
* Returns the configured HandlerRegistry instance for this Service
@@ -199,8 +199,9 @@
* Gets the list of qualified names of the ports grouped by this service
*
* @return iterator containing list of qualified names of the ports
+ * @throws ServiceException If this Service class does not have access to the
required WSDL metadata
*/
- public java.util.Iterator getPorts();
+ public java.util.Iterator getPorts() throws ServiceException;
/**
* Gets the TypeMappingRegistry registered with this Service object
1.7 +2 -2 xml-axis/java/src/javax/xml/rpc/Stub.java
Index: Stub.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/Stub.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Stub.java 27 Mar 2002 13:35:56 -0000 1.6
+++ Stub.java 13 May 2002 14:49:00 -0000 1.7
@@ -73,8 +73,8 @@
/**
* Target service endpoint address.
*/
- public static final String ADDRESS_PROPERTY =
- Call.ENDPOINT_ADDRESS_PROPERTY;
+ public static final String ENDPOINT_ADDRESS_PROPERTY =
+ "javax.xml.rpc.service.endpoint.address";
/**
* This boolean property is used by a service client to indicate
* whether or not it wants to participate in a session with a service
1.7 +1 -1 xml-axis/java/src/javax/xml/rpc/encoding/Deserializer.java
Index: Deserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/Deserializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Deserializer.java 15 Jan 2002 15:56:30 -0000 1.6
+++ Deserializer.java 13 May 2002 14:49:00 -0000 1.7
@@ -63,7 +63,7 @@
*
* @version 0.6
*/
-public interface Deserializer {
+public interface Deserializer extends java.io.Serializable {
public String getMechanismType();
}
1.7 +4 -5
xml-axis/java/src/javax/xml/rpc/encoding/DeserializerFactory.java
Index: DeserializerFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/DeserializerFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeserializerFactory.java 15 Jan 2002 15:56:30 -0000 1.6
+++ DeserializerFactory.java 13 May 2002 14:49:00 -0000 1.7
@@ -68,16 +68,15 @@
/**
* Returns a Deserializer for the specified XML processing mechanism type.
*
- * @param mechanismType - XML processing mechanism type [TBD: definition of
valid constants]
+ * @param mechanismType XML processing mechanism type [TBD: definition of valid
constants]
*
* @return Returns a Deserializer for the specified XML processing mechanism
type.
*
- * @throws JAXRPCException - If DeserializerFactory does not support
+ * @throws JAXRPCException If DeserializerFactory does not support
* the specified XML processing mechanism
- * java.lang.IllegalArgumentException - If an invalid mechanism type is
specified.
+ * java.lang.IllegalArgumentException If an invalid mechanism type is specified.
*/
- public Deserializer getDeserializerAs(String mechanismType)
- throws JAXRPCException;
+ public Deserializer getDeserializerAs(String mechanismType);
/**
* Returns a list of all XML processing mechanism types supported by this
DeserializerFactory.
1.7 +3 -3 xml-axis/java/src/javax/xml/rpc/encoding/SerializerFactory.java
Index: SerializerFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/SerializerFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SerializerFactory.java 15 Jan 2002 15:56:30 -0000 1.6
+++ SerializerFactory.java 13 May 2002 14:49:00 -0000 1.7
@@ -74,10 +74,10 @@
*
* @return a Serializer for the specified XML processing mechanism type.
*
- * @throws JAXRPCException
+ * @throws JAXRPCException If SerializerFactory does not support the specified
XML processing mechanism
+ * @throws java.lang.IllegalArgumentException If an invalid mechanism type is
specified.
*/
- public Serializer getSerializerAs(String mechanismType)
- throws JAXRPCException;
+ public Serializer getSerializerAs(String mechanismType);
/**
* Returns a list of all XML processing mechanism types supported by this
SerializerFactory.
1.4 +1 -1 xml-axis/java/src/javax/xml/rpc/handler/HandlerRegistry.java
Index: HandlerRegistry.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/handler/HandlerRegistry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HandlerRegistry.java 13 May 2002 13:11:33 -0000 1.3
+++ HandlerRegistry.java 13 May 2002 14:49:00 -0000 1.4
@@ -89,6 +89,6 @@
* @throws java.lang.IllegalArgumentException If an invalid
* portName is specified
*/
- public abstract void setRequestHandlerChain(
+ public abstract void setHandlerChain(
QName portName, java.util.List chain);
}
1.121 +2 -2 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.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- Call.java 13 May 2002 13:11:33 -0000 1.120
+++ Call.java 13 May 2002 14:49:00 -0000 1.121
@@ -308,7 +308,7 @@
}
setEncodingStyle((String) value);
}
- else if (name.equals(ENDPOINT_ADDRESS_PROPERTY)) {
+ else if (name.equals(Stub.ENDPOINT_ADDRESS_PROPERTY)) {
if (!(value instanceof String)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[]
@@ -642,7 +642,7 @@
* data and the user is not allowed to mess with it. These methods throw
JAXRPCException if
* this method returns false.
*/
- public boolean isParameterAndReturnSpecRequired() {
+ public boolean isParameterAndReturnSpecRequired(QName operationName) {
return parmAndRetReq;
} // isParameterAndReturnSpecRequired
1.51 +1 -1 xml-axis/java/src/org/apache/axis/client/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Service.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Service.java 1 May 2002 01:51:10 -0000 1.50
+++ Service.java 13 May 2002 14:49:01 -0000 1.51
@@ -467,7 +467,7 @@
* @throws ServiceException - If this Service class does not have access
* to the required WSDL metadata or if an illegal portName is specified.
*/
- public javax.xml.rpc.Call[] getCalls() throws ServiceException {
+ public javax.xml.rpc.Call[] getCalls(QName portName) throws ServiceException {
if (wsdlLocation == null) {
throw new ServiceException();
}
1.9 +2 -2 xml-axis/java/src/org/apache/axis/client/Stub.java
Index: Stub.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Stub.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Stub.java 27 Mar 2002 13:35:56 -0000 1.8
+++ Stub.java 13 May 2002 14:49:01 -0000 1.9
@@ -140,7 +140,7 @@
}
cachedPassword = (String) value;
}
- else if (name.equals(Call.ENDPOINT_ADDRESS_PROPERTY)) {
+ else if (name.equals(Stub.ENDPOINT_ADDRESS_PROPERTY)) {
if (!(value instanceof String)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[] {
@@ -184,7 +184,7 @@
else if (name.equals(Call.PASSWORD_PROPERTY)) {
return cachedPassword;
}
- else if (name.equals(Call.ENDPOINT_ADDRESS_PROPERTY)) {
+ else if (name.equals(Stub.ENDPOINT_ADDRESS_PROPERTY)) {
return cachedEndpoint;
}
else if (name.equals(Call.SESSION_MAINTAIN_PROPERTY)) {
1.3 +1 -1 xml-axis/java/test/wsdl/types/DynamicProxyTestCase.java
Index: DynamicProxyTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/types/DynamicProxyTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynamicProxyTestCase.java 19 Apr 2002 13:41:54 -0000 1.2
+++ DynamicProxyTestCase.java 13 May 2002 14:49:01 -0000 1.3
@@ -77,7 +77,7 @@
try {
Service service = ServiceFactory.newInstance().createService(null);
Stub binding = (Stub) service.getPort(TypeTest.class);
- binding._setProperty(Call.ENDPOINT_ADDRESS_PROPERTY,
+ binding._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:8080/axis/services/TypeTest";);
return (TypeTest) binding;
