dims 2003/03/26 10:04:59
Modified: java/test/dynamic PackageTests.java
java/src/org/apache/axis/client Service.java
Added: java/test/dynamic TestJAXRPCDII.java
Log:
Fix and test case for Bug 18380 - JAX-RPC Service's getCalls() Not Implemented.
Revision Changes Path
1.3 +1 -0 xml-axis/java/test/dynamic/PackageTests.java
Index: PackageTests.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/dynamic/PackageTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PackageTests.java 13 Oct 2002 15:35:57 -0000 1.2
+++ PackageTests.java 26 Mar 2003 18:04:58 -0000 1.3
@@ -75,6 +75,7 @@
suite.addTestSuite(ServiceGetPort.class);
suite.addTestSuite(TestDynamicInvoker.class);
+ suite.addTestSuite(TestJAXRPCDII.class);
return suite;
}
1.1 xml-axis/java/test/dynamic/TestJAXRPCDII.java
Index: TestJAXRPCDII.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 test.dynamic;
import junit.framework.TestCase;
import java.net.ConnectException;
import java.net.URL;
import org.apache.axis.AxisFault;
import javax.xml.rpc.ServiceFactory;
import javax.xml.rpc.Service;
import javax.xml.rpc.Call;
import javax.xml.namespace.QName;
public class TestJAXRPCDII extends TestCase {
public TestJAXRPCDII(String name) {
super(name);
} // ctor
public void test1() throws Exception {
try {
String wsdlLocation =
"http://www.xmethods.net/sd/2001/TemperatureService.wsdl";;
String wsdlNsp = "http://www.xmethods.net/sd/TemperatureService.wsdl";;
ServiceFactory factory = ServiceFactory.newInstance();
Service service = factory.createService(new URL(wsdlLocation),
new QName(wsdlNsp, "TemperatureService"));
Call[] calls = service.getCalls(new QName(wsdlNsp,"TemperaturePort"));
assertTrue(calls != null);
assertEquals(calls[0].getOperationName().getLocalPart(),"getTemp");
Object ret = calls[0].invoke(new Object[]{"02067"});
System.out.println("Temperature:" + ret);
} catch (java.rmi.RemoteException re) {
if (re instanceof AxisFault) {
AxisFault fault = (AxisFault) re;
if (fault.detail instanceof ConnectException ||
(fault.getFaultString().indexOf("Connection timed out") != -1) ||
fault.getFaultCode().getLocalPart().equals("HTTP")) {
System.err.println("getTemp HTTP error: " + fault);
return;
}
}
throw new junit.framework.AssertionFailedError("Remote Exception caught:
" + re);
} catch (java.io.IOException ioe) {
System.err.println("getTemp connect error: " + ioe);
return;
}
}
}
1.89 +23 -3 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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Service.java 23 Mar 2003 23:49:18 -0000 1.88
+++ Service.java 26 Mar 2003 18:04:59 -0000 1.89
@@ -64,6 +64,9 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.axis.wsdl.gen.Parser;
import org.apache.axis.wsdl.symbolTable.ServiceEntry;
+import org.apache.axis.wsdl.symbolTable.SymbolTable;
+import org.apache.axis.wsdl.symbolTable.BindingEntry;
+import org.apache.axis.wsdl.symbolTable.Parameters;
import org.w3c.dom.Document;
import javax.naming.Reference;
@@ -72,6 +75,7 @@
import javax.wsdl.Binding;
import javax.wsdl.Port;
import javax.wsdl.PortType;
+import javax.wsdl.Operation;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.xml.namespace.QName;
import javax.xml.rpc.ServiceException;
@@ -574,8 +578,6 @@
* This method requires the Service implementation class to have access
* to the WSDL related metadata.
*
- * Not implemented.
- *
* @throws ServiceException - If this Service class does not have access
* to the required WSDL metadata or if an illegal portName is specified.
*/
@@ -586,7 +588,25 @@
if (wsdlService == null)
throw new ServiceException(Messages.getMessage("wsdlMissing00"));
- javax.xml.rpc.Call[] array = new javax.xml.rpc.Call[]{createCall(portName)};
+ Port port = wsdlService.getPort(portName.getLocalPart());
+ if (port == null)
+ throw new ServiceException(Messages.getMessage("noPort00", "" +
portName));
+
+ Binding binding = port.getBinding();
+ SymbolTable symbolTable = wsdlParser.getSymbolTable();
+ BindingEntry bEntry =
+ symbolTable.getBindingEntry(binding.getQName());
+ Iterator i = bEntry.getParameters().keySet().iterator();
+
+ Vector calls = new Vector();
+ while (i.hasNext()) {
+ Operation operation = (Operation) i.next();
+ javax.xml.rpc.Call call = createCall(QName.valueOf(port.getName()),
+ QName.valueOf(operation.getName()));
+ calls.add(call);
+ }
+ javax.xml.rpc.Call[] array = new javax.xml.rpc.Call[calls.size()];
+ calls.toArray(array);
return array;
}
