[jboss-svn-commits] JBossWS SVN: r855 - in trunk/src: main/java/org/jboss/ws/tools test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei test/resources/tools/jbws-206/wscompileArtifacts/UserException/usertypes test/resources/tools/jbws-206/wsdlFixture/UserException
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 30 06:11:15 EDT 2006
Author: darran.lofthouse at jboss.com
Date: 2006-08-30 06:11:08 -0400 (Wed, 30 Aug 2006)
New Revision: 855
Added:
trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/usertypes/AnonymousException.java
Modified:
trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException/UserExceptionWSDL2JavaTestCase.java
trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei/UserExceptionSEI.java
trunk/src/test/resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl
Log:
JBWS-1151 - Fixing wsdl-java generation for fault using anonymous complexType.
Modified: trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-08-30 09:48:48 UTC (rev 854)
+++ trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-08-30 10:11:08 UTC (rev 855)
@@ -451,7 +451,7 @@
Class cl = getJavaType(faultXMLType, false);
if (cl == null)
- buf.append(seiPkgName + "." + cleanUpFaultName(faultXMLType.getLocalPart()));
+ buf.append(seiPkgName + "." + cleanUpFaultName(faultXMLName.getLocalPart()));
else
buf.append( cl.getName());
buf.append( "," );
@@ -617,6 +617,9 @@
faultname = faultname.substring(0, index);
}
}
+
+ faultname = utils.firstLetterUpperCase(faultname);
+
return faultname;
}
Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException/UserExceptionWSDL2JavaTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException/UserExceptionWSDL2JavaTestCase.java 2006-08-30 09:48:48 UTC (rev 854)
+++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/UserException/UserExceptionWSDL2JavaTestCase.java 2006-08-30 10:11:08 UTC (rev 855)
@@ -54,5 +54,6 @@
{
checkUserType( "CustomException.java");
checkUserType( "MyException.java");
+ checkUserType( "AnonymousException.java");
}
}
Modified: trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei/UserExceptionSEI.java
===================================================================
--- trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei/UserExceptionSEI.java 2006-08-30 09:48:48 UTC (rev 854)
+++ trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/sei/UserExceptionSEI.java 2006-08-30 10:11:08 UTC (rev 855)
@@ -10,4 +10,6 @@
org.jboss.test.webservice.userexception.CustomException, java.rmi.RemoteException;
public void testUserException(java.lang.String string_1) throws
org.jboss.test.webservice.userexception.MyException, java.rmi.RemoteException;
+ public void testAnonymousException(java.lang.String string_1) throws
+ org.jboss.test.webservice.userexception.AnonymousException, java.rmi.RemoteException;
}
Copied: trunk/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/usertypes/AnonymousException.java (from rev 854, branches/jbossws-1.0/src/test/resources/tools/jbws-206/wscompileArtifacts/UserException/usertypes/AnonymousException.java)
Modified: trunk/src/test/resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl
===================================================================
--- trunk/src/test/resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl 2006-08-30 09:48:48 UTC (rev 854)
+++ trunk/src/test/resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl 2006-08-30 10:11:08 UTC (rev 855)
@@ -24,6 +24,13 @@
</complexType>
<element name="CustomException" type="tns:CustomException" />
<element name="MyException" type="tns:MyException" />
+ <element name="anonymousException">
+ <complexType>
+ <sequence>
+ <element type="string" name="message"/>
+ </sequence>
+ </complexType>
+ </element>
</schema>
</types>
<message name="UserExceptionSEI_testCustomException" />
@@ -38,6 +45,13 @@
<message name="MyException">
<part name="MyException" element="ns2:MyException" />
</message>
+ <message name="UserExceptionSEI_testAnonymousException">
+ <part name="String_1" type="xsd:string" />
+ </message>
+ <message name="UserExceptionSEI_testAnonymousExceptionResponse" />
+ <message name="AnonymousException">
+ <part name="AnonymousException" element="ns2:anonymousException"/>
+ </message>
<portType name="UserExceptionSEI">
<operation name="testCustomException">
<input message="tns:UserExceptionSEI_testCustomException" />
@@ -51,6 +65,12 @@
message="tns:UserExceptionSEI_testUserExceptionResponse" />
<fault name="MyException" message="tns:MyException" />
</operation>
+ <operation name="testAnonymousException" parameterOrder="String_1">
+ <input message="tns:UserExceptionSEI_testAnonymousException" />
+ <output
+ message="tns:UserExceptionSEI_testAnonymousExceptionResponse" />
+ <fault name="AnonymousException" message="tns:AnonymousException" />
+ </operation>
</portType>
<binding name="UserExceptionSEIBinding"
type="tns:UserExceptionSEI">
@@ -84,6 +104,20 @@
<soap:fault name="MyException" use="literal" />
</fault>
</operation>
+ <operation name="testAnonymousException">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal"
+ namespace="http://org.jboss.ws" />
+ </input>
+ <output>
+ <soap:body use="literal"
+ namespace="http://org.jboss.ws" />
+ </output>
+ <fault name="AnonymousException">
+ <soap:fault name="AnonymousException" use="literal" />
+ </fault>
+ </operation>
</binding>
<service name="UserExceptionService">
<port name="UserExceptionSEIPort"
More information about the jboss-svn-commits
mailing list