jmsnell 2003/02/28 17:31:04
Modified: java/test/wsdl/dataset DataServiceTestCase.java
java/test/wsdl/extensibility ExtensibilityQueryTestCase.java
ExtensibilityQueryBindingImpl.java
java/test/wsdl/interop4/groupH/complexDocLit
ComplexDocLitBindingImpl.java
ComplexDocLitServiceTestCase.java
java/test/wsdl/interop4/groupH/simpleDocLit
SimpleDocLitServiceTestCase.java
SimpleDocLitBindingImpl.java
java/test/wsdl/interop4/groupi Round4XSDTestTestCase.java
Round4XSDTestSoapImpl.java
java/test/wsdl/qualify Qualify_ServiceTestCase.java
Qualify_BindingImpl.java
java/test/wsdl/omit OmitImpl.java OmitTestCase.java
java/src/org/apache/axis/wsdl/toJava
JavaGeneratorFactory.java
java/test/wsdl/nested Nested2ServiceTestCase.java
Nested2BindingImpl.java
java/test/wsdl/addrNoImplSEI Main.java
java/test/wsdl/types VerifyTestCase.java
Added: java/test/wsdl/refattr build._xml
Removed: java/test/wsdl/refattr build.xml
Log:
Refixing the bug that was causing WSDL2Java to generate
anonymous types and top level types with the same
file and class names.
Fixing the tests at the same time so Glen, Dims and Doug
don't have as much to complain about. :-)
Revision Changes Path
1.5 +1 -1 xml-axis/java/test/wsdl/dataset/DataServiceTestCase.java
Index: DataServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/dataset/DataServiceTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DataServiceTestCase.java 18 Jan 2003 21:08:56 -0000 1.4
+++ DataServiceTestCase.java 1 Mar 2003 01:31:02 -0000 1.5
@@ -33,7 +33,7 @@
try {
// Test operation
- test.wsdl.dataset.GetTitleAuthorsResult value = null;
+ test.wsdl.dataset._GetTitleAuthorsResponse_GetTitleAuthorsResult value
= null;
value = binding.getTitleAuthors();
assertTrue(value != null);
// TBD - validate results
1.15 +4 -4
xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java
Index: ExtensibilityQueryTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ExtensibilityQueryTestCase.java 11 Dec 2002 22:40:20 -0000 1.14
+++ ExtensibilityQueryTestCase.java 1 Mar 2003 01:31:03 -0000 1.15
@@ -53,7 +53,7 @@
try {
ExtensibilityType expression = new ExtensibilityType();
- FindBooksQueryExpressionElement bookQuery = new
FindBooksQueryExpressionElement();
+ _FindBooksQueryExpressionElement bookQuery = new
_FindBooksQueryExpressionElement();
BookType book = new BookType();
book.setSubject("all");
bookQuery.setBookQuery(book);
@@ -64,7 +64,7 @@
// validate results
MessageElement [] anyContent = any.get_any();
assertEquals(1, anyContent.length);
- QueryResultElement resEl = (QueryResultElement
)anyContent[0].getObjectValue();
+ _QueryResultElement resEl = (_QueryResultElement
)anyContent[0].getObjectValue();
assertNotNull("QueryResultElement back from
anyContent[0].getObjectValue()", resEl);
ResultListType result = resEl.getResultList();
assertNotNull("ResultListType back from getResultList()", result);
@@ -91,11 +91,11 @@
private void addDynamicTypeMappings(AxisEngine engine) throws Exception {
TypeMappingRegistry registry = engine.getTypeMappingRegistry();
TypeMapping mapping = registry.createTypeMapping();
- addBeanMapping(mapping, "FindBooksQueryExpressionElement",
FindBooksQueryExpressionElement.class);
+ addBeanMapping(mapping, "FindBooksQueryExpressionElement",
_FindBooksQueryExpressionElement.class);
addBeanMapping(mapping, "BookType", BookType.class);
addBeanMapping(mapping, "ResultListType", ResultListType.class);
addBeanMapping(mapping, "QueryResultType", QueryResultType.class);
- addBeanMapping(mapping, "QueryResultElement", QueryResultElement.class);
+ addBeanMapping(mapping, "QueryResultElement", _QueryResultElement.class);
registry.register("",mapping);
EngineConfiguration config = engine.getConfig();
config.writeEngineConfig(engine);
1.17 +3 -3
xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java
Index: ExtensibilityQueryBindingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ExtensibilityQueryBindingImpl.java 11 Dec 2002 22:40:20 -0000 1.16
+++ ExtensibilityQueryBindingImpl.java 1 Mar 2003 01:31:03 -0000 1.17
@@ -41,13 +41,13 @@
public ExtensibilityType query(ExtensibilityType query) throws RemoteException {
ExtensibilityType result = new ExtensibilityType();
Object obj = query.get_any()[0].getObjectValue();
- if (obj instanceof FindBooksQueryExpressionElement) {
- BookType bookQuery =
((FindBooksQueryExpressionElement)obj).getBookQuery();
+ if (obj instanceof _FindBooksQueryExpressionElement) {
+ BookType bookQuery =
((_FindBooksQueryExpressionElement)obj).getBookQuery();
String subject = bookQuery.getSubject();
if (!"all".equals(subject)) {
throw new RemoteException("ExtensibilityQueryBindingImpl: Book
subject query should be all, instead was " + subject);
}
- QueryResultElement resultElement = new QueryResultElement();
+ _QueryResultElement resultElement = new _QueryResultElement();
ResultListType resultList = new ResultListType();
resultElement.setResultList(resultList);
QueryResultType[] queryResult = new QueryResultType[books.length];
1.3 +5 -5
xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/ComplexDocLitBindingImpl.java
Index: ComplexDocLitBindingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/ComplexDocLitBindingImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComplexDocLitBindingImpl.java 8 Oct 2002 03:31:34 -0000 1.2
+++ ComplexDocLitBindingImpl.java 1 Mar 2003 01:31:03 -0000 1.3
@@ -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) {
1.4 +4 -4
xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/ComplexDocLitServiceTestCase.java
Index: ComplexDocLitServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/ComplexDocLitServiceTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComplexDocLitServiceTestCase.java 6 Nov 2002 17:23:17 -0000 1.3
+++ ComplexDocLitServiceTestCase.java 1 Mar 2003 01:31:03 -0000 1.4
@@ -154,8 +154,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);
@@ -216,8 +216,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 +11 -11
xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/SimpleDocLitServiceTestCase.java
Index: SimpleDocLitServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/SimpleDocLitServiceTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleDocLitServiceTestCase.java 6 Nov 2002 17:23:17 -0000 1.3
+++ SimpleDocLitServiceTestCase.java 1 Mar 2003 01:31:03 -0000 1.4
@@ -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.3 +9 -9
xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/SimpleDocLitBindingImpl.java
Index: SimpleDocLitBindingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/SimpleDocLitBindingImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleDocLitBindingImpl.java 8 Oct 2002 03:31:35 -0000 1.2
+++ SimpleDocLitBindingImpl.java 1 Mar 2003 01:31:03 -0000 1.3
@@ -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.6 +2 -2
xml-axis/java/test/wsdl/interop4/groupi/Round4XSDTestTestCase.java
Index: Round4XSDTestTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop4/groupi/Round4XSDTestTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Round4XSDTestTestCase.java 11 Dec 2002 22:40:21 -0000 1.5
+++ Round4XSDTestTestCase.java 1 Mar 2003 01:31:03 -0000 1.6
@@ -573,11 +573,11 @@
assertTrue("binding is null", binding != null);
try {
- test.wsdl.interop4.groupi.InputAny input = new
test.wsdl.interop4.groupi.InputAny();
+ test.wsdl.interop4.groupi._echoAnyElement_inputAny input = new
test.wsdl.interop4.groupi._echoAnyElement_inputAny();
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._return value = null;
+ test.wsdl.interop4.groupi._echoAnyElementResponse_return value = null;
value = binding.echoAnyElement(input);
assertEquals(value.get_any()[0].toString(), _any[0].toString());
}
1.5 +2 -2
xml-axis/java/test/wsdl/interop4/groupi/Round4XSDTestSoapImpl.java
Index: Round4XSDTestSoapImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop4/groupi/Round4XSDTestSoapImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Round4XSDTestSoapImpl.java 11 Dec 2002 22:40:21 -0000 1.4
+++ Round4XSDTestSoapImpl.java 1 Mar 2003 01:31:03 -0000 1.5
@@ -104,8 +104,8 @@
return inputAnyType;
}
- public test.wsdl.interop4.groupi._return
echoAnyElement(test.wsdl.interop4.groupi.InputAny inputAny) throws
java.rmi.RemoteException {
- test.wsdl.interop4.groupi._return output = new
test.wsdl.interop4.groupi._return();
+ 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();
output.set_any(inputAny.get_any());
return output;
}
1.6 +2 -2 xml-axis/java/test/wsdl/qualify/Qualify_ServiceTestCase.java
Index: Qualify_ServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify/Qualify_ServiceTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Qualify_ServiceTestCase.java 11 Dec 2002 22:40:22 -0000 1.5
+++ Qualify_ServiceTestCase.java 1 Mar 2003 01:31:03 -0000 1.6
@@ -149,8 +149,8 @@
assertTrue("binding is null", binding != null);
try {
- Response value = null;
- Complex arg = new Complex();
+ _FormOverrideResponse_response value = null;
+ _FormOverride_complex arg = new _FormOverride_complex();
arg.setName("Timmah");
value = binding.formOverride(arg);
1.6 +2 -2 xml-axis/java/test/wsdl/qualify/Qualify_BindingImpl.java
Index: Qualify_BindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify/Qualify_BindingImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Qualify_BindingImpl.java 11 Dec 2002 22:40:22 -0000 1.5
+++ Qualify_BindingImpl.java 1 Mar 2003 01:31:03 -0000 1.6
@@ -118,7 +118,7 @@
return "Hello there: " + name;
}
- public test.wsdl.qualify.Response formOverride(test.wsdl.qualify.Complex
complex) throws java.rmi.RemoteException {
+ public test.wsdl.qualify._FormOverrideResponse_response
formOverride(test.wsdl.qualify._FormOverride_complex complex) throws
java.rmi.RemoteException {
// Validate XML request to make sure elements are properly qualified
// or not per the WSDL
MessageContext mc = MessageContext.getCurrentContext();
@@ -171,7 +171,7 @@
}
// Return a response (which the client will validate)
- test.wsdl.qualify.Response r = new Response();
+ test.wsdl.qualify._FormOverrideResponse_response r = new
_FormOverrideResponse_response();
r.setName("Tommy");
return r;
}
1.2 +1 -1 xml-axis/java/test/wsdl/omit/OmitImpl.java
Index: OmitImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/omit/OmitImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OmitImpl.java 30 May 2002 18:55:21 -0000 1.1
+++ OmitImpl.java 1 Mar 2003 01:31:03 -0000 1.2
@@ -62,7 +62,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.3 +2 -2 xml-axis/java/test/wsdl/omit/OmitTestCase.java
Index: OmitTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/omit/OmitTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OmitTestCase.java 22 Jul 2002 19:15:59 -0000 1.2
+++ OmitTestCase.java 1 Mar 2003 01:31:03 -0000 1.3
@@ -87,11 +87,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.37 +29 -7
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Index: JavaGeneratorFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- JavaGeneratorFactory.java 28 Feb 2003 15:32:34 -0000 1.36
+++ JavaGeneratorFactory.java 1 Mar 2003 01:31:03 -0000 1.37
@@ -377,13 +377,35 @@
// unique qnames for anonymous types.
// Only consider the localName after the last '>'
// when generating the java name
- String localName = typeQName.getLocalPart();
- localName =
- localName.substring(
- localName.lastIndexOf(
- SymbolTable.ANON_TOKEN)+1);
- typeQName = new QName(typeQName.getNamespaceURI(),
- localName);
+
+
+// String localName = typeQName.getLocalPart();
+// localName =
+// localName.substring(
+// localName.lastIndexOf(
+// SymbolTable.ANON_TOKEN)+1);
+// typeQName = new QName(typeQName.getNamespaceURI(),
+// localName);
+
+ String localName = typeQName.getLocalPart();
+
+ // Check to see if this is an anonymous type,
+ // if it is, replace Axis' ANON_TOKEN with
+ // an underscore to make sure we don't run
+ // into name collisions with similarly named
+ // non-anonymous types
+ StringBuffer sb = new StringBuffer(localName);
+ int aidx = -1;
+ while (
+ (aidx = sb.toString().indexOf(
+ SymbolTable.ANON_TOKEN)) > -1) {
+ sb.replace(aidx,
aidx+SymbolTable.ANON_TOKEN.length(), "_");
+ }
+ localName = sb.toString();
+
+ typeQName = new QName(typeQName.getNamespaceURI(),
+ localName);
+
// If there is already an existing type,
// there will be a collision.
// If there is an existing anon type,
1.9 +6 -6 xml-axis/java/test/wsdl/nested/Nested2ServiceTestCase.java
Index: Nested2ServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/nested/Nested2ServiceTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Nested2ServiceTestCase.java 11 Dec 2002 22:40:21 -0000 1.8
+++ Nested2ServiceTestCase.java 1 Mar 2003 01:31:03 -0000 1.9
@@ -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) {
@@ -25,8 +25,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"),
@@ -34,8 +34,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.8 +6 -6 xml-axis/java/test/wsdl/nested/Nested2BindingImpl.java
Index: Nested2BindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/nested/Nested2BindingImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Nested2BindingImpl.java 11 Dec 2002 22:40:21 -0000 1.7
+++ Nested2BindingImpl.java 1 Mar 2003 01:31:03 -0000 1.8
@@ -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.1 xml-axis/java/test/wsdl/refattr/build._xml
Index: build._xml
===================================================================
<?xml version="1.0" ?>
<!DOCTYPE project [
<!ENTITY properties SYSTEM "file:../../../xmls/properties.xml">
<!ENTITY paths SYSTEM "file:../../../xmls/path_refs.xml">
<!ENTITY taskdefs SYSTEM "file:../../../xmls/taskdefs.xml">
<!ENTITY taskdefs_post_compile SYSTEM
"file:../../../xmls/taskdefs_post_compile.xml">
<!ENTITY targets SYSTEM "file:../../../xmls/targets.xml">
]>
<!-- ===================================================================
<description>
Test/Sample Component file for Axis
Notes:
This is a build file for use with the Jakarta Ant build tool.
Prerequisites:
jakarta-ant from http://jakarta.apache.org
Build Instructions:
To compile
ant compile
To execute
ant run
Author:
Matt Seibert [EMAIL PROTECTED]
Copyright:
Copyright (c) 2002-2003 Apache Software Foundation.
</description>
==================================================================== -->
<project default="compile">
<property name="axis.home" location="../../.." />
<property name="componentName" value="test/wsdl/refattr" />
&properties;
&paths;
&taskdefs;
&taskdefs_post_compile;
&targets;
<target name="clean">
<echo message="Removing ${build.dir}/classes/${componentName} and
${build.dir}/work/${componentName}" />
<delete dir="${build.dir}/classes/${componentName}"/>
<delete dir="${build.dir}/work/${componentName}"/>
</target>
<target name="copy" depends="setenv"/>
<target name="compile" depends="copy">
<echo message="Compiling test.wsdl.refattr"/>
<!-- RefAttr Test -->
<wsdl2java url="${axis.home}/test/wsdl/refattr/refattr.wsdl"
output="${axis.home}/build/work"
deployscope="session"
serverSide="yes"
skeletonDeploy="yes"
noimports="no"
verbose="no"
testcase="no">
<mapping namespace="urn:ref.types.test" package="test.wsdl.refattr"/>
<mapping namespace="urn:ref.types" package="test.wsdl.refattr"/>
</wsdl2java>
<copy todir="${build.dir}/work/test/wsdl/refattr" overwrite="yes">
<fileset dir="${axis.home}/test/wsdl/refattr">
<include name="*TestCase.java"/>
<include name="*Impl.java"/>
</fileset>
</copy>
<javac srcdir="${build.dir}/work" destdir="${build.dest}" fork="${javac.fork}"
debug="${debug}">
<classpath refid="classpath" />
<include name="test/wsdl/refattr/*.java" />
</javac>
</target>
<target name="run" >
<antcall target="execute-Component" />
</target>
</project>
1.7 +3 -3 xml-axis/java/test/wsdl/addrNoImplSEI/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/addrNoImplSEI/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Main.java 11 Dec 2002 22:40:20 -0000 1.6
+++ Main.java 1 Mar 2003 01:31:03 -0000 1.7
@@ -73,12 +73,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");
@@ -99,7 +99,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.37 +8 -8 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- VerifyTestCase.java 28 Feb 2003 22:08:03 -0000 1.36
+++ VerifyTestCase.java 1 Mar 2003 01:31:03 -0000 1.37
@@ -43,7 +43,7 @@
import test.wsdl.types.comprehensive_types.ComplexAll;
import test.wsdl.types.comprehensive_types.ComplexSequence;
import test.wsdl.types.comprehensive_types.ComplexWComplex;
-import test.wsdl.types.comprehensive_types.ElemWComplex;
+import test.wsdl.types.comprehensive_types._elemWComplex;
import test.wsdl.types.comprehensive_types.EmptyComplexType;
import test.wsdl.types.comprehensive_types.Enum;
import test.wsdl.types.comprehensive_types.EnumByte;
@@ -56,7 +56,7 @@
import test.wsdl.types.comprehensive_types.PersionCat;
import test.wsdl.types.comprehensive_types.Simple;
import test.wsdl.types.comprehensive_types.SimpleFwd;
-import test.wsdl.types.comprehensive_types.Stock_quote;
+import test.wsdl.types.comprehensive_types.ComplexWComplex_stock_quote;
import test.wsdl.types.comprehensive_types.StringParameter;
import test.wsdl.types.comprehensive_types.Time;
import test.wsdl.types.comprehensive_types.Yarn;
@@ -67,7 +67,7 @@
import test.wsdl.types.comprehensive_types.holders.ComplexAllHolder;
import test.wsdl.types.comprehensive_types.holders.ComplexSequenceHolder;
import test.wsdl.types.comprehensive_types.holders.ComplexWComplexHolder;
-import test.wsdl.types.comprehensive_types.holders.ElemWComplexHolder;
+import test.wsdl.types.comprehensive_types.holders._elemWComplexHolder;
import test.wsdl.types.comprehensive_types.holders.EmptyComplexTypeHolder;
import test.wsdl.types.comprehensive_types.holders.EnumHolder;
import test.wsdl.types.comprehensive_types2.A;
@@ -403,7 +403,7 @@
A a = new A();
a.setC(3);
b.setD(a);
- ElemWComplex elemWComplex = new ElemWComplex();
+ _elemWComplex elemWComplex = new _elemWComplex();
StringParameter sp = new StringParameter("sweet!");
sp.setDescription("Pass this as an element and an attribute...wow!");
@@ -430,23 +430,23 @@
throw new junit.framework.AssertionFailedError("elemWComplexIn
Exception caught: " + re );
}
try {
- binding.elemWComplexInout(new ElemWComplexHolder(elemWComplex));
+ binding.elemWComplexInout(new _elemWComplexHolder(elemWComplex));
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("elemWComplexInout
Exception caught: " + re );
}
try {
- ElemWComplexHolder value = new ElemWComplexHolder();
+ _elemWComplexHolder value = new _elemWComplexHolder();
binding.elemWComplexOut(value);
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("elemWComplexOut
Exception caught: " + re );
}
try {
- ElemWComplex value = null;
+ _elemWComplex value = null;
value = binding.elemWComplexReturn();
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("elemWComplexReturn
Exception caught: " + re );
}
- Stock_quote stockQuote = new Stock_quote();
+ ComplexWComplex_stock_quote stockQuote = new ComplexWComplex_stock_quote();
Time time = new Time();
time.setDST(false);
stockQuote.setTime(time);
