butek 02/03/21 08:07:43
Modified: java/src/javax/xml/rpc Call.java
java/src/org/apache/axis MessageContext.java
java/src/org/apache/axis/client Call.java Stub.java
java/src/org/apache/axis/transport/http HTTPConstants.java
Log:
JAX-RPC folks have actually accepted my suggestion and put constants
for the standard properties on javax.xml.rpc.Call. They even accepted
most of my suggested names. Since the constants are on javax...Call,
we don't need them on org...Call. I've left them there for the moment, but
deprecated them. After beta2 I'll remove them.
Revision Changes Path
1.9 +18 -0 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Call.java 22 Feb 2002 13:55:39 -0000 1.8
+++ Call.java 21 Mar 2002 16:07:43 -0000 1.9
@@ -82,6 +82,24 @@
*/
public interface Call {
+ // 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 =
+ "javax.xml.rpc.security.auth.password";
+ public static final String SESSION_MAINTAIN_PROPERTY =
+ "javax.xml.rpc.http.session.maintain";
+ public static final String SOAPACTION_URI_PROPERTY =
+ "javax.xml.rpc.soap.http.soapaction.uri";
+ public static final String SOAPACTION_USE_PROPERTY =
+ "javax.xml.rpc.soap.http.soapaction.use";
+ public static final String USERNAME_PROPERTY =
+ "javax.xml.rpc.security.auth.username";
+
/**
* Is the caller required to provide the parameter and return type
* specification? If true, then addParameter and setReturnType MUST be
1.85 +7 -5 xml-axis/java/src/org/apache/axis/MessageContext.java
Index: MessageContext.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/MessageContext.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- MessageContext.java 18 Mar 2002 04:03:35 -0000 1.84
+++ MessageContext.java 21 Mar 2002 16:07:43 -0000 1.85
@@ -56,7 +56,6 @@
package org.apache.axis ;
import org.apache.axis.client.AxisClient;
-import org.apache.axis.client.Call;
import org.apache.axis.encoding.TypeMappingRegistry;
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.session.Session;
@@ -68,7 +67,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.rpc.Call;
+
import javax.xml.rpc.namespace.QName;
+
import java.util.Hashtable;
import java.io.File;
@@ -638,7 +640,7 @@
}
setPassword((String) value);
}
- else if (name.equals(Call.SESSION_PROPERTY)) {
+ else if (name.equals(Call.SESSION_MAINTAIN_PROPERTY)) {
if (!(value instanceof Boolean)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[]
@@ -676,7 +678,7 @@
}
setSOAPActionURI((String) value);
}
- else if (name.equals(Call.ENCODING_STYLE_PROPERTY)) {
+ else if (name.equals(Call.ENCODINGSTYLE_URI_PROPERTY)) {
if (!(value instanceof String)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[]
@@ -708,7 +710,7 @@
else if (name.equals(Call.PASSWORD_PROPERTY)) {
return getPassword();
}
- else if (name.equals(Call.SESSION_PROPERTY)) {
+ else if (name.equals(Call.SESSION_MAINTAIN_PROPERTY)) {
return new Boolean(getMaintainSession());
}
else if (name.equals(Call.OPERATION_STYLE_PROPERTY)) {
@@ -720,7 +722,7 @@
else if (name.equals(Call.SOAPACTION_URI_PROPERTY)) {
return getSOAPActionURI();
}
- else if (name.equals(Call.ENCODING_STYLE_PROPERTY)) {
+ else if (name.equals(Call.ENCODINGSTYLE_URI_PROPERTY)) {
return getEncodingStyle();
}
else if (bag == null) {
1.102 +34 -12 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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Call.java 19 Mar 2002 14:57:47 -0000 1.101
+++ Call.java 21 Mar 2002 16:07:43 -0000 1.102
@@ -121,7 +121,8 @@
* It can be prefilled by a WSDL document (on the constructor to the Service
* object) or you can fill in the data yourself.
* <pre>
- * Standard properties defined by JAX-RPC
+ * Standard properties defined by JAX-RPC (NOTE! These have been deprecated
+ * and will be going away in favor of the javax.xml.rpc.Call constants:
* USERNAME_PROPERTY - User name for authentication
* PASSWORD_PROPERTY - Password for authentication
* SESSION_PROPERTY - Participate in a session with the endpoint?
@@ -186,20 +187,41 @@
public static final String TRANSPORT_PROPERTY= "java.protocol.handler.pkgs";
// Constants for the standard properties
+ /**
+ * @deprecated Use javax.xml.rpc.Call.USERNAME_PROPERTY instead.
+ */
public static final String USERNAME_PROPERTY =
- "javax.xml.rpc.security.auth.username";
+ javax.xml.rpc.Call.USERNAME_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.PASSWORD_PROPERTY instead.
+ */
public static final String PASSWORD_PROPERTY =
- "javax.xml.rpc.security.auth.password";
+ javax.xml.rpc.Call.PASSWORD_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.SESSION_MAINTAIN_PROPERTY instead.
+ */
public static final String SESSION_PROPERTY =
- "javax.xml.rpc.http.session.maintain";
+ javax.xml.rpc.Call.SESSION_MAINTAIN_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.OPERATION_STYLE_PROPERTY instead.
+ */
public static final String OPERATION_STYLE_PROPERTY =
- "javax.xml.rpc.soap.operation.style";
+ javax.xml.rpc.Call.OPERATION_STYLE_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.SOAPACTION_USE_PROPERTY instead.
+ */
public static final String SOAPACTION_USE_PROPERTY =
- "javax.xml.rpc.soap.http.soapaction.use";
+ javax.xml.rpc.Call.SOAPACTION_USE_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.SOAPACTION_URI_PROPERTY instead.
+ */
public static final String SOAPACTION_URI_PROPERTY =
- "javax.xml.rpc.soap.http.soapaction.uri";
+ javax.xml.rpc.Call.SOAPACTION_URI_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.ENCODINGSTYLE_URI_PROPERTY instead.
+ */
public static final String ENCODING_STYLE_PROPERTY =
- "javax.xml.rpc.encodingstyle.namespace.uri";
+ javax.xml.rpc.Call.ENCODINGSTYLE_URI_PROPERTY;
/**
* A Hashtable mapping protocols (Strings) to Transports (classes)
@@ -285,7 +307,7 @@
}
setPassword((String) value);
}
- else if (name.equals(SESSION_PROPERTY)) {
+ else if (name.equals(SESSION_MAINTAIN_PROPERTY)) {
if (!(value instanceof Boolean)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[]
@@ -323,7 +345,7 @@
}
setSOAPActionURI((String) value);
}
- else if (name.equals(ENCODING_STYLE_PROPERTY)) {
+ else if (name.equals(ENCODINGSTYLE_URI_PROPERTY)) {
if (!(value instanceof String)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[]
@@ -362,7 +384,7 @@
else if (name.equals(PASSWORD_PROPERTY)) {
return getPassword();
}
- else if (name.equals(SESSION_PROPERTY)) {
+ else if (name.equals(SESSION_MAINTAIN_PROPERTY)) {
return new Boolean(getMaintainSession());
}
else if (name.equals(OPERATION_STYLE_PROPERTY)) {
@@ -374,7 +396,7 @@
else if (name.equals(SOAPACTION_URI_PROPERTY)) {
return getSOAPActionURI();
}
- else if (name.equals(ENCODING_STYLE_PROPERTY)) {
+ else if (name.equals(ENCODINGSTYLE_URI_PROPERTY)) {
return getEncodingStyle();
}
else if (name.equals(TRANSPORT_NAME)) {
1.6 +22 -10 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Stub.java 20 Feb 2002 16:49:53 -0000 1.5
+++ Stub.java 21 Mar 2002 16:07:43 -0000 1.6
@@ -74,10 +74,22 @@
public abstract class Stub implements javax.xml.rpc.Stub {
// Constants for the standard properties
+ /**
+ * @deprecated Use javax.xml.rpc.Call.USERNAME_PROPERTY instead.
+ */
public static final String USERNAME_PROPERTY = Call.USERNAME_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.PASSWORD_PROPERTY instead.
+ */
public static final String PASSWORD_PROPERTY = Call.PASSWORD_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.ENDPOINT_ADDRESS_PROPERTY instead.
+ */
public static final String ADDRESS_PROPERTY =
- "javax.xml.rpc.service.endpoint.address";
+ Call.ENDPOINT_ADDRESS_PROPERTY;
+ /**
+ * @deprecated Use javax.xml.rpc.Call.SESSION_MAINTAIN_PROPERTY instead.
+ */
public static final String SESSION_PROPERTY = Call.SESSION_PROPERTY;
protected Service service = null;
@@ -131,7 +143,7 @@
if (name == null || value == null) {
throw new IllegalArgumentException();
}
- else if (name.equals(USERNAME_PROPERTY)) {
+ else if (name.equals(Call.USERNAME_PROPERTY)) {
if (!(value instanceof String)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[] {
@@ -139,7 +151,7 @@
}
cachedUsername = (String) value;
}
- else if (name.equals(PASSWORD_PROPERTY)) {
+ else if (name.equals(Call.PASSWORD_PROPERTY)) {
if (!(value instanceof String)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[] {
@@ -147,7 +159,7 @@
}
cachedPassword = (String) value;
}
- else if (name.equals(ADDRESS_PROPERTY)) {
+ else if (name.equals(Call.ENDPOINT_ADDRESS_PROPERTY)) {
if (!(value instanceof String)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[] {
@@ -160,7 +172,7 @@
throw new IllegalArgumentException(mue.getMessage());
}
}
- else if (name.equals(SESSION_PROPERTY)) {
+ else if (name.equals(Call.SESSION_MAINTAIN_PROPERTY)) {
if (!(value instanceof Boolean)) {
throw new IllegalArgumentException(
JavaUtils.getMessage("badProp00", new String[]
@@ -185,16 +197,16 @@
*/
public Object _getProperty(String name) {
if (name != null) {
- if (name.equals(USERNAME_PROPERTY)) {
+ if (name.equals(Call.USERNAME_PROPERTY)) {
return cachedUsername;
}
- else if (name.equals(PASSWORD_PROPERTY)) {
+ else if (name.equals(Call.PASSWORD_PROPERTY)) {
return cachedPassword;
}
- else if (name.equals(ADDRESS_PROPERTY)) {
+ else if (name.equals(Call.ENDPOINT_ADDRESS_PROPERTY)) {
return cachedEndpoint;
}
- else if (name.equals(SESSION_PROPERTY)) {
+ else if (name.equals(Call.SESSION_MAINTAIN_PROPERTY)) {
return maintainSessionSet ? new Boolean(maintainSession) : null;
}
else {
@@ -261,6 +273,6 @@
public void setMaintainSession(boolean session) {
maintainSessionSet = true;
maintainSession = session;
- cachedProperties.put(SESSION_PROPERTY, new Boolean(session));
+ cachedProperties.put(Call.SESSION_MAINTAIN_PROPERTY, new Boolean(session));
} // setmaintainSession
}
1.18 +2 -2
xml-axis/java/src/org/apache/axis/transport/http/HTTPConstants.java
Index: HTTPConstants.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPConstants.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- HTTPConstants.java 11 Feb 2002 13:53:36 -0000 1.17
+++ HTTPConstants.java 21 Mar 2002 16:07:43 -0000 1.18
@@ -109,9 +109,9 @@
public static String MC_HTTP_SERVLETPATHINFO= "transport.http.servletPathInfo";
/**
- * @deprecated Should use org.apache.axis.client.Call.SOAPACTION_URI_PROPERTY
instead.
+ * @deprecated Should use javax.xml.rpc.Call.SOAPACTION_URI_PROPERTY instead.
*/
- public static String MC_HTTP_SOAPACTION =
org.apache.axis.client.Call.SOAPACTION_URI_PROPERTY;
+ public static String MC_HTTP_SOAPACTION =
javax.xml.rpc.Call.SOAPACTION_URI_PROPERTY;
/** HTTP header field values
*/
