dims 2002/06/11 10:36:07
Modified: java/src/javax/xml/soap SOAPConnection.java
SOAPConnectionFactory.java SOAPElementFactory.java
java/src/org/apache/axis/soap SOAPConnectionImpl.java
Added: java/src/javax/xml/soap SOAPFactory.java
java/src/org/apache/axis/soap SOAPFactoryImpl.java
Removed: java/src/org/apache/axis/soap SOAPElementFactoryImpl.java
Log:
javax.xml.soap.* classes are now part of SAAJ -
http://java.sun.com/xml/saaj/index.html
Latest javadoc is at - http://java.sun.com/webservices/docs/1.0/api/index.html
Revision Changes Path
1.2 +1 -1 xml-axis/java/src/javax/xml/soap/SOAPConnection.java
Index: SOAPConnection.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/SOAPConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPConnection.java 25 Jan 2002 16:30:07 -0000 1.1
+++ SOAPConnection.java 11 Jun 2002 17:36:07 -0000 1.2
@@ -91,7 +91,7 @@
* response to the message that was sent
* @throws SOAPException if there is a SOAP error
*/
- public abstract SOAPMessage call(SOAPMessage request, Endpoint endpoint)
+ public abstract SOAPMessage call(SOAPMessage request, Object endpoint)
throws SOAPException;
/**
1.4 +2 -1 xml-axis/java/src/javax/xml/soap/SOAPConnectionFactory.java
Index: SOAPConnectionFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/SOAPConnectionFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPConnectionFactory.java 29 May 2002 17:00:00 -0000 1.3
+++ SOAPConnectionFactory.java 11 Jun 2002 17:36:07 -0000 1.4
@@ -68,7 +68,8 @@
* @throws SOAPException if there was an error creating
* the <CODE>SOAPConnectionFactory
*/
- public static SOAPConnectionFactory newInstance() throws SOAPException {
+ public static SOAPConnectionFactory newInstance()
+ throws SOAPException, UnsupportedOperationException {
try {
return (SOAPConnectionFactory) FactoryFinder.
1.5 +22 -18 xml-axis/java/src/javax/xml/soap/SOAPElementFactory.java
Index: SOAPElementFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/soap/SOAPElementFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPElementFactory.java 29 May 2002 17:00:00 -0000 1.4
+++ SOAPElementFactory.java 11 Jun 2002 17:36:07 -0000 1.5
@@ -65,11 +65,13 @@
* properties of an element that lives inside a SOAP header
* document. These elements are copied into the XML document tree
* when they are inserted.</P>
+ * @deprecated Use javax.xml.soap.SOAPFactory for creating SOAPElements.
*/
-public abstract class SOAPElementFactory {
+public class SOAPElementFactory {
- /** */
- public SOAPElementFactory() {}
+ private SOAPElementFactory(SOAPFactory soapfactory) {
+ sf = soapfactory;
+ }
/**
* Create a <CODE>SOAPElement</CODE> object initialized with
@@ -80,8 +82,11 @@
* created
* @throws SOAPException if there is an error in
* creating the <CODE>SOAPElement</CODE> object
+ * @deprecated Use javax.xml.soap.SOAPFactory for creating SOAPElements.
*/
- public abstract SOAPElement create(Name name) throws SOAPException;
+ public SOAPElement create(Name name) throws SOAPException {
+ return sf.createElement(name);
+ }
/**
* Create a <CODE>SOAPElement</CODE> object initialized with
@@ -92,8 +97,11 @@
* created
* @throws SOAPException if there is an error in
* creating the <CODE>SOAPElement</CODE> object
+ * @deprecated Use javax.xml.soap.SOAPFactory for creating SOAPElements.
*/
- public abstract SOAPElement create(String localName) throws SOAPException;
+ public SOAPElement create(String localName) throws SOAPException {
+ return sf.createElement(localName);
+ }
/**
* Create a new <CODE>SOAPElement</CODE> object with the
@@ -109,9 +117,12 @@
* created
* @throws SOAPException if there is an error in
* creating the <CODE>SOAPElement</CODE> object
+ * @deprecated Use javax.xml.soap.SOAPFactory for creating SOAPElements.
*/
- public abstract SOAPElement create(
- String localName, String prefix, String uri) throws SOAPException;
+ public SOAPElement create(
+ String localName, String prefix, String uri) throws SOAPException {
+ return sf.createElement(localName, prefix, uri);
+ }
/**
* Creates a new instance of <CODE>
@@ -120,23 +131,16 @@
* SOAPElementFactory</CODE>
* @throws SOAPException if there was an error creating
* the default <CODE>SOAPElementFactory
+ * @deprecated
*/
public static SOAPElementFactory newInstance() throws SOAPException {
-
try {
- return (SOAPElementFactory) FactoryFinder.find(SEF_PROPERTY,
- DEFAULT_SEF);
+ return new SOAPElementFactory(SOAPFactory.newInstance());
} catch (Exception exception) {
throw new SOAPException("Unable to create SOAP Element Factory: "
- + exception.getMessage());
+ + exception.getMessage());
}
}
- /** */
- private static final String SEF_PROPERTY =
- "javax.xml.soap.SOAPElementFactory";
-
- /** */
- private static final String DEFAULT_SEF =
- "org.apache.axis.soap.SOAPElementFactoryImpl";
+ private SOAPFactory sf;
}
1.1 xml-axis/java/src/javax/xml/soap/SOAPFactory.java
Index: SOAPFactory.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.soap;
public abstract class SOAPFactory
{
public SOAPFactory()
{
}
public abstract SOAPElement createElement(Name name)
throws SOAPException;
public abstract SOAPElement createElement(String s)
throws SOAPException;
public abstract SOAPElement createElement(String s, String s1, String s2)
throws SOAPException;
public abstract Detail createDetail()
throws SOAPException;
public abstract Name createName(String s, String s1, String s2)
throws SOAPException;
public abstract Name createName(String s)
throws SOAPException;
public static SOAPFactory newInstance()
throws SOAPException
{
try
{
return (SOAPFactory)FactoryFinder.find(SF_PROPERTY, DEFAULT_SF);
}
catch(Exception exception)
{
throw new SOAPException("Unable to create SOAP Factory: " +
exception.getMessage());
}
}
private static final String SF_PROPERTY = "javax.xml.soap.SOAPFactory";
private static final String DEFAULT_SF = "org.apache.axis.soap.SOAPFactoryImpl";
}
1.3 +1 -1 xml-axis/java/src/org/apache/axis/soap/SOAPConnectionImpl.java
Index: SOAPConnectionImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAPConnectionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SOAPConnectionImpl.java 30 May 2002 16:40:42 -0000 1.2
+++ SOAPConnectionImpl.java 11 Jun 2002 17:36:07 -0000 1.3
@@ -79,7 +79,7 @@
* response to the message that was sent
* @throws SOAPException if there is a SOAP error
*/
- public SOAPMessage call(SOAPMessage request, Endpoint endpoint)
+ public SOAPMessage call(SOAPMessage request, Object endpoint)
throws SOAPException {
try {
Call call = new Call(endpoint.toString());
1.1 xml-axis/java/src/org/apache/axis/soap/SOAPFactoryImpl.java
Index: SOAPFactoryImpl.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2002 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 org.apache.axis.soap;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
/**
* SOAP Element Factory implementation
*
* @author Davanum Srinivas ([EMAIL PROTECTED])
*/
public class SOAPFactoryImpl extends javax.xml.soap.SOAPFactory {
/**
* Create a <CODE>SOAPElement</CODE> object initialized with
* the given <CODE>Name</CODE> object.
* @param name a <CODE>Name</CODE> object with
* the XML name for the new element
* @return the new <CODE>SOAPElement</CODE> object that was
* created
* @throws SOAPException if there is an error in
* creating the <CODE>SOAPElement</CODE> object
*/
public SOAPElement createElement(Name name) throws SOAPException {
//TODO: Flesh this out.
return null;
}
/**
* Create a <CODE>SOAPElement</CODE> object initialized with
* the given local name.
* @param localName a <CODE>String</CODE> giving
* the local name for the new element
* @return the new <CODE>SOAPElement</CODE> object that was
* created
* @throws SOAPException if there is an error in
* creating the <CODE>SOAPElement</CODE> object
*/
public SOAPElement createElement(String localName) throws SOAPException {
//TODO: Flesh this out.
return null;
}
/**
* Create a new <CODE>SOAPElement</CODE> object with the
* given local name, prefix and uri.
* @param localName a <CODE>String</CODE> giving
* the local name for the new element
* @param prefix the prefix for this <CODE>
* SOAPElement</CODE>
* @param uri a <CODE>String</CODE> giving the
* URI of the namespace to which the new element
* belongs
* @return the new <CODE>SOAPElement</CODE> object that was
* created
* @throws SOAPException if there is an error in
* creating the <CODE>SOAPElement</CODE> object
*/
public SOAPElement createElement(
String localName, String prefix, String uri) throws SOAPException {
//TODO: Flesh this out.
return null;
}
public javax.xml.soap.Detail createDetail()
throws SOAPException {
//TODO: Flesh this out.
return null;
}
public Name createName(String s, String s1, String s2)
throws SOAPException {
//TODO: Flesh this out.
return null;
}
public Name createName(String s)
throws SOAPException {
//TODO: Flesh this out.
return null;
}
}
