butek 02/02/05 08:22:41
Modified: java/docs user-guide.html
java/samples/addr Main.java
java/samples/userguide/example6 Main.java
WidgetPriceServiceTestCase.java
java/src/javax/xml/rpc JAXRPCException.java Service.java
java/src/org/apache/axis/client AdminClient.java
Service.java
java/src/org/apache/axis/wsdl/toJava
JavaServiceImplWriter.java JavaServiceWriter.java
JavaTestCaseWriter.java
java/test/wsdl/arrays PersonalInfoBookServiceTestCase.java
java/test/wsdl/clash VerifyFilesTestCase.java
java/test/wsdl/faults FaultServiceTestCase.java
java/test/wsdl/filegen FileGenTestCase.java
java/test/wsdl/inheritance InheritanceTestCase.java
java/test/wsdl/inout DetailedInoutTestCase.java
java/test/wsdl/literal SalesRankNPrice_ServiceTestCase.java
java/test/wsdl/marrays MArrayTestsServiceTestCase.java
java/test/wsdl/multibinding VerifyFilesTestCase.java
java/test/wsdl/multiref Main.java
java/test/wsdl/multithread MultithreadTestCase.java
java/test/wsdl/parameterOrder VerifyTestCase.java
java/test/wsdl/refattr RefTestServiceTestCase.java
java/test/wsdl/sequence SequenceTestServiceTestCase.java
java/test/wsdl/types VerifyTestCase.java
Added: java/src/javax/xml/rpc ServiceException.java
java/src/org/apache/axis/wsdl/toJava
JavaServiceIfaceWriter.java
Log:
I changed a few things on the Service to bring it up to JAX-RPC 0.7 standards:
1. org.apache.axis.client.Service is required to implement Serializable and
Referenceable.
2. Service methods now throw ServiceException rather than JAXRPCException.
3. JAXRPCException now extends RuntimeException.
4. WSDL2Java now generates both a Service impl and a Service interface.
5. 2-4 caused lots of other changes, particularly to tests.
Revision Changes Path
1.36 +2 -3 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- user-guide.html 30 Jan 2002 10:30:05 -0000 1.35
+++ user-guide.html 5 Feb 2002 16:22:39 -0000 1.36
@@ -664,8 +664,7 @@
about these, though you can read the code if you're inclined.</li>
<li>
-The Service class serves as a factory for obtaining Stub instances - MyService
-for our example. The Service class will by default make a Stub which points
+The Service interface - MyService for our example - defines a get method for each
port listed in the service element of the WSDL. The implementation of this service
interface - MyServiceLocator for our example - implements these get methods. It
serves as a locator for obtaining Stub instances. The Service class will by default
make a Stub which points
to the endpoint URL described in the WSDL file, but you may also specify
a different URL when you ask for the PortType.</li>
</ul>
@@ -674,7 +673,7 @@
public static void main(String [] args) throws Exception
{
// Make a service (PortType factory)
- MyService service = new MyService();
+ MyService service = new MyServiceLocator();
// Now use the service to get a PortType that we can call.
1.16 +1 -1 xml-axis/java/samples/addr/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/addr/Main.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Main.java 1 Nov 2001 16:52:12 -0000 1.15
+++ Main.java 5 Feb 2002 16:22:39 -0000 1.16
@@ -113,7 +113,7 @@
System.err.println ("Using proxy without session maintenance.");
- AddressBookService abs = new AddressBookService();
+ AddressBookService abs = new AddressBookServiceLocator();
opts.setDefaultURL( abs.getAddressBookAddress() );
URL serviceURL = new URL(opts.getURL());
1.2 +1 -1 xml-axis/java/samples/userguide/example6/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/userguide/example6/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 10 Dec 2001 23:24:11 -0000 1.1
+++ Main.java 5 Feb 2002 16:22:39 -0000 1.2
@@ -65,7 +65,7 @@
public class Main {
public static void main (String[] args) throws Exception {
- samples.userguide.example6.WidgetPrice binding = new
WidgetPriceService().getWidgetPrice();
+ samples.userguide.example6.WidgetPrice binding = new
WidgetPriceServiceLocator().getWidgetPrice();
((WidgetPriceSoapBindingStub)binding).setMaintainSession(true);
try {
((WidgetPriceSoapBindingStub) binding).setWidgetPrice("FOO", "$1.00");
1.3 +3 -3
xml-axis/java/samples/userguide/example6/WidgetPriceServiceTestCase.java
Index: WidgetPriceServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/samples/userguide/example6/WidgetPriceServiceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WidgetPriceServiceTestCase.java 24 Jan 2002 17:01:38 -0000 1.2
+++ WidgetPriceServiceTestCase.java 5 Feb 2002 16:22:39 -0000 1.3
@@ -68,9 +68,9 @@
public void testWidgetPrice() {
samples.userguide.example6.WidgetPrice binding;
try {
- binding = new WidgetPriceService().getWidgetPrice();
- } catch (javax.xml.rpc.JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre );
+ binding = new WidgetPriceServiceLocator().getWidgetPrice();
+ } catch (javax.xml.rpc.ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre );
}
((WidgetPriceSoapBindingStub)binding).setMaintainSession(true);
assertTrue("binding is null", binding != null);
1.7 +1 -1 xml-axis/java/src/javax/xml/rpc/JAXRPCException.java
Index: JAXRPCException.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/JAXRPCException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JAXRPCException.java 18 Dec 2001 19:41:58 -0000 1.6
+++ JAXRPCException.java 5 Feb 2002 16:22:39 -0000 1.7
@@ -60,7 +60,7 @@
*
* @version 0.1
*/
-public class JAXRPCException extends Exception {
+public class JAXRPCException extends RuntimeException {
Throwable cause;
1.7 +14 -14 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Service.java 24 Jan 2002 17:01:38 -0000 1.6
+++ Service.java 5 Feb 2002 16:22:39 -0000 1.7
@@ -88,10 +88,10 @@
*
* @return Dynamic proxy object that supports the service definition interface
that extends the java.rmi.Remote
*
- * @throws JAXRPCException - If the service class fails to create a dynamic
proxy
+ * @throws ServiceException - If the service class fails to create a dynamic
proxy
*/
public java.rmi.Remote getPort(QName portName, Class proxyInterface)
- throws JAXRPCException;
+ throws ServiceException;
/**
* The getPort method returns a dynamic proxy for a default service port. A
service client uses this dynamic
@@ -102,10 +102,10 @@
*
* @return Dynamic proxy object that supports the service definition interface
that extends the java.rmi.Remote
*
- * @throws JAXRPCException - If the service class fails to create a dynamic
proxy
+ * @throws ServiceException - If the service class fails to create a dynamic
proxy
*/
public java.rmi.Remote getPort(Class serviceDefInterface)
- throws JAXRPCException;
+ throws ServiceException;
/**
* Creates a Call instance.
@@ -114,9 +114,9 @@
*
* @return Call object
*
- * @throws JAXRPCException - If the Service class fails to create a Call object
+ * @throws ServiceException - If the Service class fails to create a Call object
*/
- public Call createCall(QName portName) throws JAXRPCException;
+ public Call createCall(QName portName) throws ServiceException;
/**
* Creates a Call instance.
@@ -126,10 +126,10 @@
*
* @return Call object
*
- * @throws JAXRPCException - If the Service class fails to create a Call object
+ * @throws ServiceException - If the Service class fails to create a Call object
*/
public Call createCall(QName portName, String operationName)
- throws JAXRPCException;
+ throws ServiceException;
/**
* Creates a Call instance.
@@ -139,19 +139,19 @@
*
* @return Call object
*
- * @throws JAXRPCException - If the Service class fails to create a Call object
+ * @throws ServiceException - If the Service class fails to create a Call object
*/
public Call createCall(QName portName, QName operationName)
- throws JAXRPCException;
+ throws ServiceException;
/**
* Creates an empty Call object that needs to be configured using the setter
methods on the Call interface.
*
* @return Call object
*
- * @throws JAXRPCException
+ * @throws ServiceException
*/
- public Call createCall() throws JAXRPCException;
+ public Call createCall() throws ServiceException;
/**
* Gets location of the WSDL document for this Service.
@@ -179,10 +179,10 @@
*
* @param registry - TypeMappingRegistry object
*
- * @throws JAXRPCException - if there is an error in the configuration of the
TypeMappingRegistry
+ * @throws ServiceException - if there is an error in the configuration of the
TypeMappingRegistry
*/
public void setTypeMappingRegistry(TypeMappingRegistry registry)
- throws JAXRPCException;
+ throws ServiceException;
/**
* Gets the TypeMappingRegistry registered with this Service object
1.1 xml-axis/java/src/javax/xml/rpc/ServiceException.java
Index: ServiceException.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;
/**
* The javax.xml.rpc.ServiceException is thrown from the core JAX-RPC APIs to
* indicate exceptions related to Service and ServiceFactory calls.
*
* @version 0.1
*/
public class ServiceException extends Exception {
Throwable cause;
/**
* Constructs a new exception with null as its detail message.
*/
public ServiceException() {}
/**
* Constructs a new exception with the specified detail message.
*
* @param message exception message
*/
public ServiceException(String message) {
super(message);
}
/**
* Constructs a new exception which wraps another exception.
*
* @param cause the exception to wrap
*/
public ServiceException(Throwable cause) {
this.cause = cause;
}
/**
* Contructs a new exception with the specified detail message and
* wraps another exception.
*
* @param message exception message
* @param cause the exception to wrap
*/
public ServiceException(String message, Throwable cause) {
super(message);
this.cause = cause;
}
/**
* Returns the exception wrapped by this ServiceException
*
* @return exception or null if none.
*/
public Throwable getCause() {
return cause;
}
}
1.51 +2 -2 xml-axis/java/src/org/apache/axis/client/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AdminClient.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- AdminClient.java 28 Jan 2002 18:23:00 -0000 1.50
+++ AdminClient.java 5 Feb 2002 16:22:39 -0000 1.51
@@ -63,7 +63,7 @@
import org.apache.axis.utils.Options;
import org.apache.log4j.Category;
-import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.ServiceException;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.IOException;
@@ -126,7 +126,7 @@
service = new Service();
}
call = (Call) service.createCall();
- } catch (JAXRPCException e) {
+ } catch (ServiceException e) {
category.fatal(JavaUtils.getMessage("couldntCall00"), e);
call = null;
}
1.39 +43 -40 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Service.java 28 Jan 2002 18:23:00 -0000 1.38
+++ Service.java 5 Feb 2002 16:22:39 -0000 1.39
@@ -59,25 +59,28 @@
import org.apache.axis.AxisEngine;
import org.apache.axis.Constants;
import org.apache.axis.EngineConfiguration;
-import org.apache.axis.AxisFault;
import org.apache.axis.configuration.FileProvider;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.XMLUtils;
import org.apache.axis.utils.AxisClassLoader;
import org.w3c.dom.Document;
+import javax.naming.Reference;
+import javax.naming.Referenceable;
+
import javax.wsdl.Binding;
import javax.wsdl.Definition;
import javax.wsdl.Port;
import javax.wsdl.PortType;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.ServiceException;
import javax.xml.rpc.encoding.TypeMappingRegistry;
import javax.xml.rpc.namespace.QName;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
+import java.io.Serializable;
import java.net.URL;
import java.util.HashSet;
import java.util.Iterator;
@@ -98,7 +101,7 @@
* @author Doug Davis ([EMAIL PROTECTED])
*/
-public class Service implements javax.xml.rpc.Service {
+public class Service implements javax.xml.rpc.Service, Serializable, Referenceable {
private AxisEngine engine = null;
private URL wsdlLocation = null ;
@@ -147,9 +150,9 @@
*
* @param wsdlDoc URL of the WSDL document
* @param serviceName Qualified name of the desired service
- * @throws JAXRPCExceptionIif there's an error finding or parsing the WSDL
+ * @throws ServiceException If there's an error finding or parsing the WSDL
*/
- public Service(URL wsdlDoc, QName serviceName) throws JAXRPCException {
+ public Service(URL wsdlDoc, QName serviceName) throws ServiceException {
engine = getAxisClient();
Document doc = XMLUtils.newDocument(wsdlDoc.toString());
initService(doc, serviceName);
@@ -164,10 +167,10 @@
*
* @param wsdlLocation Location of the WSDL relative to the current dir
* @param serviceName Qualified name of the desired service
- * @throws JAXRPCException If there's an error finding or parsing the WSDL
+ * @throws ServiceException If there's an error finding or parsing the WSDL
*/
public Service(String wsdlLocation, QName serviceName)
- throws JAXRPCException {
+ throws ServiceException {
engine = getAxisClient();
try {
// Start by reading in the WSDL using WSDL4J
@@ -176,7 +179,7 @@
initService(doc, serviceName);
}
catch( FileNotFoundException exp ) {
- throw new JAXRPCException(
+ throw new ServiceException(
JavaUtils.getMessage("wsdlError00", "" + wsdlLocation, "\n" +
exp) );
}
}
@@ -189,10 +192,10 @@
*
* @param wsdlInputStream InputStream containing the WSDL
* @param serviceName Qualified name of the desired service
- * @throws JAXRPCException If there's an error finding or parsing the WSDL
+ * @throws ServiceException If there's an error finding or parsing the WSDL
*/
public Service(InputStream wsdlInputStream, QName serviceName)
- throws JAXRPCException {
+ throws ServiceException {
engine = getAxisClient();
Document doc = XMLUtils.newDocument(wsdlInputStream);
initService(doc, serviceName);
@@ -203,10 +206,10 @@
*
* @param doc A DOM document containing WSDL
* @param serviceName Qualified name of the desired service
- * @throws JAXRPCException If there's an error finding or parsing the WSDL
+ * @throws ServiceException If there's an error finding or parsing the WSDL
*/
private void initService(Document doc, QName serviceName)
- throws JAXRPCException {
+ throws ServiceException {
try {
// Start by reading in the WSDL using WSDL4J
WSDLReader reader = WSDLFactory.newInstance()
@@ -224,11 +227,11 @@
this.wsdlService = def.getService( qn );
if ( this.wsdlService == null )
- throw new JAXRPCException(
+ throw new ServiceException(
JavaUtils.getMessage("noService00", "" + serviceName));
}
catch( Exception exp ) {
- throw new JAXRPCException(
+ throw new ServiceException(
JavaUtils.getMessage("wsdlError00", "" + "", "\n" + exp) );
}
}
@@ -239,10 +242,10 @@
* @param portName ...
* @param proxyInterface ...
* @return java.rmi.Remote ...
- * @throws JAXRPCException If there's an error
+ * @throws ServiceException If there's an error
*/
public java.rmi.Remote getPort(QName portName, Class proxyInterface)
- throws JAXRPCException {
+ throws ServiceException {
return( null );
}
@@ -251,10 +254,10 @@
*
* @param proxyInterface ...
* @return java.rmi.Remote ...
- * @throws JAXRPCException If there's an error
+ * @throws ServiceException If there's an error
*/
public java.rmi.Remote getPort(Class proxyInterface)
- throws JAXRPCException {
+ throws ServiceException {
return null;
}
@@ -268,17 +271,17 @@
* @param endpoint the URL which will be used as the SOAP endpoint
* @param proxyInterface the interface class which we wish to mimic
* via a dynamic proxy
- * @throws JAXRPCException
+ * @throws ServiceException
*/
public java.rmi.Remote getPort(String endpoint, Class proxyInterface)
- throws JAXRPCException
+ throws ServiceException
{
if (!proxyInterface.isInterface()) {
- throw new JAXRPCException(JavaUtils.getMessage("mustBeIface00"));
+ throw new ServiceException(JavaUtils.getMessage("mustBeIface00"));
}
if (!(java.rmi.Remote.class.isAssignableFrom(proxyInterface))) {
- throw new JAXRPCException(
+ throw new ServiceException(
JavaUtils.getMessage("mustExtendRemote00"));
}
@@ -289,7 +292,7 @@
new Class[] { proxyInterface },
new AxisClientProxy(call));
} catch (Exception e) {
- throw new JAXRPCException(e.toString());
+ throw new ServiceException(e.toString());
}
}
@@ -299,23 +302,23 @@
*
* @param portName PortName in the WSDL doc to search for
* @return Call Used for invoking the Web Service
- * @throws JAXRPCException If there's an error
+ * @throws ServiceException If there's an error
*/
public javax.xml.rpc.Call createCall(QName portName)
- throws JAXRPCException {
+ throws ServiceException {
javax.wsdl.QName qn = new javax.wsdl.QName( portName.getNamespaceURI(),
portName.getLocalPart() );
if ( wsdlDefinition == null )
- throw new JAXRPCException( JavaUtils.getMessage("wsdlMissing00") );
+ throw new ServiceException( JavaUtils.getMessage("wsdlMissing00") );
Port port = wsdlService.getPort( portName.getLocalPart() );
if ( port == null )
- throw new JAXRPCException( JavaUtils.getMessage("noPort00", "" +
portName) );
+ throw new ServiceException( JavaUtils.getMessage("noPort00", "" +
portName) );
Binding binding = port.getBinding();
PortType portType = binding.getPortType();
if ( portType == null )
- throw new JAXRPCException( JavaUtils.getMessage("noPortType00", "" +
portName) );
+ throw new ServiceException( JavaUtils.getMessage("noPortType00", "" +
portName) );
org.apache.axis.client.Call call = new org.apache.axis.client.Call(this);
call.setPortTypeName( portName );
@@ -332,7 +335,7 @@
call.setTargetEndpointAddress(url);
}
catch(Exception exp) {
- throw new JAXRPCException(
+ throw new ServiceException(
JavaUtils.getMessage("cantSetURI00", "" + exp) );
}
}
@@ -349,11 +352,11 @@
* @param portName PortName in the WSDL doc to search for
* @param operationName Operation(method) that's going to be invoked
* @return Call Used for invoking the Web Service
- * @throws JAXRPCException If there's an error
+ * @throws ServiceException If there's an error
*/
public javax.xml.rpc.Call createCall(QName portName,
String operationName)
- throws JAXRPCException {
+ throws ServiceException {
org.apache.axis.client.Call call=new org.apache.axis.client.Call(this);
call.setOperation( portName, operationName );
@@ -368,11 +371,11 @@
* @param portName PortName in the WSDL doc to search for
* @param operationName Operation(method) that's going to be invoked
* @return Call Used for invoking the Web Service
- * @throws JAXRPCException If there's an error
+ * @throws ServiceException If there's an error
*/
public javax.xml.rpc.Call createCall(QName portName,
QName operationName)
- throws JAXRPCException {
+ throws ServiceException {
org.apache.axis.client.Call call=new org.apache.axis.client.Call(this);
call.setOperation( portName, operationName.getLocalPart() );
@@ -385,9 +388,9 @@
* any kind will be done against the WSDL.
*
* @return Call Used for invoking the Web Service
- * @throws JAXRPCException If there's an error
+ * @throws ServiceException If there's an error
*/
- public javax.xml.rpc.Call createCall() throws JAXRPCException {
+ public javax.xml.rpc.Call createCall() throws ServiceException {
return( new org.apache.axis.client.Call(this) );
}
@@ -443,10 +446,10 @@
* Defines the current Type Mappig Registry.
*
* @param registry The TypeMappingRegistry
- * @throws JAXRPCException if there's an error
+ * @throws ServiceException if there's an error
*/
public void setTypeMappingRegistry(TypeMappingRegistry registry)
- throws JAXRPCException {
+ throws ServiceException {
}
/**
@@ -459,12 +462,12 @@
}
/**
- * Not implemented yet
+ * Returns a reference to this object.
*
* @return Reference ...
*/
- public javax.naming.Reference getReference() {
- return( null );
+ public Reference getReference() {
+ return new Reference(this.getClass().getName());
}
/**
1.6 +13 -8
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
Index: JavaServiceImplWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaServiceImplWriter.java 1 Feb 2002 18:04:08 -0000 1.5
+++ JavaServiceImplWriter.java 5 Feb 2002 16:22:40 -0000 1.6
@@ -73,11 +73,12 @@
import org.apache.axis.utils.JavaUtils;
/**
-* This is Wsdl2java's service writer. It writes the <serviceName>.java file.
+* This is Wsdl2java's service implementation writer.
+* It writes the <serviceName>Locator.java file.
*/
public class JavaServiceImplWriter extends JavaWriter {
- private Service service;
- private SymbolTable symbolTable;
+ private ServiceEntry sEntry;
+ private SymbolTable symbolTable;
/**
* Constructor.
@@ -86,9 +87,9 @@
Emitter emitter,
ServiceEntry sEntry,
SymbolTable symbolTable) {
- super(emitter, sEntry, "", "java",
+ super(emitter, sEntry, "Locator", "java",
JavaUtils.getMessage("genService00"), "service");
- this.service = sEntry.getService();
+ this.sEntry = sEntry;
this.symbolTable = symbolTable;
} // ctor
@@ -96,8 +97,12 @@
* Write the body of the service file.
*/
protected void writeFileBody() throws IOException {
+ Service service = sEntry.getService();
+
// declare class
- pw.println("public class " + className + " extends
org.apache.axis.client.Service {");
+ pw.println("public class " + className
+ + " extends org.apache.axis.client.Service implements "
+ + sEntry.getName() + " {");
// output comments
writeComment(pw, service.getDocumentationElement());
@@ -170,7 +175,7 @@
pw.println(" }" );
pw.println("" );
- pw.println(" public " + bindingType + " get" + portName + "() throws
javax.xml.rpc.JAXRPCException {");
+ pw.println(" public " + bindingType + " get" + portName + "() throws
javax.xml.rpc.ServiceException {");
pw.println(" java.net.URL endpoint;");
pw.println(" try {");
pw.println(" endpoint = new java.net.URL(" + portName +
"_address);");
@@ -182,7 +187,7 @@
pw.println(" return get" + portName + "(endpoint);");
pw.println(" }");
pw.println();
- pw.println(" public " + bindingType + " get" + portName +
"(java.net.URL portAddress) throws javax.xml.rpc.JAXRPCException {");
+ pw.println(" public " + bindingType + " get" + portName +
"(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {");
pw.println(" try {");
pw.println(" return new " + stubClass + "(portAddress,
this);");
pw.println(" }");
1.2 +10 -4
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceWriter.java
Index: JavaServiceWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaServiceWriter.java 11 Dec 2001 15:08:47 -0000 1.1
+++ JavaServiceWriter.java 5 Feb 2002 16:22:40 -0000 1.2
@@ -66,7 +66,8 @@
* <serviceName>.java, <serviceName>TestCase.java.
*/
public class JavaServiceWriter implements Writer {
- Writer serviceWriter = null;
+ Writer serviceIfaceWriter = null;
+ Writer serviceImplWriter = null;
Writer testCaseWriter = null;
/**
@@ -78,7 +79,9 @@
SymbolTable symbolTable) {
ServiceEntry sEntry = symbolTable.getServiceEntry(service.getQName());
if (sEntry.isReferenced()) {
- serviceWriter =
+ serviceIfaceWriter =
+ new JavaServiceIfaceWriter(emitter, sEntry, symbolTable);
+ serviceImplWriter =
new JavaServiceImplWriter(emitter, sEntry, symbolTable);
if (emitter.bEmitTestCase) {
testCaseWriter =
@@ -91,8 +94,11 @@
* Write all the service bindnigs: service and testcase.
*/
public void write() throws IOException {
- if (serviceWriter != null) {
- serviceWriter.write();
+ if (serviceIfaceWriter != null) {
+ serviceIfaceWriter.write();
+ }
+ if (serviceImplWriter != null) {
+ serviceImplWriter.write();
}
if (testCaseWriter != null) {
testCaseWriter.write();
1.15 +7 -9
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
Index: JavaTestCaseWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JavaTestCaseWriter.java 4 Feb 2002 16:25:11 -0000 1.14
+++ JavaTestCaseWriter.java 5 Feb 2002 16:22:40 -0000 1.15
@@ -75,7 +75,7 @@
* This is Wsdl2java's TestCase writer. It writes the <serviceName>TestCase.java
file.
*/
public class JavaTestCaseWriter extends JavaWriter {
- private Service service;
+ private ServiceEntry sEntry;
private SymbolTable symbolTable;
/**
@@ -87,7 +87,7 @@
SymbolTable symbolTable) {
super(emitter, sEntry, "TestCase", "java",
JavaUtils.getMessage("genTest00"), "testCase");
- this.service = sEntry.getService();
+ this.sEntry = sEntry;
this.symbolTable = symbolTable;
} // ctor
@@ -113,7 +113,7 @@
*/
protected void writeFileBody() throws IOException {
// get ports
- Map portMap = service.getPorts();
+ Map portMap = sEntry.getService().getPorts();
Iterator portIterator = portMap.values().iterator();
while (portIterator.hasNext()) {
@@ -312,13 +312,11 @@
String bindingType, String portName) throws IOException {
pw.println(" " + bindingType + " binding;");
pw.println(" try {");
- pw.print(" binding = new ");
- pw.print(this.className.substring(
- 0, this.className.length() - "TestCase".length()));
- pw.println("().get" + portName + "();");
+ pw.print(" binding = new " + sEntry.getName());
+ pw.print("Locator" + "().get" + portName + "();");
pw.println(" }");
- pw.println(" catch (javax.xml.rpc.JAXRPCException jre) {");
- pw.println(" throw new
junit.framework.AssertionFailedError(\"JAX-RPC Exception caught: \" + jre);");
+ pw.println(" catch (javax.xml.rpc.ServiceException jre) {");
+ pw.println(" throw new
junit.framework.AssertionFailedError(\"JAX-RPC ServiceException caught: \" + jre);");
pw.println(" }");
pw.println(" assertTrue(\"" +
1.1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java
Index: JavaServiceIfaceWriter.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 org.apache.axis.wsdl.toJava;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import javax.wsdl.Binding;
import javax.wsdl.Port;
import javax.wsdl.Service;
import javax.wsdl.extensions.soap.SOAPAddress;
import org.apache.axis.utils.JavaUtils;
/**
* This is Wsdl2java's service writer. It writes the <serviceName>.java file.
*/
public class JavaServiceIfaceWriter extends JavaWriter {
private Service service;
private SymbolTable symbolTable;
/**
* Constructor.
*/
protected JavaServiceIfaceWriter(
Emitter emitter,
ServiceEntry sEntry,
SymbolTable symbolTable) {
super(emitter, sEntry, "", "java",
JavaUtils.getMessage("genService00"), "service");
this.service = sEntry.getService();
this.symbolTable = symbolTable;
} // ctor
/**
* Write the body of the service file.
*/
protected void writeFileBody() throws IOException {
// declare class
pw.println("public interface " + className
+ " extends javax.xml.rpc.Service {");
// output comments
writeComment(pw, service.getDocumentationElement());
// get ports
Map portMap = service.getPorts();
Iterator portIterator = portMap.values().iterator();
// write a get method for each of the ports with a SOAP binding
while (portIterator.hasNext()) {
Port p = (Port) portIterator.next();
Binding binding = p.getBinding();
if (binding == null) {
throw new IOException(JavaUtils.getMessage("emitFailNoBinding01",
new String[] {p.getName()}));
}
BindingEntry bEntry =
symbolTable.getBindingEntry(binding.getQName());
if (bEntry == null) {
throw new IOException(JavaUtils.getMessage(
"emitFailNoBindingEntry01",
new String[] {binding.getQName().toString()}));
}
PortTypeEntry ptEntry = symbolTable.getPortTypeEntry(
binding.getPortType().getQName());
if (ptEntry == null) {
throw new IOException(JavaUtils.getMessage(
"emitFailNoPortType01",
new String[]
{binding.getPortType().getQName().toString()}));
}
// If this isn't an SOAP binding, skip it
if (bEntry.getBindingType() != BindingEntry.TYPE_SOAP) {
continue;
}
String portName = Utils.xmlNameToJavaClass(p.getName());
// If there is not literal use, the interface name is the portType name.
// Otherwise it is the binding name.
String bindingType = bEntry.hasLiteral() ?
bEntry.getName() : ptEntry.getName();
// Write out the get<PortName> methods
pw.println(" public String get" + portName + "Address();");
pw.println();
pw.println(" public " + bindingType + " get" + portName
+ "() throws javax.xml.rpc.ServiceException;");
pw.println();
pw.println(" public " + bindingType + " get" + portName
+ "(java.net.URL portAddress) throws
javax.xml.rpc.ServiceException;");
}
// all done
pw.println("}");
pw.close();
} // writeFileBody
} // class JavaServiceIfaceWriter
1.3 +3 -3
xml-axis/java/test/wsdl/arrays/PersonalInfoBookServiceTestCase.java
Index: PersonalInfoBookServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/arrays/PersonalInfoBookServiceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersonalInfoBookServiceTestCase.java 24 Jan 2002 17:01:39 -0000 1.2
+++ PersonalInfoBookServiceTestCase.java 5 Feb 2002 16:22:40 -0000 1.3
@@ -33,10 +33,10 @@
// Get the stub and set Session
test.wsdl.arrays.PersonalInfoBook binding;
try {
- binding = new PersonalInfoBookService().getPersonalInfoBook();
+ binding = new PersonalInfoBookServiceLocator().getPersonalInfoBook();
}
- catch (javax.xml.rpc.JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre );
+ catch (javax.xml.rpc.ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre );
}
assertTrue("binding is null", binding != null);
((PersonalInfoBookSOAPBindingStub) binding).setMaintainSession (true);
1.2 +1 -0 xml-axis/java/test/wsdl/clash/VerifyFilesTestCase.java
Index: VerifyFilesTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/clash/VerifyFilesTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VerifyFilesTestCase.java 4 Feb 2002 15:34:09 -0000 1.1
+++ VerifyFilesTestCase.java 5 Feb 2002 16:22:40 -0000 1.2
@@ -88,6 +88,7 @@
set.add("SharedName_BindingStub.java");
set.add("SharedName_Port.java");
set.add("SharedName_Service.java");
+ set.add("SharedName_ServiceLocator.java");
set.add("SharedName_ServiceTestCase.java");
set.add("SharedName_Type.java");
set.add("VerifyFilesTestCase.java");
1.3 +3 -3 xml-axis/java/test/wsdl/faults/FaultServiceTestCase.java
Index: FaultServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/faults/FaultServiceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FaultServiceTestCase.java 24 Jan 2002 17:01:39 -0000 1.2
+++ FaultServiceTestCase.java 5 Feb 2002 16:22:40 -0000 1.3
@@ -25,11 +25,11 @@
public void testFaultService() {
test.wsdl.faults.FaultServicePortType binding;
try {
- binding = new FaultService().getFaultService();
+ binding = new FaultServiceLocator().getFaultService();
}
- catch (javax.xml.rpc.JAXRPCException jre) {
+ catch (javax.xml.rpc.ServiceException jre) {
throw new junit.framework.
- AssertionFailedError("JAX-RPC Exception caught: " + jre);
+ AssertionFailedError("JAX-RPC ServiceException caught: " +
jre);
}
assertTrue("binding is null", binding != null);
String symbol = new String("MACR");
1.3 +1 -0 xml-axis/java/test/wsdl/filegen/FileGenTestCase.java
Index: FileGenTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/filegen/FileGenTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileGenTestCase.java 4 Feb 2002 15:34:09 -0000 1.2
+++ FileGenTestCase.java 5 Feb 2002 16:22:40 -0000 1.3
@@ -84,6 +84,7 @@
set.add("OpFault.java");
set.add("PortTypeSoap.java");
set.add("ReferenceService.java");
+ set.add("ReferenceServiceLocator.java");
set.add("ReferenceSoapBindingStub.java");
return set;
}
1.2 +4 -4 xml-axis/java/test/wsdl/inheritance/InheritanceTestCase.java
Index: InheritanceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/inheritance/InheritanceTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InheritanceTestCase.java 30 Jan 2002 03:59:29 -0000 1.1
+++ InheritanceTestCase.java 5 Feb 2002 16:22:40 -0000 1.2
@@ -55,7 +55,7 @@
package test.wsdl.inheritance;
-import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.ServiceException;
/**
* This class contains the methods necessary for testing that the use inherited
methods
@@ -93,10 +93,10 @@
public void testInheritanceTest() {
test.wsdl.inheritance.InheritancePortType binding;
try {
- binding = new InheritanceTest().getInheritanceTest();
+ binding = new InheritanceTestLocator().getInheritanceTest();
}
- catch (JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre);
+ catch (ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre);
}
assertTrue("binding is null", binding != null);
1.3 +4 -4 xml-axis/java/test/wsdl/inout/DetailedInoutTestCase.java
Index: DetailedInoutTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/inout/DetailedInoutTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DetailedInoutTestCase.java 24 Jan 2002 17:01:39 -0000 1.2
+++ DetailedInoutTestCase.java 5 Feb 2002 16:22:40 -0000 1.3
@@ -6,7 +6,7 @@
import org.apache.axis.utils.Options;
-import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.ServiceException;
import javax.xml.rpc.holders.IntHolder;
import javax.xml.rpc.holders.StringHolder;
@@ -25,10 +25,10 @@
public DetailedInoutTestCase(String name) {
super(name);
try {
- io = new InoutService().getInoutService();
+ io = new InoutServiceLocator().getInoutService();
}
- catch (JAXRPCException jre) {
- throw new AssertionFailedError("JAX-RPC Exception: " + jre);
+ catch (ServiceException jre) {
+ throw new AssertionFailedError("JAX-RPC ServiceException: " + jre);
}
}
1.4 +3 -3
xml-axis/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
Index: SalesRankNPrice_ServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SalesRankNPrice_ServiceTestCase.java 29 Jan 2002 14:30:08 -0000 1.3
+++ SalesRankNPrice_ServiceTestCase.java 5 Feb 2002 16:22:40 -0000 1.4
@@ -114,9 +114,9 @@
SalesRankNPriceSoap binding;
try {
- binding = new SalesRankNPrice_Service().getSalesRankNPriceSoap();
- } catch (javax.xml.rpc.JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre );
+ binding = new SalesRankNPrice_ServiceLocator().getSalesRankNPriceSoap();
+ } catch (javax.xml.rpc.ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre );
}
assertTrue("binding is null", binding != null);
1.4 +3 -3 xml-axis/java/test/wsdl/marrays/MArrayTestsServiceTestCase.java
Index: MArrayTestsServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/marrays/MArrayTestsServiceTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MArrayTestsServiceTestCase.java 29 Jan 2002 21:31:38 -0000 1.3
+++ MArrayTestsServiceTestCase.java 5 Feb 2002 16:22:40 -0000 1.4
@@ -15,10 +15,10 @@
public void testMArrayTests() {
test.wsdl.marrays.MArrayTests binding;
try {
- binding = new MArrayTestsService().getMArrayTests();
+ binding = new MArrayTestsServiceLocator().getMArrayTests();
}
- catch (javax.xml.rpc.JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre );
+ catch (javax.xml.rpc.ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre );
}
assertTrue("binding is null", binding != null);
1.2 +1 -0 xml-axis/java/test/wsdl/multibinding/VerifyFilesTestCase.java
Index: VerifyFilesTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/multibinding/VerifyFilesTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VerifyFilesTestCase.java 4 Feb 2002 15:34:09 -0000 1.1
+++ VerifyFilesTestCase.java 5 Feb 2002 16:22:40 -0000 1.2
@@ -89,6 +89,7 @@
set.add("BindingSomeLitStub.java");
set.add("MbPT.java");
set.add("MbService.java");
+ set.add("MbServiceLocator.java");
set.add("MbServiceTestCase.java");
set.add("VerifyFilesTestCase.java");
set.add("deploy.wsdd");
1.2 +1 -1 xml-axis/java/test/wsdl/multiref/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/multiref/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 4 Jan 2002 19:09:41 -0000 1.1
+++ Main.java 5 Feb 2002 16:22:40 -0000 1.2
@@ -73,7 +73,7 @@
public static void main (String[] args) throws Exception {
Options opts = new Options(args);
- MultiRefTestService service = new MultiRefTestService();
+ MultiRefTestService service = new MultiRefTestServiceLocator();
opts.setDefaultURL( service.getMultiRefTestAddress() );
URL serviceURL = new URL(opts.getURL());
if (serviceURL == null)
1.4 +6 -6 xml-axis/java/test/wsdl/multithread/MultithreadTestCase.java
Index: MultithreadTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/multithread/MultithreadTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultithreadTestCase.java 24 Jan 2002 17:01:39 -0000 1.3
+++ MultithreadTestCase.java 5 Feb 2002 16:22:40 -0000 1.4
@@ -4,7 +4,7 @@
import java.rmi.RemoteException;
-import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.ServiceException;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
@@ -12,7 +12,7 @@
import org.apache.axis.AxisFault;
import samples.addr.AddressBook;
-import samples.addr.AddressBookService;
+import samples.addr.AddressBookServiceLocator;
import samples.addr.AddressBookSOAPBindingStub;
import samples.addr.Address;
import samples.addr.Phone;
@@ -21,7 +21,7 @@
/**
* This test calls the stub multiple times from multiple threads. Before the
* stub was made threadsafe, there was a good chance this test would fail with an
-* IllegalStateException or "javax.xml.rpc.JAXRPCException: Number of parameters
+* IllegalStateException or "javax.xml.rpc.ServiceException: Number of parameters
* passed in (2) doesn't match the number of IN/INOUT parameters (4) from the
* addParameter() calls" or something else just as cryptic.
*/
@@ -87,10 +87,10 @@
public void testMultithreading() {
try {
- binding = new AddressBookService().getAddressBook();
+ binding = new AddressBookServiceLocator().getAddressBook();
}
- catch (JAXRPCException jre) {
- throw new AssertionFailedError("JAXRPCException caught: " + jre);
+ catch (ServiceException jre) {
+ throw new AssertionFailedError("ServiceException caught: " + jre);
}
assertTrue("binding is null", binding != null);
((AddressBookSOAPBindingStub) binding).setMaintainSession(true);
1.3 +3 -3 xml-axis/java/test/wsdl/parameterOrder/VerifyTestCase.java
Index: VerifyTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/parameterOrder/VerifyTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VerifyTestCase.java 24 Jan 2002 17:01:39 -0000 1.2
+++ VerifyTestCase.java 5 Feb 2002 16:22:40 -0000 1.3
@@ -20,9 +20,9 @@
public void testParameterOrder() {
test.wsdl.parameterOrder.ParameterOrderTest binding;
try {
- binding = new ParameterOrderService().getParameterOrder();
- } catch (javax.xml.rpc.JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre);
+ binding = new ParameterOrderServiceLocator().getParameterOrder();
+ } catch (javax.xml.rpc.ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre);
}
assertTrue("binding is null", binding != null);
try {
1.3 +3 -3 xml-axis/java/test/wsdl/refattr/RefTestServiceTestCase.java
Index: RefTestServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/refattr/RefTestServiceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RefTestServiceTestCase.java 24 Jan 2002 17:01:39 -0000 1.2
+++ RefTestServiceTestCase.java 5 Feb 2002 16:22:40 -0000 1.3
@@ -16,10 +16,10 @@
public void testRefTest() {
test.wsdl.refattr.RefTest binding;
try {
- binding = new RefTestService().getRefTest();
+ binding = new RefTestServiceLocator().getRefTest();
}
- catch (javax.xml.rpc.JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre );
+ catch (javax.xml.rpc.ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre );
}
// The following declarations are used to verify that unmangled classes
1.4 +3 -3
xml-axis/java/test/wsdl/sequence/SequenceTestServiceTestCase.java
Index: SequenceTestServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/sequence/SequenceTestServiceTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SequenceTestServiceTestCase.java 1 Feb 2002 22:08:26 -0000 1.3
+++ SequenceTestServiceTestCase.java 5 Feb 2002 16:22:40 -0000 1.4
@@ -14,10 +14,10 @@
public void testSequenceTest() {
test.wsdl.sequence.SequenceTestPortType binding;
try {
- binding = new SequenceTest().getSequenceTest();
+ binding = new SequenceTestLocator().getSequenceTest();
}
- catch (javax.xml.rpc.JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre );
+ catch (javax.xml.rpc.ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre );
}
assertTrue("binding is null", binding != null);
try {
1.7 +5 -5 xml-axis/java/test/wsdl/types/VerifyTestCase.java
Index: VerifyTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/types/VerifyTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VerifyTestCase.java 1 Feb 2002 04:38:18 -0000 1.6
+++ VerifyTestCase.java 5 Feb 2002 16:22:41 -0000 1.7
@@ -7,7 +7,7 @@
package test.wsdl.types;
-import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.ServiceException;
import javax.xml.rpc.holders.BigDecimalHolder;
import javax.xml.rpc.holders.BigIntegerHolder;
@@ -59,7 +59,7 @@
import test.wsdl.types.comprehensive_types2.B;
import test.wsdl.types.comprehensive_service.TypeTest;
-import test.wsdl.types.comprehensive_service.TypeTestService;
+import test.wsdl.types.comprehensive_service.TypeTestServiceLocator;
public class VerifyTestCase extends junit.framework.TestCase {
public VerifyTestCase(String name) {
@@ -69,10 +69,10 @@
public void testTypeTest() {
TypeTest binding;
try {
- binding = new TypeTestService().getTypeTest();
+ binding = new TypeTestServiceLocator().getTypeTest();
}
- catch (JAXRPCException jre) {
- throw new junit.framework.AssertionFailedError("JAX-RPC Exception
caught: " + jre);
+ catch (ServiceException jre) {
+ throw new junit.framework.AssertionFailedError("JAX-RPC
ServiceException caught: " + jre);
}
assertTrue("binding is null", binding != null);
try {
