You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ia...@apache.org on 2004/10/15 18:42:18 UTC
cvs commit: ws-axis/java/test/wsdl/interop4/groupH/complexDocLit ComplexDocLitServiceTestCase.java ComplexDocLitBindingImpl.java
ias 2004/10/15 09:42:18
Modified: java/test/wsdl/qualify Qualify_BindingImpl.java
Qualify_ServiceTestCase.java
java/test/wsdl/interop4/groupH/simpleDocLit
SimpleDocLitServiceTestCase.java
SimpleDocLitBindingImpl.java
java/test/wsdl/omit OmitImpl.java OmitTestCase.java
java/test/wsdl/attrGroup AttrGroupServiceTestCase.java
java/test/wsdl/interop4/groupi Round4XSDTestSoapImpl.java
Round4XSDTestTestCase.java
java/test/wsdl/extensibility
ExtensibilityQueryBindingImpl.java
ExtensibilityQueryTestCase.java
java/test/wsdl/types VerifyTestCase.java
java/test/wsdl/wrapperHolder ExampleSoapTestCase.java
java/test/wsdl/addrNoImplSEI Main.java
AddressBookDynamicProxyTestCase.java
java/test/wsdl/nested Nested2ServiceTestCase.java
Nested2BindingImpl.java
java/test/wsdl/dataset DataServiceTestCase.java
java/test/wsdl/interop4/groupH/complexDocLit
ComplexDocLitServiceTestCase.java
ComplexDocLitBindingImpl.java
Log:
Apply patch for AXIS-1598 thanks to Jongjin Choi.
Note that anonymous XML schema types are mapped to Java classes of which names are fully compliant with Java naming convention.
Revision Changes Path
1.11 +2 -2 ws-axis/java/test/wsdl/qualify/Qualify_BindingImpl.java
Index: Qualify_BindingImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/qualify/Qualify_BindingImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Qualify_BindingImpl.java 9 Jun 2004 13:59:11 -0000 1.10
+++ Qualify_BindingImpl.java 15 Oct 2004 16:42:17 -0000 1.11
@@ -86,7 +86,7 @@
return "Hello there: " + name;
}
- public test.wsdl.qualify.__FormOverrideResponse_response formOverride(test.wsdl.qualify.__FormOverride_complex complex) throws java.rmi.RemoteException {
+ public test.wsdl.qualify.FormOverrideResponseResponse formOverride(test.wsdl.qualify.FormOverrideComplex complex) throws java.rmi.RemoteException {
// Validate XML request to make sure elements are properly qualified
// or not per the WSDL
MessageContext mc = MessageContext.getCurrentContext();
@@ -139,7 +139,7 @@
}
// Return a response (which the client will validate)
- test.wsdl.qualify.__FormOverrideResponse_response r = new __FormOverrideResponse_response();
+ test.wsdl.qualify.FormOverrideResponseResponse r = new FormOverrideResponseResponse();
r.setName("Tommy");
return r;
}
1.11 +2 -2 ws-axis/java/test/wsdl/qualify/Qualify_ServiceTestCase.java
Index: Qualify_ServiceTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/qualify/Qualify_ServiceTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Qualify_ServiceTestCase.java 9 Jun 2004 13:59:11 -0000 1.10
+++ Qualify_ServiceTestCase.java 15 Oct 2004 16:42:17 -0000 1.11
@@ -111,8 +111,8 @@
assertTrue("binding is null", binding != null);
try {
- __FormOverrideResponse_response value = null;
- __FormOverride_complex arg = new __FormOverride_complex();
+ FormOverrideResponseResponse value = null;
+ FormOverrideComplex arg = new FormOverrideComplex();
arg.setName("Timmah");
value = binding.formOverride(arg);
1.7 +11 -11 ws-axis/java/test/wsdl/interop4/groupH/simpleDocLit/SimpleDocLitServiceTestCase.java
Index: SimpleDocLitServiceTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/interop4/groupH/simpleDocLit/SimpleDocLitServiceTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleDocLitServiceTestCase.java 1 Oct 2003 10:17:56 -0000 1.6
+++ SimpleDocLitServiceTestCase.java 15 Oct 2004 16:42:17 -0000 1.7
@@ -43,9 +43,9 @@
// Test operation
try {
- binding.echoEmptyFault(new _echoEmptyFaultRequest());
+ binding.echoEmptyFault(new EchoEmptyFaultRequest());
}
- catch (_EmptyPart e1) {
+ catch (EmptyPart e1) {
return; // success!
}
@@ -122,8 +122,8 @@
String stringParam = "HELLO";
for (int i=1; i < 4; i++) {
try {
- _echoMultipleFaults1Request request =
- new _echoMultipleFaults1Request();
+ EchoMultipleFaults1Request request =
+ new EchoMultipleFaults1Request();
request.setWhichFault(i);
request.setParam1(stringParam);
request.setParam2(new ArrayOfFloat(floatParam));
@@ -142,7 +142,7 @@
assertEquals("HELLO", e2.getPart2());
continue;
}
- catch (_EmptyPart e3) {
+ catch (EmptyPart e3) {
assertEquals("Wrong fault thrown: " + e3.getClass(), 1, i);
continue;
}
@@ -169,8 +169,8 @@
float floatParam = 9.7F;
for (int i=1; i < 4; i++) {
try {
- _echoMultipleFaults2Request request =
- new _echoMultipleFaults2Request();
+ EchoMultipleFaults2Request request =
+ new EchoMultipleFaults2Request();
request.setWhichFault(i);
request.setParam1(stringParam);
request.setParam2(floatParam);
@@ -217,8 +217,8 @@
String param2 = "Param2";
for (int i=1; i < 3; i++) {
try {
- _echoMultipleFaults3Request request =
- new _echoMultipleFaults3Request();
+ EchoMultipleFaults3Request request =
+ new EchoMultipleFaults3Request();
request.setWhichFault(i);
request.setParam1(param1);
request.setParam2(param2);
@@ -256,8 +256,8 @@
Enum enumParam = new Enum(1);
for (int i=1; i < 3; i++) {
try {
- _echoMultipleFaults4Request request =
- new _echoMultipleFaults4Request();
+ EchoMultipleFaults4Request request =
+ new EchoMultipleFaults4Request();
request.setWhichFault(i);
request.setParam1(intParam);
request.setParam2(enumParam);
1.4 +9 -9 ws-axis/java/test/wsdl/interop4/groupH/simpleDocLit/SimpleDocLitBindingImpl.java
Index: SimpleDocLitBindingImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/interop4/groupH/simpleDocLit/SimpleDocLitBindingImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleDocLitBindingImpl.java 1 Mar 2003 01:31:03 -0000 1.3
+++ SimpleDocLitBindingImpl.java 15 Oct 2004 16:42:17 -0000 1.4
@@ -8,30 +8,30 @@
package test.wsdl.interop4.groupH.simpleDocLit;
public class SimpleDocLitBindingImpl implements test.wsdl.interop4.groupH.simpleDocLit.SimpleDocLitPortType{
- public test.wsdl.interop4.groupH.simpleDocLit._echoEmptyFaultResponse echoEmptyFault(test.wsdl.interop4.groupH.simpleDocLit._echoEmptyFaultRequest param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit._EmptyPart {
- throw new _EmptyPart();
+ public test.wsdl.interop4.groupH.simpleDocLit.EchoEmptyFaultResponse echoEmptyFault(test.wsdl.interop4.groupH.simpleDocLit.EchoEmptyFaultRequest param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.EmptyPart {
+ throw new EmptyPart();
}
- public test.wsdl.interop4.groupH.simpleDocLit._echoStringFaultResponse echoStringFault(String param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.StringFault {
+ public test.wsdl.interop4.groupH.simpleDocLit.EchoStringFaultResponse echoStringFault(String param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.StringFault {
throw new StringFault(param);
}
- public test.wsdl.interop4.groupH.simpleDocLit._echoIntArrayFaultResponse echoIntArrayFault(test.wsdl.interop4.groupH.simpleDocLit.ArrayOfInt param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.ArrayOfInt {
+ public test.wsdl.interop4.groupH.simpleDocLit.EchoIntArrayFaultResponse echoIntArrayFault(test.wsdl.interop4.groupH.simpleDocLit.ArrayOfInt param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.ArrayOfInt {
throw param;
}
- public test.wsdl.interop4.groupH.simpleDocLit._echoMultipleFaults1Response echoMultipleFaults1(test.wsdl.interop4.groupH.simpleDocLit._echoMultipleFaults1Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.ArrayOfFloat, test.wsdl.interop4.groupH.simpleDocLit.StringFault, test.wsdl.interop4.groupH.simpleDocLit._EmptyPart {
+ public test.wsdl.interop4.groupH.simpleDocLit.EchoMultipleFaults1Response echoMultipleFaults1(test.wsdl.interop4.groupH.simpleDocLit.EchoMultipleFaults1Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.ArrayOfFloat, test.wsdl.interop4.groupH.simpleDocLit.StringFault, test.wsdl.interop4.groupH.simpleDocLit.EmptyPart {
switch (param.getWhichFault()) {
case 2:
throw new StringFault(param.getParam1());
case 3:
throw new ArrayOfFloat(param.getParam2().getValue());
default:
- throw new _EmptyPart();
+ throw new EmptyPart();
}
}
- public test.wsdl.interop4.groupH.simpleDocLit._echoMultipleFaults2Response echoMultipleFaults2(test.wsdl.interop4.groupH.simpleDocLit._echoMultipleFaults2Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.ArrayOfString, test.wsdl.interop4.groupH.simpleDocLit.FloatFault, test.wsdl.interop4.groupH.simpleDocLit.StringFault {
+ public test.wsdl.interop4.groupH.simpleDocLit.EchoMultipleFaults2Response echoMultipleFaults2(test.wsdl.interop4.groupH.simpleDocLit.EchoMultipleFaults2Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.ArrayOfString, test.wsdl.interop4.groupH.simpleDocLit.FloatFault, test.wsdl.interop4.groupH.simpleDocLit.StringFault {
switch (param.getWhichFault()) {
case 2:
throw new StringFault(param.getParam1());
@@ -42,7 +42,7 @@
}
}
- public test.wsdl.interop4.groupH.simpleDocLit._echoMultipleFaults3Response echoMultipleFaults3(test.wsdl.interop4.groupH.simpleDocLit._echoMultipleFaults3Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.String2Fault, test.wsdl.interop4.groupH.simpleDocLit.StringFault {
+ public test.wsdl.interop4.groupH.simpleDocLit.EchoMultipleFaults3Response echoMultipleFaults3(test.wsdl.interop4.groupH.simpleDocLit.EchoMultipleFaults3Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.String2Fault, test.wsdl.interop4.groupH.simpleDocLit.StringFault {
switch (param.getWhichFault()) {
case 2:
throw new String2Fault(param.getParam2());
@@ -51,7 +51,7 @@
}
}
- public test.wsdl.interop4.groupH.simpleDocLit._echoMultipleFaults4Response echoMultipleFaults4(test.wsdl.interop4.groupH.simpleDocLit._echoMultipleFaults4Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.EnumFault, test.wsdl.interop4.groupH.simpleDocLit.IntFault {
+ public test.wsdl.interop4.groupH.simpleDocLit.EchoMultipleFaults4Response echoMultipleFaults4(test.wsdl.interop4.groupH.simpleDocLit.EchoMultipleFaults4Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.simpleDocLit.EnumFault, test.wsdl.interop4.groupH.simpleDocLit.IntFault {
switch (param.getWhichFault()) {
case 2:
throw new EnumFault(param.getParam2());
1.5 +1 -1 ws-axis/java/test/wsdl/omit/OmitImpl.java
Index: OmitImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/omit/OmitImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OmitImpl.java 25 Feb 2004 14:03:04 -0000 1.4
+++ OmitImpl.java 15 Oct 2004 16:42:17 -0000 1.5
@@ -23,7 +23,7 @@
package test.wsdl.omit;
public class OmitImpl implements test.wsdl.omit.Omit {
- public test.wsdl.omit._Phone echoPhone(test.wsdl.omit._Phone in) throws java.rmi.RemoteException {
+ public test.wsdl.omit.Phone echoPhone(test.wsdl.omit.Phone in) throws java.rmi.RemoteException {
return in;
}
1.6 +2 -2 ws-axis/java/test/wsdl/omit/OmitTestCase.java
Index: OmitTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/omit/OmitTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OmitTestCase.java 25 Feb 2004 14:03:04 -0000 1.5
+++ OmitTestCase.java 15 Oct 2004 16:42:17 -0000 1.6
@@ -48,11 +48,11 @@
assertTrue("binding is null", binding != null);
try {
- test.wsdl.omit._Phone input = new test.wsdl.omit._Phone();
+ test.wsdl.omit.Phone input = new test.wsdl.omit.Phone();
input.setPrefix("555");
input.setNumber("1212");
- test.wsdl.omit._Phone out = binding.echoPhone(input);
+ test.wsdl.omit.Phone out = binding.echoPhone(input);
// TODO: Verify the XML omitted the element
assertNotNull("The return value from the operation was null", out);
1.2 +2 -2 ws-axis/java/test/wsdl/attrGroup/AttrGroupServiceTestCase.java
Index: AttrGroupServiceTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/attrGroup/AttrGroupServiceTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttrGroupServiceTestCase.java 28 Oct 2003 17:44:30 -0000 1.1
+++ AttrGroupServiceTestCase.java 15 Oct 2004 16:42:17 -0000 1.2
@@ -18,7 +18,7 @@
// so, basically, if this compiles, we are good to go
// but running it won't hurt anything
- test.wsdl.attrGroup._Record1 rec1 = new test.wsdl.attrGroup._Record1();
+ test.wsdl.attrGroup.Record1 rec1 = new test.wsdl.attrGroup.Record1();
// an element defined within Record1
rec1.setElem1(1);
@@ -36,7 +36,7 @@
rec1.setId(new org.apache.axis.types.Id("theId"));
rec1.setHref(new org.apache.axis.types.URI("a", "b"));
- test.wsdl.attrGroup._Record2 rec2 = new test.wsdl.attrGroup._Record2();
+ test.wsdl.attrGroup.Record2 rec2 = new test.wsdl.attrGroup.Record2();
// an element defined within Record2
rec2.setElem2("2");
1.7 +2 -2 ws-axis/java/test/wsdl/interop4/groupi/Round4XSDTestSoapImpl.java
Index: Round4XSDTestSoapImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/interop4/groupi/Round4XSDTestSoapImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Round4XSDTestSoapImpl.java 17 Nov 2003 15:14:03 -0000 1.6
+++ Round4XSDTestSoapImpl.java 15 Oct 2004 16:42:17 -0000 1.7
@@ -104,8 +104,8 @@
return inputAnyType;
}
- public test.wsdl.interop4.groupi.__echoAnyElementResponse_return echoAnyElement(test.wsdl.interop4.groupi.__echoAnyElement_inputAny inputAny) throws java.rmi.RemoteException {
- test.wsdl.interop4.groupi.__echoAnyElementResponse_return output = new test.wsdl.interop4.groupi.__echoAnyElementResponse_return();
+ public test.wsdl.interop4.groupi.EchoAnyElementResponseReturn echoAnyElement(test.wsdl.interop4.groupi.EchoAnyElementInputAny inputAny) throws java.rmi.RemoteException {
+ test.wsdl.interop4.groupi.EchoAnyElementResponseReturn output = new test.wsdl.interop4.groupi.EchoAnyElementResponseReturn();
output.set_any(inputAny.get_any());
return output;
}
1.9 +2 -2 ws-axis/java/test/wsdl/interop4/groupi/Round4XSDTestTestCase.java
Index: Round4XSDTestTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/interop4/groupi/Round4XSDTestTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Round4XSDTestTestCase.java 25 Nov 2003 06:07:03 -0000 1.8
+++ Round4XSDTestTestCase.java 15 Oct 2004 16:42:17 -0000 1.9
@@ -573,11 +573,11 @@
assertTrue("binding is null", binding != null);
try {
- test.wsdl.interop4.groupi.__echoAnyElement_inputAny input = new test.wsdl.interop4.groupi.__echoAnyElement_inputAny();
+ test.wsdl.interop4.groupi.EchoAnyElementInputAny input = new test.wsdl.interop4.groupi.EchoAnyElementInputAny();
org.apache.axis.message.MessageElement [] _any = new org.apache.axis.message.MessageElement [1];
_any[0] = new org.apache.axis.message.MessageElement("hello", "world");
input.set_any(_any);
- test.wsdl.interop4.groupi.__echoAnyElementResponse_return value = null;
+ test.wsdl.interop4.groupi.EchoAnyElementResponseReturn value = null;
value = binding.echoAnyElement(input);
assertEquals(value.get_any()[0].getQName(), _any[0].getQName());
}
1.23 +2 -2 ws-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java
Index: ExtensibilityQueryBindingImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ExtensibilityQueryBindingImpl.java 29 Jul 2004 21:40:29 -0000 1.22
+++ ExtensibilityQueryBindingImpl.java 15 Oct 2004 16:42:17 -0000 1.23
@@ -51,7 +51,7 @@
queryResult[i].setQueryType(new QName("urn:QueryType","BookQuery"));
}
resultList.setResult(queryResult);
- QName elementName = _QueryResultElement.getTypeDesc().getFields()[0].getXmlName();
+ QName elementName = QueryResultElement.getTypeDesc().getFields()[0].getXmlName();
MessageElement me = new MessageElement(elementName.getNamespaceURI(), elementName.getLocalPart(), resultList);
log.debug("Outgoing message: " + me.toString());
result.set_any(new MessageElement [] { me });
@@ -106,7 +106,7 @@
BookType book = new BookType();
book.setSubject("gotAll");
- QName elementName = _FindBooksQueryExpressionElement.getTypeDesc().getFields()[0].getXmlName();
+ QName elementName = FindBooksQueryExpressionElement.getTypeDesc().getFields()[0].getXmlName();
replyElements[0] = new MessageElement(elementName.getNamespaceURI(), elementName.getLocalPart(), book);
replyElements[1] = new MessageElement(new Text("ABCD"));
1.25 +2 -2 ws-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java
Index: ExtensibilityQueryTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ExtensibilityQueryTestCase.java 27 Jul 2004 21:56:16 -0000 1.24
+++ ExtensibilityQueryTestCase.java 15 Oct 2004 16:42:18 -0000 1.25
@@ -55,7 +55,7 @@
ExtensibilityType expression = new ExtensibilityType();
BookType book = new BookType();
book.setSubject("all");
- QName elementName = _FindBooksQueryExpressionElement.getTypeDesc().getFields()[0].getXmlName();
+ QName elementName = FindBooksQueryExpressionElement.getTypeDesc().getFields()[0].getXmlName();
MessageElement el = new MessageElement(elementName.getNamespaceURI(), elementName.getLocalPart(), book);
expression.set_any(new MessageElement [] { el });
// call the operation
@@ -102,7 +102,7 @@
BookType book = new BookType();
book.setSubject("all");
- QName elementName = _FindBooksQueryExpressionElement.getTypeDesc().getFields()[0].getXmlName();
+ QName elementName = FindBooksQueryExpressionElement.getTypeDesc().getFields()[0].getXmlName();
elements[2] = new MessageElement(elementName.getNamespaceURI(), elementName.getLocalPart(), book);
elements[3] = new MessageElement(new Text("789"));
1.45 +2 -2 ws-axis/java/test/wsdl/types/VerifyTestCase.java
Index: VerifyTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/types/VerifyTestCase.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- VerifyTestCase.java 17 Aug 2004 03:41:29 -0000 1.44
+++ VerifyTestCase.java 15 Oct 2004 16:42:18 -0000 1.45
@@ -49,7 +49,7 @@
import test.wsdl.types.comprehensive_types.PersionCat;
import test.wsdl.types.comprehensive_types.Time;
import test.wsdl.types.comprehensive_types.Yarn;
-import test.wsdl.types.comprehensive_types._complexWComplex_stock_quote;
+import test.wsdl.types.comprehensive_types.ComplexWComplexStock_quote;
import test.wsdl.types.comprehensive_types.holders.AnimalHolder;
import test.wsdl.types.comprehensive_types.holders.ArrayHolder;
import test.wsdl.types.comprehensive_types.holders.ArrayMHolder;
@@ -399,7 +399,7 @@
A a = new A();
a.setC(3);
b.setD(a);
- _complexWComplex_stock_quote stockQuote = new _complexWComplex_stock_quote();
+ ComplexWComplexStock_quote stockQuote = new ComplexWComplexStock_quote();
Time time = new Time();
time.setDST(false);
stockQuote.setTime(time);
1.2 +3 -3 ws-axis/java/test/wsdl/wrapperHolder/ExampleSoapTestCase.java
Index: ExampleSoapTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/wrapperHolder/ExampleSoapTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExampleSoapTestCase.java 18 Aug 2004 11:39:16 -0000 1.1
+++ ExampleSoapTestCase.java 15 Oct 2004 16:42:18 -0000 1.2
@@ -17,8 +17,8 @@
public void testWrapperHolderWSDL() throws Exception {
javax.xml.rpc.ServiceFactory serviceFactory = javax.xml.rpc.ServiceFactory.newInstance();
- java.net.URL url = new java.net.URL(new test.wsdl.wrapperHolder.DoExampleLocator().getWrapperHolderAddress() + "?WSDL");
- javax.xml.rpc.Service service = serviceFactory.createService(url, new test.wsdl.wrapperHolder.DoExampleLocator().getServiceName());
+ java.net.URL url = new java.net.URL(new test.wsdl.wrapperHolder.DoExample_ServiceLocator().getWrapperHolderAddress() + "?WSDL");
+ javax.xml.rpc.Service service = serviceFactory.createService(url, new test.wsdl.wrapperHolder.DoExample_ServiceLocator().getServiceName());
assertTrue(service != null);
}
@@ -26,7 +26,7 @@
test.wsdl.wrapperHolder.ExampleSoapStub binding;
try {
binding = (test.wsdl.wrapperHolder.ExampleSoapStub)
- new test.wsdl.wrapperHolder.DoExampleLocator().getWrapperHolder();
+ new test.wsdl.wrapperHolder.DoExample_ServiceLocator().getWrapperHolder();
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
1.10 +3 -3 ws-axis/java/test/wsdl/addrNoImplSEI/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/addrNoImplSEI/Main.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Main.java 25 Feb 2004 14:03:02 -0000 1.9
+++ Main.java 15 Oct 2004 16:42:18 -0000 1.10
@@ -32,12 +32,12 @@
public class Main {
static String name1;
static Address addr1;
- static _Phone phone1;
+ static Phone phone1;
static {
name1 = "Purdue Boilermaker";
addr1 = new Address();
- phone1 = new _Phone();
+ phone1 = new Phone();
addr1.setStreetNum(1);
addr1.setStreetName("University Drive");
addr1.setCity("West Lafayette");
@@ -58,7 +58,7 @@
ad.getStreetName());
System.err.println ("\t" + ad.getCity() + ", " + ad.getState() + " " +
ad.getZip());
- _Phone ph = ad.getPhone();
+ Phone ph = ad.getPhone();
System.err.println ("\tPhone: (" + ph.getAreaCode() + ") " +
ph.getExchange() + "-" + ph.getNumber());
}
1.5 +6 -6 ws-axis/java/test/wsdl/addrNoImplSEI/AddressBookDynamicProxyTestCase.java
Index: AddressBookDynamicProxyTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/addrNoImplSEI/AddressBookDynamicProxyTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddressBookDynamicProxyTestCase.java 15 Jun 2004 16:05:20 -0000 1.4
+++ AddressBookDynamicProxyTestCase.java 15 Oct 2004 16:42:18 -0000 1.5
@@ -62,10 +62,10 @@
new QName("urn:AddrNoImplSEI", "Address"),
new org.apache.axis.encoding.ser.BeanSerializerFactory(test.wsdl.addrNoImplSEI.Address.class, new QName("urn:AddrNoImplSEI", "Address")),
new org.apache.axis.encoding.ser.BeanDeserializerFactory(test.wsdl.addrNoImplSEI.Address.class, new QName("urn:AddrNoImplSEI", "Address")));
- map.register(test.wsdl.addrNoImplSEI._Phone.class,
- new QName("urn:AddrNoImplSEI", "_Phone"),
- new org.apache.axis.encoding.ser.BeanSerializerFactory(test.wsdl.addrNoImplSEI._Phone.class, new QName("urn:AddrNoImplSEI", "_Phone")),
- new org.apache.axis.encoding.ser.BeanDeserializerFactory(test.wsdl.addrNoImplSEI._Phone.class, new QName("urn:AddrNoImplSEI", "_Phone")));
+ map.register(test.wsdl.addrNoImplSEI.Phone.class,
+ new QName("urn:AddrNoImplSEI", ">Phone"),
+ new org.apache.axis.encoding.ser.BeanSerializerFactory(test.wsdl.addrNoImplSEI.Phone.class, new QName("urn:AddrNoImplSEI", ">Phone")),
+ new org.apache.axis.encoding.ser.BeanDeserializerFactory(test.wsdl.addrNoImplSEI.Phone.class, new QName("urn:AddrNoImplSEI", ">Phone")));
map.register(test.wsdl.addrNoImplSEI.StateType.class,
new QName("urn:AddrNoImplSEI", "StateType"),
new org.apache.axis.encoding.ser.EnumSerializerFactory(test.wsdl.addrNoImplSEI.StateType.class, new QName("urn:AddrNoImplSEI", "StateType")),
@@ -78,11 +78,11 @@
String name1;
Address addr1;
- _Phone phone1;
+ Phone phone1;
name1 = "Purdue Boilermaker";
addr1 = new Address();
- phone1 = new _Phone();
+ phone1 = new Phone();
addr1.setStreetNum(1);
addr1.setStreetName("University Drive");
addr1.setCity("West Lafayette");
1.12 +6 -6 ws-axis/java/test/wsdl/nested/Nested2ServiceTestCase.java
Index: Nested2ServiceTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/nested/Nested2ServiceTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Nested2ServiceTestCase.java 15 Dec 2003 14:38:00 -0000 1.11
+++ Nested2ServiceTestCase.java 15 Oct 2004 16:42:18 -0000 1.12
@@ -7,8 +7,8 @@
package test.wsdl.nested;
import org.apache.axis.message.MessageElement;
-import test.wsdl.nested.holders._PE_ADDRESSHolder;
-import test.wsdl.nested.holders._RETURNHolder;
+import test.wsdl.nested.holders.PE_ADDRESSHolder;
+import test.wsdl.nested.holders.RETURNHolder;
public class Nested2ServiceTestCase extends junit.framework.TestCase {
public Nested2ServiceTestCase(String name) {
@@ -35,8 +35,8 @@
assertTrue("binding is null", binding != null);
try {
- _PE_ADDRESSHolder pE_ADDRESS = new _PE_ADDRESSHolder();
- _RETURNHolder rETURN = new _RETURNHolder();
+ PE_ADDRESSHolder pE_ADDRESS = new PE_ADDRESSHolder();
+ RETURNHolder rETURN = new RETURNHolder();
binding.nestedSvc2(new java.lang.String("0000001000"),
new java.lang.String("01"),
new java.lang.String("00"),
@@ -44,8 +44,8 @@
new java.lang.String("1000"),
pE_ADDRESS,
rETURN);
- _PE_ADDRESS address = pE_ADDRESS.value;
- _RETURN ret = rETURN.value;
+ PE_ADDRESS address = pE_ADDRESS.value;
+ RETURN ret = rETURN.value;
assertTrue("NAME is wrong", address.getNAME().equals("Becker Berlin"));
assertTrue("LOGMSGNO is wrong", ret.getLOG_MSG_NO().equals("123456"));
MessageElement [] any = address.get_any();
1.9 +6 -6 ws-axis/java/test/wsdl/nested/Nested2BindingImpl.java
Index: Nested2BindingImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/nested/Nested2BindingImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Nested2BindingImpl.java 1 Mar 2003 01:31:03 -0000 1.8
+++ Nested2BindingImpl.java 15 Oct 2004 16:42:18 -0000 1.9
@@ -7,14 +7,14 @@
package test.wsdl.nested;
import org.apache.axis.message.MessageElement;
-import test.wsdl.nested.holders._PE_ADDRESSHolder;
-import test.wsdl.nested.holders._RETURNHolder;
+import test.wsdl.nested.holders.PE_ADDRESSHolder;
+import test.wsdl.nested.holders.RETURNHolder;
import javax.xml.namespace.QName;
public class Nested2BindingImpl implements test.wsdl.nested.Nested2PortType {
- public void nestedSvc2(java.lang.String cUSTOMERNO, java.lang.String pIDISTRCHAN, java.lang.String pIDIVISION, java.lang.String pIPASSBUFFER, java.lang.String pISALESORG, _PE_ADDRESSHolder _PE_ADDRESS, _RETURNHolder rETURN) throws java.rmi.RemoteException {
- _PE_ADDRESS address = new _PE_ADDRESS();
+ public void nestedSvc2(java.lang.String cUSTOMERNO, java.lang.String pIDISTRCHAN, java.lang.String pIDIVISION, java.lang.String pIPASSBUFFER, java.lang.String pISALESORG, PE_ADDRESSHolder PE_ADDRESS, RETURNHolder rETURN) throws java.rmi.RemoteException {
+ PE_ADDRESS address = new PE_ADDRESS();
address.setFORM_OF_AD("Company");
address.setFIRST_NAME("");
address.setNAME("Becker Berlin");
@@ -42,7 +42,7 @@
"Test Any");
address.set_any(new MessageElement [] { me });
- _RETURN ret = new _RETURN();
+ RETURN ret = new RETURN();
ret.setTYPE("");
ret.setCODE("");
ret.setMESSAGE("");
@@ -53,7 +53,7 @@
ret.setMESSAGE_V3("");
ret.setMESSAGE_V4("");
- _PE_ADDRESS.value = address;
+ PE_ADDRESS.value = address;
rETURN.value = ret;
}
1.7 +1 -1 ws-axis/java/test/wsdl/dataset/DataServiceTestCase.java
Index: DataServiceTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/dataset/DataServiceTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DataServiceTestCase.java 17 Nov 2003 15:14:02 -0000 1.6
+++ DataServiceTestCase.java 15 Oct 2004 16:42:18 -0000 1.7
@@ -33,7 +33,7 @@
try {
// Test operation
- test.wsdl.dataset.__GetTitleAuthorsResponse_GetTitleAuthorsResult value = null;
+ test.wsdl.dataset.GetTitleAuthorsResponseGetTitleAuthorsResult value = null;
value = binding.getTitleAuthors();
assertTrue(value != null);
// TBD - validate results
1.7 +4 -4 ws-axis/java/test/wsdl/interop4/groupH/complexDocLit/ComplexDocLitServiceTestCase.java
Index: ComplexDocLitServiceTestCase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/interop4/groupH/complexDocLit/ComplexDocLitServiceTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ComplexDocLitServiceTestCase.java 15 Dec 2003 14:37:59 -0000 1.6
+++ ComplexDocLitServiceTestCase.java 15 Oct 2004 16:42:18 -0000 1.7
@@ -164,8 +164,8 @@
for (int i = 1; i < 3; i++) {
try {
- _echoMultipleFaults1Request param =
- new _echoMultipleFaults1Request();
+ EchoMultipleFaults1Request param =
+ new EchoMultipleFaults1Request();
param.setWhichFault(i);
param.setParam1(struct);
param.setParam2(base);
@@ -226,8 +226,8 @@
// Test operation multiple times
for (int i = 1; i < 4; i++) {
try {
- _echoMultipleFaults2Request param =
- new _echoMultipleFaults2Request();
+ EchoMultipleFaults2Request param =
+ new EchoMultipleFaults2Request();
param.setWhichFault(i);
param.setParam1(base);
param.setParam2(extended);
1.4 +5 -5 ws-axis/java/test/wsdl/interop4/groupH/complexDocLit/ComplexDocLitBindingImpl.java
Index: ComplexDocLitBindingImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/wsdl/interop4/groupH/complexDocLit/ComplexDocLitBindingImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComplexDocLitBindingImpl.java 1 Mar 2003 01:31:03 -0000 1.3
+++ ComplexDocLitBindingImpl.java 15 Oct 2004 16:42:18 -0000 1.4
@@ -8,26 +8,26 @@
package test.wsdl.interop4.groupH.complexDocLit;
public class ComplexDocLitBindingImpl implements ComplexDocLitPortType{
- public _echoSOAPStructFaultResponse echoSOAPStructFault(SOAPStruct param) throws java.rmi.RemoteException, SOAPStructFault {
+ public EchoSOAPStructFaultResponse echoSOAPStructFault(SOAPStruct param) throws java.rmi.RemoteException, SOAPStructFault {
throw new SOAPStructFault(param);
}
- public _echoBaseStructFaultResponse echoBaseStructFault(BaseStruct param) throws java.rmi.RemoteException, BaseStruct {
+ public EchoBaseStructFaultResponse echoBaseStructFault(BaseStruct param) throws java.rmi.RemoteException, BaseStruct {
throw param;
}
- public _echoExtendedStructFaultResponse echoExtendedStructFault(ExtendedStruct param) throws java.rmi.RemoteException, ExtendedStruct {
+ public EchoExtendedStructFaultResponse echoExtendedStructFault(ExtendedStruct param) throws java.rmi.RemoteException, ExtendedStruct {
throw param;
}
- public _echoMultipleFaults1Response echoMultipleFaults1(_echoMultipleFaults1Request param) throws java.rmi.RemoteException, BaseStruct, SOAPStructFault {
+ public EchoMultipleFaults1Response echoMultipleFaults1(EchoMultipleFaults1Request param) throws java.rmi.RemoteException, BaseStruct, SOAPStructFault {
if (param.getWhichFault() == 2) {
throw param.getParam2();
}
throw new SOAPStructFault(param.getParam1());
}
- public _echoMultipleFaults2Response echoMultipleFaults2(_echoMultipleFaults2Request param) throws java.rmi.RemoteException, MoreExtendedStruct, ExtendedStruct, BaseStruct {
+ public EchoMultipleFaults2Response echoMultipleFaults2(EchoMultipleFaults2Request param) throws java.rmi.RemoteException, MoreExtendedStruct, ExtendedStruct, BaseStruct {
if (param.getWhichFault() == 2) {
throw param.getParam2();
} else if (param.getWhichFault() == 3) {