Author: jason.greene(a)jboss.com Date: 2006-10-11 16:12:30 -0400 (Wed, 11 Oct 2006) New Revision: 1209 Added: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.java Removed: trunk/src/test/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF/ Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java trunk/src/test/ant/build-jars-jaxws.xml trunk/src/test/build.xml trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java trunk/src/test/java/org/jboss/test/ws/jaxws/context/EndpointBean.java trunk/src/test/java/org/jboss/test/ws/jaxws/context/EndpointInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java Log: Fix more tests Allow null elements on interface message references Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -726,7 +726,7 @@ ServiceEndpointInterfaceMapping seiMapping = seiMethodMapping.getServiceEndpointInterfaceMapping(); JavaWsdlMapping javaWsdlMapping = seiMapping.getJavaWsdlMapping(); JavaXmlTypeMapping javaXmlTypeMapping = javaWsdlMapping.getTypeMappingForQName(xmlType); - if (typeMapping == null) + if (javaXmlTypeMapping == null) throw new WSException("Cannot obtain java/xml type mapping for: " + xmlType); Map<String, String> map = createVariableMappingMap(javaXmlTypeMapping.getVariableMappings()); @@ -813,6 +813,9 @@ List<WrappedParameter> wrappedParameters = new ArrayList<WrappedParameter>(); List<WrappedParameter> wrappedResponseParameters = new ArrayList<WrappedParameter>(); + // Set the default to bare in case there isn't an input object, revisit this + opMetaData.getEndpointMetaData().setParameterStyle(ParameterStyle.BARE); + int wsdlPosition = 0; // WS-I BP 1.0 allows document/literal bare to have zero message parts if (wsdlOperation.getInputs().length > 0) Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -24,6 +24,7 @@ import javax.jws.HandlerChain; import javax.jws.soap.SOAPBinding; +import javax.xml.ws.BindingType; import org.jboss.logging.Logger; import org.jboss.ws.metadata.EndpointMetaData; @@ -47,6 +48,13 @@ initialize(epMetaData.getClassLoader()); + // Nuke parameterStyle + epMetaData.setParameterStyle(null); + + // Process an optional @BindingType annotation + if (wsClass.isAnnotationPresent(BindingType.class)) + processBindingType(epMetaData, wsClass); + // Process @SOAPBinding if (wsClass.isAnnotationPresent(SOAPBinding.class)) processSOAPBinding(epMetaData, wsClass); Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -436,7 +436,7 @@ if (isWrapped) { QName wrappedElementName = getWebParamName(opMetaData, i, javaType, anWebParam); - String variable = convertToProperty(wrappedElementName.getLocalPart()); + String variable = convertToVariable(wrappedElementName.getLocalPart()); WrappedParameter wrappedParameter = new WrappedParameter(wrappedElementName, javaTypeName, variable, i); wrappedParameter.typeArguments = convertTypeArguments(javaType, genericType); @@ -477,7 +477,7 @@ if (isWrapped) { - WrappedParameter wrapped = new WrappedParameter(xmlName, returnTypeName, convertToProperty(xmlName.getLocalPart()), -1); + WrappedParameter wrapped = new WrappedParameter(xmlName, returnTypeName, convertToVariable(xmlName.getLocalPart()), -1); wrapped.typeArguments = convertTypeArguments(returnType, genericReturnType); // insert at the beginning just for prettiness @@ -500,13 +500,15 @@ wrapperGenerator.generate(wrapperParameter); Class wrapperClass = wrapperParameter.getJavaType(); javaTypes.add(wrapperClass); - // typeRefs.add(new TypeReference(wrapperParameter.getXmlName(), wrapperClass)); + // In case there is no @XmlRootElement + typeRefs.add(new TypeReference(wrapperParameter.getXmlName(), wrapperClass)); if (!opMetaData.isOneWay()) { wrapperGenerator.generate(wrapperOutputParameter); wrapperClass = wrapperOutputParameter.getJavaType(); javaTypes.add(wrapperClass); - // typeRefs.add(new TypeReference(wrapperOutputParameter.getXmlName(), wrapperClass)); + // In case there is no @XmlRootElement + typeRefs.add(new TypeReference(wrapperOutputParameter.getXmlName(), wrapperClass)); } } @@ -596,17 +598,9 @@ return wrapperParameter; } - private String convertToProperty(String variable) + private String convertToVariable(String localName) { - if (Character.isUpperCase(variable.charAt(0))) - { - char c = Character.toLowerCase(variable.charAt(0)); - StringBuilder builder = new StringBuilder(variable); - builder.setCharAt(0, c); - variable = builder.toString(); - } - - return variable; + return JAXBRIContext.mangleNameToVariableName(localName); } /** Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Writer.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -195,8 +195,12 @@ else { QName element = reference.getElement(); - buffer.append("<part name='" + reference.getPartName() + '\''); - buffer.append(" element='" + getReferenceString(element) + "'/>"); + // Null represents empty message + if (element != null) + { + buffer.append("<part name='" + reference.getPartName() + '\''); + buffer.append(" element='" + getReferenceString(element) + "'/>"); + } } WSDLBindingMessageReference bindingReference = getBindingReference(reference); Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -146,8 +146,6 @@ public void addInput(WSDLInterfaceOperationInput input) { QName xmlName = input.getElement(); - if (xmlName == null) - throw new IllegalArgumentException("Illegal null element name"); if (inputs.get(xmlName) != null) throw new WSException("Attempt to map multiple operation inputs to: " + xmlName); inputs.put(xmlName, input); Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-10-11 20:12:30 UTC (rev 1209) @@ -29,6 +29,7 @@ <war warfile="${build.test.dir}/libs/jaxws-binding.war" webxml="${build.test.dir}/resources/jaxws/binding/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> </classes> </war> @@ -477,20 +478,10 @@ <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/> </classes> </war> - <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-faultto-client.jar"> - <fileset dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/> - </fileset> - <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jbossws-client-config.xml"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> </target> Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/build.xml 2006-10-11 20:12:30 UTC (rev 1209) @@ -406,7 +406,7 @@ --> <target name="one-test" depends="init" if="test" description="Run a single unit test"> <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}"> - <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/--> + <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" --> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -21,8 +21,18 @@ */ package org.jboss.test.ws.jaxws.binding; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; +import javax.xml.ws.BindingType; + // $Id: $ +@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/binding") +@SOAPBinding(style = Style.RPC) +// This is the SOAP-1.2 binding identifier +@BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") public interface SOAPEndpoint { public String namespace(); Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -38,19 +38,15 @@ import org.jboss.logging.Logger; -@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/binding") -@SOAPBinding(style = Style.RPC) - -// This is the SOAP-1.2 binding identifier -@BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") -public class SOAPEndpointBean +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.binding.SOAPEndpoint") +public class SOAPEndpointBean implements SOAPEndpoint { private static Logger log = Logger.getLogger(SOAPEndpointBean.class); @Resource public WebServiceContext context; - @WebMethod + public String namespace() { try Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/context/EndpointBean.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/context/EndpointBean.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/context/EndpointBean.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -34,14 +34,12 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.soap.SOAPMessageContext; -@WebService(name = "EndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/context", serviceName = "TestService") -@SOAPBinding(style = SOAPBinding.Style.RPC) +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.context.EndpointInterface") public class EndpointBean { @Resource public WebServiceContext context; - @WebMethod public String echo(String input) { try Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/context/EndpointInterface.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/context/EndpointInterface.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/context/EndpointInterface.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -24,6 +24,11 @@ import java.rmi.Remote; import java.rmi.RemoteException; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "EndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/context", serviceName = "TestService") +@SOAPBinding(style = SOAPBinding.Style.RPC) public interface EndpointInterface extends Remote { String echo(String input) throws RemoteException; Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -24,6 +24,11 @@ import java.rmi.Remote; import java.rmi.RemoteException; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) public interface Endpoint extends Remote { public String echo(String input) throws RemoteException; Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -25,6 +25,8 @@ import javax.jws.HandlerChain; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; @@ -35,8 +37,9 @@ { @WebMethod + @WebResult(name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(String string1); + public String echo(@WebParam(name="String_1") String string1); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -25,6 +25,8 @@ import javax.jws.HandlerChain; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; @@ -38,9 +40,10 @@ private static Logger log = Logger.getLogger(SOAPEndpointJAXBImpl.class); @WebMethod + @WebResult(name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(String msg) + public String echo(@WebParam(name="String_1") String msg) { log.info("echo: " + msg); return msg + ":endpoint"; Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -25,6 +25,8 @@ import javax.jws.HandlerChain; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; @@ -35,8 +37,9 @@ { @WebMethod + @WebResult(name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(String string1); + public String echo(@WebParam(name = "String_1") String string1); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -25,6 +25,8 @@ import javax.jws.HandlerChain; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; @@ -38,9 +40,10 @@ private static Logger log = Logger.getLogger(SOAPEndpointSourceImpl.class); @WebMethod + @WebResult(name="result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(String msg) + public String echo(@WebParam(name="String_1")String msg) { log.info("echo: " + msg); return msg + ":endpoint"; Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -24,6 +24,8 @@ //$Id$ import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @@ -45,15 +47,17 @@ // provide logging private static Logger log = Logger.getLogger(ActionRpcEndpointImpl.class); - @WebMethod (action = "urn:wsa-action-foo") - public String foo(String item) + @WebMethod(action = "urn:wsa-action-foo") + @WebResult(name = "result") + public String foo(@WebParam(name = "String_1") String item) { log.info("foo: " + item); return "foo:" + item; } - @WebMethod (action = "urn:wsa-action-bar") - public String bar(String item) + @WebMethod(action = "urn:wsa-action-bar") + @WebResult(name="result") + public String bar(@WebParam(name = "String_1") String item) { log.info("bar: " + item); return "bar:" + item; Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream; import java.net.URL; +import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPConnection; @@ -34,6 +35,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.test.ws.jaxws.logicalhandler.SOAPEndpointJAXB; /** * Test endpoint using ws-addressing @@ -52,7 +54,7 @@ return JBossWSTestSetup.newTestSetup(AddressingReplyToTestCase.class, "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-client.jar," + "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-client.jar," + - "jaxws-wsaddressing-faultto.war,jaxws-wsaddressing-faultto-client.jar"); + "jaxws-wsaddressing-faultto.war"); } protected void setUp() throws Exception @@ -65,8 +67,11 @@ initial = (InitialEndpoint)initialService.getPort(InitialEndpoint.class); Service replytoService = (Service)getInitialContext("replyto-client").lookup("java:comp/env/service/ReplyToService"); replyto = (ReplyToEndpoint)replytoService.getPort(ReplyToEndpoint.class); - Service faulttoService = (Service)getInitialContext("faultto-client").lookup("java:comp/env/service/FaultToService"); - faultto = (FaultToEndpoint)faulttoService.getPort(FaultToEndpoint.class); + + String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService"; + QName serviceName = new QName("http://org.jboss.ws/addressing/replyto", "FaultToEndpointService"); + javax.xml.ws.Service service = javax.xml.ws.Service.create(new URL(endpointAddress + "?wsdl"), serviceName); + faultto = (FaultToEndpoint) service.getPort(FaultToEndpoint.class); } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -23,11 +23,12 @@ //$Id$ -import java.rmi.Remote; -import java.rmi.RemoteException; +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; -import javax.xml.soap.SOAPElement; - /** * WS-Addressing service endpoint interface * @@ -35,9 +36,14 @@ * * @since 24-Nov-2005 */ -public interface FaultToEndpoint extends Remote +@WebService +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface FaultToEndpoint { - public void onFault(SOAPElement element) throws RemoteException; - - public String getLastFault() throws RemoteException; + @Oneway + @WebMethod + public void onFault(@WebParam(name="Fault", targetNamespace="http://schemas.xmlsoap.org/soap/envelope/")Fau... fault); + + @WebMethod + public String getLastFault(); } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -27,14 +27,16 @@ import javax.jws.Oneway; import javax.jws.WebMethod; +import javax.jws.WebParam; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPFault; +import javax.xml.namespace.QName; import org.jboss.logging.Logger; +import org.jboss.ws.utils.DOMUtils; import org.jboss.ws.utils.DOMWriter; + /** * WS-Addressing service endpoint * @@ -42,27 +44,22 @@ * * @since 24-Nov-2005 */ -@SOAPBinding(style = SOAPBinding.Style.RPC) +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) @WebService(name = "FaultToEndpoint", targetNamespace = "http://org.jboss.ws/addressing/replyto") -public class FaultToEndpointImpl implements FaultToEndpoint +public class FaultToEndpointImpl { // provide logging private static Logger log = Logger.getLogger(FaultToEndpointImpl.class); public static String lastFault; - + @Oneway @WebMethod - public void onFault(SOAPElement soapElement) throws RemoteException + public void onFault(@WebParam(name="Fault", targetNamespace="http://schemas.xmlsoap.org/soap/envelope/") FaultType fault) { - log.info("onFault: " + DOMWriter.printNode(soapElement, false)); - if (soapElement instanceof SOAPFault) - { - SOAPFault soapFault = (SOAPFault)soapElement; - lastFault = soapFault.getFaultString(); - } + lastFault = fault.faultString; } - + @WebMethod public String getLastFault() throws RemoteException { Added: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -0,0 +1,46 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.wsaddressing.replyto; + +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +import org.w3c.dom.Element; + +@XmlType(name = "Fault", namespace="http://schemas.xmlsoap.org/soap/envelope/") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class FaultType +{ + @XmlElement(name = "faultcode") + public String faultCode; + + @XmlElement(name = "faultstring") + public String faultString; + + @XmlAnyElement(lax = true) + public List<Element> anyElements; +} \ No newline at end of file Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -24,6 +24,8 @@ //$Id$ import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @@ -46,7 +48,8 @@ private static Logger log = Logger.getLogger(InitialEndpointImpl.class); @WebMethod - public String addItem(String item) + @WebResult(name = "result") + public String addItem(@WebParam(name="String_1") String item) { log.info("addItem: " + item); if (item.equals("Invalid Value")) Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java 2006-10-11 08:45:05 UTC (rev 1208) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.java 2006-10-11 20:12:30 UTC (rev 1209) @@ -28,6 +28,7 @@ import javax.jws.Oneway; import javax.jws.WebMethod; import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @@ -58,6 +59,7 @@ } @WebMethod + @WebResult(name = "result") public String getLastItem() throws RemoteException { log.info("getLastItem: " + lastItem);