dims 02/05/13 06:11:34
Modified: java/src/javax/xml/rpc/encoding TypeMapping.java
TypeMappingRegistry.java
java/src/javax/xml/rpc/handler GenericHandler.java
Handler.java HandlerChain.java HandlerRegistry.java
java/src/javax/xml/rpc/handler/soap SOAPMessageContext.java
java/src/javax/xml/rpc/namespace QName.java
java/src/javax/xml/soap Detail.java DetailEntry.java
SOAPBody.java SOAPBodyElement.java SOAPElement.java
SOAPFault.java
java/src/org/apache/axis/client Call.java
java/src/org/apache/axis/deployment/wsdd WSDDDeployment.java
WSDDService.java
java/src/org/apache/axis/encoding
DefaultTypeMappingImpl.java
TypeMappingDelegate.java TypeMappingImpl.java
TypeMappingRegistryImpl.java
java/src/org/apache/axis/utils CLArgsParser.java
java/test/encoding TestAttributes.java TestBeanDeser.java
TestDeser.java TestRoundTrip.java TestSer.java
Added: java/src/javax/xml/rpc/soap SOAPFaultException.java
Removed: java/src/javax/xml/rpc/soap SOAPFault.java
SOAPHeaderFault.java
Log:
- Updating to JAXRPC 0.9 (see javadoc at
http://java.sun.com/xml/downloads/jaxrpc-0_9-javadocs/)
- fix a few other javadoc problems.
Revision Changes Path
1.10 +2 -2 xml-axis/java/src/javax/xml/rpc/encoding/TypeMapping.java
Index: TypeMapping.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/TypeMapping.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TypeMapping.java 27 Mar 2002 20:24:06 -0000 1.9
+++ TypeMapping.java 13 May 2002 13:11:33 -0000 1.10
@@ -78,7 +78,7 @@
* @return String[] of namespace URIs for the supported encoding
* styles and XML schema namespaces.
*/
- public String[] getSupportedNamespaces();
+ public String[] getSupportedEncodings();
/**
* Sets the list of encoding styles supported by this
@@ -86,7 +86,7 @@
*
* @param namespaceURIs String[] of namespace URI's
*/
- public void setSupportedNamespaces(String[] namespaceURIs);
+ public void setSupportedEncodings(String[] namespaceURIs);
/**
* isRegistered returns true if the [javaType, xmlType]
1.12 +1 -1
xml-axis/java/src/javax/xml/rpc/encoding/TypeMappingRegistry.java
Index: TypeMappingRegistry.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/TypeMappingRegistry.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TypeMappingRegistry.java 27 Mar 2002 20:24:06 -0000 1.11
+++ TypeMappingRegistry.java 13 May 2002 13:11:33 -0000 1.12
@@ -157,7 +157,7 @@
*
* @return String[] containing names of all registered namespace URIs
*/
- public String[] getRegisteredNamespaces();
+ public String[] getRegisteredEncodingStyleURIs();
/**
1.3 +2 -1 xml-axis/java/src/javax/xml/rpc/handler/GenericHandler.java
Index: GenericHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/handler/GenericHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GenericHandler.java 10 May 2002 17:15:37 -0000 1.2
+++ GenericHandler.java 13 May 2002 13:11:33 -0000 1.3
@@ -109,7 +109,8 @@
*
* @return true/false
*/
- public void handleFault(MessageContext context) {
+ public boolean handleFault(MessageContext context) {
+ return true;
}
/**
1.3 +1 -1 xml-axis/java/src/javax/xml/rpc/handler/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/handler/Handler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Handler.java 28 Mar 2002 20:29:48 -0000 1.2
+++ Handler.java 13 May 2002 13:11:33 -0000 1.3
@@ -109,7 +109,7 @@
* message.
* @throws JAXRPCException - if any handler specific runtime error
*/
- public void handleFault(MessageContext context);
+ public boolean handleFault(MessageContext context);
/**
* The init method to enable the Handler instance to initialize itself. The
1.3 +17 -2 xml-axis/java/src/javax/xml/rpc/handler/HandlerChain.java
Index: HandlerChain.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/handler/HandlerChain.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HandlerChain.java 28 Mar 2002 20:29:48 -0000 1.2
+++ HandlerChain.java 13 May 2002 13:11:33 -0000 1.3
@@ -76,7 +76,7 @@
*
* @throws JAXRPCException - if any processing error happens
*/
- public void handleRequest(MessageContext context);
+ public boolean handleRequest(MessageContext context);
/**
* The handleResponse method initiates the response processing for this
@@ -87,7 +87,22 @@
*
* @throws JAXRPCException - if any processing error happens
*/
- public void handleResponse(MessageContext context);
+ public boolean handleResponse(MessageContext context);
+
+ /**
+ * The handleFault method initiates the SOAP fault processing
+ * for this handler chain.
+ *
+ * @param context - MessageContext parameter provides access to the SOAP
+ * message.
+ *
+ * @returns Returns true if all handlers in chain have been processed.
+ * Returns false if a handler in the chain returned
+ * false from its handleFault method.
+ *
+ * @throws JAXRPCException - if any processing error happens
+ */
+ public boolean handleFault(MessageContext context);
/**
* Initializes the configuration for a HandlerChain.
1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HandlerRegistry.java 28 Mar 2002 20:29:48 -0000 1.2
+++ HandlerRegistry.java 13 May 2002 13:11:33 -0000 1.3
@@ -74,7 +74,7 @@
* @return HandlerChain Returns the registered HandlerChain;
* @throws java.lang.IllegalArgumentException If an invalid portName is
specified
*/
- public HandlerChain getHandlerChain(QName portName);
+ public java.util.List getHandlerChain(QName portName);
/**
* Sets the handler chain for the specified service endpoint.
@@ -90,5 +90,5 @@
* portName is specified
*/
public abstract void setRequestHandlerChain(
- QName portName, HandlerChain chain);
+ QName portName, java.util.List chain);
}
1.3 +13 -0
xml-axis/java/src/javax/xml/rpc/handler/soap/SOAPMessageContext.java
Index: SOAPMessageContext.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/javax/xml/rpc/handler/soap/SOAPMessageContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SOAPMessageContext.java 28 Mar 2002 20:37:12 -0000 1.2
+++ SOAPMessageContext.java 13 May 2002 13:11:33 -0000 1.3
@@ -86,4 +86,17 @@
* operation is not supported
*/
public abstract void setMessage(SOAPMessage message);
+
+ /**
+ * Gets the SOAP actor roles associated with an execution of the HandlerChain
and its contained Handler instances.
+ * Note that SOAP actor roles apply to the SOAP node and are managed using
HandlerChain.setRoles and
+ * HandlerChain.getRoles. Handler instances in the HandlerChain use this
information about the SOAP actor roles
+ * to process the SOAP header blocks. Note that the SOAP actor roles are
invariant during the processing of
+ * SOAP message through the HandlerChain.
+ *
+ * @return Array of URIs for SOAP actor roles
+ * @see javax.xml.rpc.handler.HandlerChain#setRoles(java.lang.String[])
HandlerChain.setRoles(java.lang.String[])
+ * @see javax.xml.rpc.handler.HandlerChain#getRoles() HandlerChain.getRoles()
+ */
+ public abstract String[] getRoles();
}
1.14 +30 -0 xml-axis/java/src/javax/xml/rpc/namespace/QName.java
Index: QName.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/namespace/QName.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- QName.java 3 May 2002 20:22:15 -0000 1.13
+++ QName.java 13 May 2002 13:11:33 -0000 1.14
@@ -168,6 +168,36 @@
}
/**
+ * Returns a QName holding the value of the specified String. The string must
be in the form returned by the
+ * QName.toString() method, i.e. "{namespaceURI}localPart", with the
"{namespaceURI}" part being optional.
+ * This method doesn't do a full validation of the resulting QName. In
particular, it doesn't check that the
+ * resulting namespace URI is a legal URI (per RFC 2396 and RFC 2732), nor that
the resulting local part is a
+ * legal NCName per the XML Namespaces specification.
+ *
+ * @param s the string to be parsed
+ * @throws java.lang.IllegalArgumentException If the specified String cannot be
parsed as a QName
+ * @return QName corresponding to the given String
+ */
+ public static QName valueOf(String s) {
+ if ((s == null) || s.equals("")) {
+ throw new IllegalArgumentException("invalid QName literal");
+ }
+ if (s.charAt(0) == '{') {
+ int i = s.indexOf('}');
+ if (i == -1) {
+ throw new IllegalArgumentException("invalid QName literal");
+ }
+ if (i == s.length() - 1) {
+ throw new IllegalArgumentException("invalid QName literal");
+ } else {
+ return new QName(s.substring(1, i), s.substring(i + 1));
+ }
+ } else {
+ return new QName(s);
+ }
+ }
+
+ /**
* Returns a hash code value for this QName object.
*
* @return a hash code value for this Qname object
1.1 xml-axis/java/src/javax/xml/rpc/soap/SOAPFaultException.java
Index: SOAPFaultException.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Axis" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package javax.xml.rpc.soap;
import javax.xml.rpc.namespace.QName;
import javax.xml.soap.Detail;
/**
* SOAPFaultException exception class is used for the mapping of the
* SOAP faults. If the use attribute in the soap:fault is
* literal, the soap:fault maps to the SOAPFaultException exception.
* This class extends the exception class java.lang.Exception
* and is declared as a checked exception in the service
* definition interface.
*/
public class SOAPFaultException extends RuntimeException {
/**
* Constructor for SOAPFaultException
* <p>
* @param faultcode Qualified name of the faultcode
* @param faultstring The faultstring element of the SOAP fault
* @param faultactor faultactor element of the SOAP fault
* @param detail detail element of the SOAP fault
*/
public SOAPFaultException(QName faultcode, String faultstring, String faultactor,
Detail detail) {
super(faultstring);
this.faultcode = faultcode;
this.faultstring = faultstring;
this.faultactor = faultactor;
this.detail = detail;
}
/**
* Gets the faultcode element.
* @return Qualified name of the faultcode element
*/
public QName getFaultCode() {
return faultcode;
}
/**
* Gets the faultstring element.
* @return faultstring element of the SOAP fault
*/
public String getFaultString() {
return faultstring;
}
/**
* Gets the faultactor element.
* @return faultactor element of the SOAP fault
*/
public String getFaultActor() {
return faultactor;
}
/**
* Gets the detail element.
* @return detail element of the SOAP fault
*/
public Detail getDetail() {
return detail;
}
/** Qualified name of the faultcode. */
private QName faultcode;
/** The faultstring element of the SOAP fault */
private String faultstring;
/** faultactor element of the SOAP fault */
private String faultactor;
/** detail element of the SOAP fault */
private Detail detail;
}
1.2 +3 -3 xml-axis/java/src/javax/xml/soap/Detail.java
Index: Detail.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/Detail.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Detail.java 25 Jan 2002 16:30:07 -0000 1.1
+++ Detail.java 13 May 2002 13:11:33 -0000 1.2
@@ -61,15 +61,15 @@
* objects give detailed error information that is application-specific and
* related to the <code>SOAPBody</code> object that contains it.
* <P>
- * A <code>Detail</code> object, which is part of a <code>SOAPFault</code>
- * object, can be retrieved using the method <code>SOAPFault.getDetail</code>.
+ * A <code>Detail</code> object, which is part of a <code>SOAPFaultException</code>
+ * object, can be retrieved using the method
<code>SOAPFaultException.getDetail</code>.
* The <code>Detail</code> interface provides two methods. One creates a new
* <code>DetailEntry</code> object and also automatically adds it to
* the <code>Detail</code> object. The second method gets a list of the
* <code>DetailEntry</code> objects contained in a <code>Detail</code>
* object.
* <P>
- * The following code fragment, in which <i>sf</i> is a <code>SOAPFault</code>
+ * The following code fragment, in which <i>sf</i> is a
<code>SOAPFaultException</code>
* object, gets its <code>Detail</code> object (<i>d</i>), adds a new
* <code>DetailEntry</code> object to <i>d</i>, and then gets a list of all the
* <code>DetailEntry</code> objects in <i>d</i>. The code also creates a
1.2 +1 -1 xml-axis/java/src/javax/xml/soap/DetailEntry.java
Index: DetailEntry.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/DetailEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DetailEntry.java 25 Jan 2002 16:30:07 -0000 1.1
+++ DetailEntry.java 13 May 2002 13:11:33 -0000 1.2
@@ -56,7 +56,7 @@
/**
* The content for a <code>Detail</code> object, giving details for
- * a <code>SOAPFault</code> object. A <code>DetailEntry</code> object,
+ * a <code>SOAPFaultException</code> object. A <code>DetailEntry</code> object,
* which carries information about errors related to the <code>SOAPBody</code>
* object that contains it, is application-specific.
* <P>
1.2 +8 -8 xml-axis/java/src/javax/xml/soap/SOAPBody.java
Index: SOAPBody.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/SOAPBody.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPBody.java 25 Jan 2002 16:30:07 -0000 1.1
+++ SOAPBody.java 13 May 2002 13:11:33 -0000 1.2
@@ -61,33 +61,33 @@
* <P>
* A <code>SOAPBody</code> object contains <code>SOAPBodyElement</code>
* objects, which have the content for the SOAP body.
- * A <code>SOAPFault</code> object, which carries status and/or
+ * A <code>SOAPFaultException</code> object, which carries status and/or
* error information, is an example of a <code>SOAPBodyElement</code> object.
- * @see SOAPFault SOAPFault
+ * @see javax.xml.rpc.soap.SOAPFaultException SOAPFaultException
*/
public interface SOAPBody extends SOAPElement {
/**
- * Creates a new <code>SOAPFault</code> object and adds it to
+ * Creates a new <code>SOAPFaultException</code> object and adds it to
* this <code>SOAPBody</code> object.
- * @return the new <code>SOAPFault</code> object
+ * @return the new <code>SOAPFaultException</code> object
* @throws SOAPException if there is a SOAP error
*/
public abstract SOAPFault addFault() throws SOAPException;
/**
- * Indicates whether a <code>SOAPFault</code> object exists in
+ * Indicates whether a <code>SOAPFaultException</code> object exists in
* this <code>SOAPBody</code> object.
- * @return <code>true</code> if a <code>SOAPFault</code> object exists in
+ * @return <code>true</code> if a <code>SOAPFaultException</code> object exists
in
* this <code>SOAPBody</code> object; <code>false</code>
* otherwise
*/
public abstract boolean hasFault();
/**
- * Returns the <code>SOAPFault</code> object in this <code>SOAPBody</code>
+ * Returns the <code>SOAPFaultException</code> object in this
<code>SOAPBody</code>
* object.
- * @return the <code>SOAPFault</code> object in this <code>SOAPBody</code>
+ * @return the <code>SOAPFaultException</code> object in this
<code>SOAPBody</code>
* object
*/
public abstract SOAPFault getFault();
1.2 +1 -1 xml-axis/java/src/javax/xml/soap/SOAPBodyElement.java
Index: SOAPBodyElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/SOAPBodyElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPBodyElement.java 25 Jan 2002 16:30:07 -0000 1.1
+++ SOAPBodyElement.java 13 May 2002 13:11:33 -0000 1.2
@@ -56,7 +56,7 @@
/**
* A <code>SOAPBodyElement</code> object represents the contents in
- * a <code>SOAPBody</code> object. The <code>SOAPFault</code> interface
+ * a <code>SOAPBody</code> object. The <code>SOAPFaultException</code> interface
* is a <code>SOAPBodyElement</code> object that has been defined.
* <P>
* A new <code>SOAPBodyElement</code> object can be created and added
1.2 +1 -1 xml-axis/java/src/javax/xml/soap/SOAPElement.java
Index: SOAPElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/SOAPElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPElement.java 25 Jan 2002 16:30:07 -0000 1.1
+++ SOAPElement.java 13 May 2002 13:11:33 -0000 1.2
@@ -61,7 +61,7 @@
* <code>SOAPBody</code> object, the contents in a <code>SOAPHeader</code>
* object, the content that can follow the <code>SOAPBody</code> object in a
* <code>SOAPEnvelope</code> object, or what can follow the detail element
- * in a <code>SOAPFault</code> object. It is
+ * in a <code>SOAPFaultException</code> object. It is
* the base class for all of the classes that represent the SOAP objects as
* defined in the SOAP specification.
*/
1.2 +13 -13 xml-axis/java/src/javax/xml/soap/SOAPFault.java
Index: SOAPFault.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/SOAPFault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPFault.java 25 Jan 2002 16:30:07 -0000 1.1
+++ SOAPFault.java 13 May 2002 13:11:33 -0000 1.2
@@ -63,9 +63,9 @@
* in processing, such as the inability to communicate with an
* upstream server.
* <P>
- * The <CODE>SOAPFault</CODE> interface provides methods for
+ * The <CODE>SOAPFaultException</CODE> interface provides methods for
* retrieving the information contained in a <CODE>
- * SOAPFault</CODE> object and for setting the fault code, the
+ * SOAPFaultException</CODE> object and for setting the fault code, the
* fault actor, and a string describing the fault. A fault code is
* one of the codes defined in the SOAP 1.1 specification that
* describe the fault. An actor is an intermediate recipient to
@@ -77,7 +77,7 @@
public interface SOAPFault extends SOAPBodyElement {
/**
- * Sets this <CODE>SOAPFault</CODE> object with the given
+ * Sets this <CODE>SOAPFaultException</CODE> object with the given
* fault code.
*
* <P>Fault codes, which given information about the fault,
@@ -92,21 +92,21 @@
public abstract void setFaultCode(String faultCode) throws SOAPException;
/**
- * Gets the fault code for this <CODE>SOAPFault</CODE>
+ * Gets the fault code for this <CODE>SOAPFaultException</CODE>
* object.
* @return a <CODE>String</CODE> with the fault code
*/
public abstract String getFaultCode();
/**
- * Sets this <CODE>SOAPFault</CODE> object with the given
+ * Sets this <CODE>SOAPFaultException</CODE> object with the given
* fault actor.
*
* <P>The fault actor is the recipient in the message path who
* caused the fault to happen.</P>
* @param faultActor a <CODE>String</CODE>
* identifying the actor that caused this <CODE>
- * SOAPFault</CODE> object
+ * SOAPFaultException</CODE> object
* @throws SOAPException if there was an error in
* adding the <CODE>faultActor</CODE> to the underlying XML
* tree.
@@ -114,16 +114,16 @@
public abstract void setFaultActor(String faultActor) throws SOAPException;
/**
- * Gets the fault actor for this <CODE>SOAPFault</CODE>
+ * Gets the fault actor for this <CODE>SOAPFaultException</CODE>
* object.
* @return a <CODE>String</CODE> giving the actor in the message
- * path that caused this <CODE>SOAPFault</CODE> object
+ * path that caused this <CODE>SOAPFaultException</CODE> object
* @see #setFaultActor(java.lang.String) setFaultActor(java.lang.String)
*/
public abstract String getFaultActor();
/**
- * Sets the fault string for this <CODE>SOAPFault</CODE>
+ * Sets the fault string for this <CODE>SOAPFaultException</CODE>
* object to the given string.
*
* @param faultString a <CODE>String</CODE>
@@ -137,7 +137,7 @@
throws SOAPException;
/**
- * Gets the fault string for this <CODE>SOAPFault</CODE>
+ * Gets the fault string for this <CODE>SOAPFaultException</CODE>
* object.
* @return a <CODE>String</CODE> giving an explanation of the
* fault
@@ -145,7 +145,7 @@
public abstract String getFaultString();
/**
- * Returns the detail element for this <CODE>SOAPFault</CODE>
+ * Returns the detail element for this <CODE>SOAPFaultException</CODE>
* object.
*
* <P>A <CODE>Detail</CODE> object carries
@@ -158,7 +158,7 @@
/**
* Creates a <CODE>Detail</CODE> object and sets it as the
- * <CODE>Detail</CODE> object for this <CODE>SOAPFault</CODE>
+ * <CODE>Detail</CODE> object for this <CODE>SOAPFaultException</CODE>
* object.
*
* <P>It is illegal to add a detail when the fault already
@@ -166,7 +166,7 @@
* only after the existing detail has been removed.</P>
* @return the new <CODE>Detail</CODE> object
* @throws SOAPException if this
- * <CODE>SOAPFault</CODE> object already contains a valid
+ * <CODE>SOAPFaultException</CODE> object already contains a valid
* <CODE>Detail</CODE> object
*/
public abstract Detail addDetail() throws SOAPException;
1.120 +1 -1 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.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- Call.java 9 May 2002 18:25:17 -0000 1.119
+++ Call.java 13 May 2002 13:11:33 -0000 1.120
@@ -1497,7 +1497,7 @@
TypeMapping defaultTM = (TypeMapping) tmr.getDefaultTypeMapping();
if (tm == null || tm == defaultTM ) {
tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedNamespaces(new String[] {encodingStyle});
+ tm.setSupportedEncodings(new String[] {encodingStyle});
tmr.register(encodingStyle, tm);
}
return tm;
1.32 +1 -1
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java
Index: WSDDDeployment.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- WSDDDeployment.java 15 Apr 2002 02:35:57 -0000 1.31
+++ WSDDDeployment.java 13 May 2002 13:11:33 -0000 1.32
@@ -311,7 +311,7 @@
TypeMapping df = (TypeMapping) tmr.getDefaultTypeMapping();
if (tm == null || tm == df) {
tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedNamespaces(new String[] {encodingStyle});
+ tm.setSupportedEncodings(new String[] {encodingStyle});
tmr.register(encodingStyle, tm);
}
1.63 +1 -1
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
Index: WSDDService.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- WSDDService.java 2 May 2002 20:23:45 -0000 1.62
+++ WSDDService.java 13 May 2002 13:11:34 -0000 1.63
@@ -434,7 +434,7 @@
TypeMapping df = (TypeMapping) tmr.getDefaultTypeMapping();
if (tm == null || tm == df) {
tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedNamespaces(new String[] {encodingStyle});
+ tm.setSupportedEncodings(new String[] {encodingStyle});
tmr.register(encodingStyle, tm);
}
1.24 +1 -1
xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
Index: DefaultTypeMappingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DefaultTypeMappingImpl.java 29 Apr 2002 17:04:48 -0000 1.23
+++ DefaultTypeMappingImpl.java 13 May 2002 13:11:34 -0000 1.24
@@ -406,6 +406,6 @@
throws JAXRPCException {
throw new JAXRPCException();
}
- public void setSupportedNamespaces(String[] namespaceURIs) {
+ public void setSupportedEncodings(String[] namespaceURIs) {
}
}
1.3 +4 -4
xml-axis/java/src/org/apache/axis/encoding/TypeMappingDelegate.java
Index: TypeMappingDelegate.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingDelegate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TypeMappingDelegate.java 4 Apr 2002 22:30:24 -0000 1.2
+++ TypeMappingDelegate.java 13 May 2002 13:11:34 -0000 1.3
@@ -85,15 +85,15 @@
// Delegate or throw an exception
- public String[] getSupportedNamespaces() {
+ public String[] getSupportedEncodings() {
if (delegate != null)
- return delegate.getSupportedNamespaces();
+ return delegate.getSupportedEncodings();
return null;
}
- public void setSupportedNamespaces(String[] namespaceURIs) {
+ public void setSupportedEncodings(String[] namespaceURIs) {
if (delegate != null)
- delegate.setSupportedNamespaces(namespaceURIs);
+ delegate.setSupportedEncodings(namespaceURIs);
}
public void register(Class javaType, QName xmlType,
1.9 +2 -2 xml-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java
Index: TypeMappingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TypeMappingImpl.java 27 Mar 2002 17:53:06 -0000 1.8
+++ TypeMappingImpl.java 13 May 2002 13:11:34 -0000 1.9
@@ -163,7 +163,7 @@
* @return String[] of namespace URIs for the supported encoding
* styles and XML schema namespaces.
*/
- public String[] getSupportedNamespaces() {
+ public String[] getSupportedEncodings() {
return (String[]) namespaces.toArray();
}
@@ -174,7 +174,7 @@
*
* @param namespaceURIs String[] of namespace URI's
*/
- public void setSupportedNamespaces(String[] namespaceURIs) {
+ public void setSupportedEncodings(String[] namespaceURIs) {
namespaces.clear();
for (int i =0; i< namespaceURIs.length; i++) {
if (!namespaces.contains(namespaceURIs[i])) {
1.9 +4 -4
xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java
Index: TypeMappingRegistryImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TypeMappingRegistryImpl.java 15 Apr 2002 02:35:57 -0000 1.8
+++ TypeMappingRegistryImpl.java 13 May 2002 13:11:34 -0000 1.9
@@ -193,7 +193,7 @@
if (secondaryTMR == null || secondaryTMR == this) {
return;
}
- String[] keys = secondaryTMR.getRegisteredNamespaces();
+ String[] keys = secondaryTMR.getRegisteredEncodingStyleURIs();
// String[] keys = null;
if (keys != null) {
for(int i=0; i < keys.length; i++) {
@@ -202,7 +202,7 @@
TypeMapping tm = (TypeMapping) getTypeMapping(nsURI);
if (tm == null || tm == getDefaultTypeMapping() ) {
tm = (TypeMapping) createTypeMapping();
- tm.setSupportedNamespaces(new String[] { nsURI });
+ tm.setSupportedEncodings(new String[] { nsURI });
register(nsURI, tm);
}
@@ -335,7 +335,7 @@
*/
public boolean removeTypeMapping(
javax.xml.rpc.encoding.TypeMapping mapping) {
- String[] ns = getRegisteredNamespaces();
+ String[] ns = getRegisteredEncodingStyleURIs();
boolean rc = false;
for (int i=0; i < ns.length; i++) {
if (getTypeMapping(ns[i]) == mapping) {
@@ -362,7 +362,7 @@
*
* @return String[] containing names of all registered namespace URIs
*/
- public String[] getRegisteredNamespaces() {
+ public String[] getRegisteredEncodingStyleURIs() {
java.util.Set s = mapTM.keySet();
if (s != null) {
String[] rc = new String[s.size()];
1.2 +3 -3 xml-axis/java/src/org/apache/axis/utils/CLArgsParser.java
Index: CLArgsParser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/CLArgsParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CLArgsParser.java 19 Mar 2002 15:42:01 -0000 1.1
+++ CLArgsParser.java 13 May 2002 13:11:34 -0000 1.2
@@ -91,7 +91,7 @@
* <code>null</code> if no command line option is found.
*
* @param id the command line option id
- * @return the {@link CLOption) with the specified id, or
+ * @return the {@link CLOption} with the specified id, or
* <code>null</code> if no CLOption is found.
* @see CLOption
*/
@@ -105,7 +105,7 @@
* <code>null</code> if no command line option is found.
*
* @param name the command line option name
- * @return the {@link CLOption) with the specified name, or
+ * @return the {@link CLOption} with the specified name, or
* <code>null</code> if no CLOption is found.
* @see CLOption
*/
@@ -248,7 +248,7 @@
continue;
}
- final int[] incompatible = descriptor.getIncompatble();
+ final int[] incompatible = descriptor.getIncompatible();
checkIncompatible( arguments, incompatible, i );
}
1.7 +2 -2 xml-axis/java/test/encoding/TestAttributes.java
Index: TestAttributes.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestAttributes.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestAttributes.java 23 Apr 2002 03:54:26 -0000 1.6
+++ TestAttributes.java 13 May 2002 13:11:34 -0000 1.7
@@ -75,7 +75,7 @@
TypeMappingRegistry reg = context.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) reg.createTypeMapping();
// The "" namespace is literal (no encoding).
- tm.setSupportedNamespaces(new String[] {Constants.URI_CURRENT_SOAP_ENC});
+ tm.setSupportedEncodings(new String[] {Constants.URI_CURRENT_SOAP_ENC});
reg.register(Constants.URI_CURRENT_SOAP_ENC, tm);
QName beanQName = new QName("typeNS", "TheBean");
@@ -131,7 +131,7 @@
TypeMappingRegistry reg = context.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) reg.createTypeMapping();
// The "" namespace is literal (no encoding).
- tm.setSupportedNamespaces(new String[] {Constants.URI_CURRENT_SOAP_ENC});
+ tm.setSupportedEncodings(new String[] {Constants.URI_CURRENT_SOAP_ENC});
reg.register(Constants.URI_CURRENT_SOAP_ENC, tm);
QName beanQName = new QName("typeNS", "Bean");
1.3 +1 -1 xml-axis/java/test/encoding/TestBeanDeser.java
Index: TestBeanDeser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestBeanDeser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestBeanDeser.java 20 Mar 2002 15:16:35 -0000 1.2
+++ TestBeanDeser.java 13 May 2002 13:11:34 -0000 1.3
@@ -54,7 +54,7 @@
TypeMappingRegistry tmr = server.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedNamespaces(new String[]{Constants.URI_CURRENT_SOAP_ENC});
+ tm.setSupportedEncodings(new String[]{Constants.URI_CURRENT_SOAP_ENC});
tmr.register(Constants.URI_CURRENT_SOAP_ENC, tm);
tm.register(test.encoding.RETURN.class,
new QName("urn:test.encoding", "RETURN"),
1.32 +1 -1 xml-axis/java/test/encoding/TestDeser.java
Index: TestDeser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TestDeser.java 9 Apr 2002 18:51:41 -0000 1.31
+++ TestDeser.java 13 May 2002 13:11:34 -0000 1.32
@@ -62,7 +62,7 @@
TypeMappingRegistry tmr = server.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedNamespaces(new String[] {Constants.URI_CURRENT_SOAP_ENC});
+ tm.setSupportedEncodings(new String[] {Constants.URI_CURRENT_SOAP_ENC});
tmr.register(Constants.URI_CURRENT_SOAP_ENC, tm);
tm.register(java.lang.String[].class,
new QName("urn:me", "ArrayOfString"),
1.2 +1 -1 xml-axis/java/test/encoding/TestRoundTrip.java
Index: TestRoundTrip.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestRoundTrip.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestRoundTrip.java 21 Mar 2002 18:05:28 -0000 1.1
+++ TestRoundTrip.java 13 May 2002 13:11:34 -0000 1.2
@@ -58,7 +58,7 @@
super(name);
TypeMappingRegistry tmr = server.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedNamespaces(new String[]{Constants.URI_CURRENT_SOAP_ENC});
+ tm.setSupportedEncodings(new String[]{Constants.URI_CURRENT_SOAP_ENC});
tmr.register(Constants.URI_CURRENT_SOAP_ENC, tm);
tm.register(test.encoding.RETURN.class,
new QName("urn:test.encoding", "RETURN"),
1.23 +1 -1 xml-axis/java/test/encoding/TestSer.java
Index: TestSer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestSer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TestSer.java 27 Mar 2002 17:53:07 -0000 1.22
+++ TestSer.java 13 May 2002 13:11:34 -0000 1.23
@@ -68,7 +68,7 @@
// Create a TypeMapping and register the specialized Type Mapping
TypeMappingRegistry reg = context.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) reg.createTypeMapping();
- tm.setSupportedNamespaces(new String[] {Constants.URI_CURRENT_SOAP_ENC});
+ tm.setSupportedEncodings(new String[] {Constants.URI_CURRENT_SOAP_ENC});
reg.register(Constants.URI_CURRENT_SOAP_ENC, tm);
QName dataQName = new QName("typeNS", "Data");
