Author: thomas.diesler(a)jboss.com Date: 2007-01-11 10:09:20 -0500 (Thu, 11 Jan 2007) New Revision: 1928 Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/WSTimeoutException.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/ trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml Modified: trunk/build/ant-import/build-thirdparty.xml trunk/integration-jboss40/.classpath trunk/integration-jboss40/build.xml trunk/integration-jboss42/.classpath trunk/integration-jboss42/build.xml trunk/integration-jboss50/.classpath trunk/integration-jboss50/build.xml trunk/integration-tomcat/.classpath trunk/jbossws-core/.classpath trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ant/wstools.java trunk/jbossws-tests/.classpath trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java Log: Add test for [JBWS-1384] - Cannot obtain java/xml type mapping for attachment part [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header [JBWS-1378] - NPE in replaceAddressLocation with SOAP1.2 WSDL [JBWS-1407] -Premature end of File exception on createMessage Switch to unversioned jar names for stax and policy Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -56,6 +56,7 @@ <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> @@ -63,9 +64,8 @@ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy-1.0.jar" dest="${thirdparty.dir}/policy-1.0.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx-lgpl-2.0.6.jar" dest="${thirdparty.dir}/wstx-lgpl-2.0.6.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api-1.0.jar" dest="${thirdparty.dir}/stax-api-1.0.jar" usetimestamp="true" verbose="true"/> <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> </target> @@ -88,7 +88,7 @@ <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> + <pathelement location="${thirdparty.dir}/stax-api.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> Modified: trunk/integration-jboss40/.classpath =================================================================== --- trunk/integration-jboss40/.classpath 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/integration-jboss40/.classpath 2007-01-11 15:09:20 UTC (rev 1928) @@ -19,7 +19,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> @@ -28,9 +27,10 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/integration-jboss40/build.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -150,9 +150,9 @@ <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> - <include name="policy-1.0.jar"/> + <include name="policy.jar"/> <include name="sjsxp.jar"/> - <include name="stax-api-1.0.jar"/> + <include name="stax-api.jar"/> <include name="wstx-lgpl-2.9.3.jar"/> <include name="xmlsec.jar"/> </fileset> @@ -248,9 +248,9 @@ <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> - <include name="policy-1.0.jar"/> + <include name="policy.jar"/> <include name="sjsxp.jar"/> - <include name="stax-api-1.0.jar"/> + <include name="stax-api.jar"/> <include name="wstx-lgpl-2.9.3.jar"/> <include name="xmlsec.jar"/> </fileset> Modified: trunk/integration-jboss42/.classpath =================================================================== --- trunk/integration-jboss42/.classpath 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/integration-jboss42/.classpath 2007-01-11 15:09:20 UTC (rev 1928) @@ -27,7 +27,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/integration-jboss42/build.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -107,9 +107,9 @@ <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> - <include name="policy-1.0.jar"/> + <include name="policy.jar"/> <include name="sjsxp.jar"/> - <include name="stax-api-1.0.jar"/> + <include name="stax-api.jar"/> <include name="wstx-lgpl-2.9.3.jar"/> <include name="xmlsec.jar"/> </fileset> Modified: trunk/integration-jboss50/.classpath =================================================================== --- trunk/integration-jboss50/.classpath 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/integration-jboss50/.classpath 2007-01-11 15:09:20 UTC (rev 1928) @@ -30,7 +30,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/integration-jboss50/build.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -102,9 +102,9 @@ <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> - <include name="policy-1.0.jar"/> + <include name="policy.jar"/> <include name="sjsxp.jar"/> - <include name="stax-api-1.0.jar"/> + <include name="stax-api.jar"/> <include name="wstx-lgpl-2.9.3.jar"/> <include name="xmlsec.jar"/> </fileset> Modified: trunk/integration-tomcat/.classpath =================================================================== --- trunk/integration-tomcat/.classpath 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/integration-tomcat/.classpath 2007-01-11 15:09:20 UTC (rev 1928) @@ -26,7 +26,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-core/.classpath 2007-01-11 15:09:20 UTC (rev 1928) @@ -25,7 +25,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/WSTimeoutException.java (from rev 1915, branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/WSTimeoutException.java) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -580,7 +580,6 @@ } catch (Exception ex) { - ex.printStackTrace(); throw new RemoteException("Call invocation failed", ex); } finally Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SAAJPayloadBuilderStax.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -127,11 +127,6 @@ if (!ignoreParseError) throw new IOException("Failed to parse stream: " + e.getMessage()); } - catch (SOAPException e) - { - e.printStackTrace(); - throw e; - } finally { try Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -24,6 +24,7 @@ // $Id$ import java.net.MalformedURLException; +import java.net.SocketTimeoutException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -43,6 +44,8 @@ import org.jboss.remoting.Client; import org.jboss.remoting.InvokerLocator; import org.jboss.remoting.marshal.MarshalFactory; +import org.jboss.ws.WSException; +import org.jboss.ws.core.WSTimeoutException; import org.jboss.ws.core.jaxrpc.StubExt; import org.jboss.ws.extensions.xop.XOPContext; @@ -127,6 +130,7 @@ if (closed) throw new SOAPException("SOAPConnection is already closed"); + Object timeout = null; String targetAddress; Map callProps; @@ -138,7 +142,7 @@ if (callProps.containsKey(StubExt.PROPERTY_CLIENT_TIMEOUT)) { - Object timeout = callProps.get(StubExt.PROPERTY_CLIENT_TIMEOUT); + timeout = callProps.get(StubExt.PROPERTY_CLIENT_TIMEOUT); targetAddress = addURLParameter(targetAddress, "timeout", timeout.toString()); } } @@ -178,13 +182,22 @@ } SOAPMessage resMessage = null; - if (oneway == true) + try { - client.invokeOneway(reqMessage, metadata, false); + if (oneway == true) + { + client.invokeOneway(reqMessage, metadata, false); + } + else + { + resMessage = (SOAPMessage)client.invoke(reqMessage, metadata); + } } - else + catch (RuntimeException rte) { - resMessage = (SOAPMessage)client.invoke(reqMessage, metadata); + if (timeout != null && rte.getCause() instanceof SocketTimeoutException) + throw new WSTimeoutException("Timeout after: " + timeout + "ms", new Long(timeout.toString())); + else throw rte; } // Disconnect the remoting client @@ -202,7 +215,6 @@ } catch (RuntimeException rte) { - rte.printStackTrace(); throw rte; } catch (Throwable t) @@ -237,7 +249,7 @@ log.debug("Get locator for: " + endpoint); targetAddress = addURLParameter(targetAddress, InvokerLocator.DATATYPE, "SOAPMessage"); InvokerLocator locator = new InvokerLocator(targetAddress); - + /* An HTTPClientInvoker may disconnect from the server and recreated by the remoting layer. * In that case the new invoker does not inherit the marshaller/unmarshaller from the disconnected invoker. * We therefore explicitly specify the invoker locator datatype and register the SOAP marshaller/unmarshaller @@ -253,7 +265,7 @@ client.connect(); client.setMarshaller(marshaller); - + if (oneway == false) client.setUnMarshaller(unmarshaller); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -95,7 +95,11 @@ try { - boundary = ("\r\n--" + boundaryParameter).getBytes("US-ASCII"); + // [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header + if (start == null) + boundary = ("--" + boundaryParameter).getBytes("US-ASCII"); + else + boundary = ("\r\n--" + boundaryParameter).getBytes("US-ASCII"); } catch (UnsupportedEncodingException e) { @@ -140,7 +144,7 @@ { if (isValidRootType(part.getContentType()) == false) throw new IllegalArgumentException("multipart/related type specified a root type other than the one" + " that was found."); - + rootPart = part; } else Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -606,7 +606,7 @@ return seiName; } - private void createSEI(File loc, WSDLDefinitions wsdl) + private void createSEI(File loc, WSDLDefinitions wsdl) throws IOException { WSDLInterface[] intarr = wsdl.getInterfaces(); if (intarr == null || intarr.length == 0) @@ -615,14 +615,7 @@ for (int i = 0; i < len; i++) { WSDLInterface intf = intarr[i]; - try - { - createSEIFile(intf, loc); - } - catch (IOException e) - { - e.printStackTrace(); - } + createSEIFile(intf, loc); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ant/wstools.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ant/wstools.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/ant/wstools.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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.ws.tools.ant; import org.apache.tools.ant.BuildException; @@ -32,92 +32,88 @@ * @since Oct 5, 2005 */ public class wstools extends MatchingTask -{ +{ protected Path compileClasspath = null; private boolean verbose = false; - + private String dest = null; - - private String config = null; - + + private String config = null; + /** * Creates a nested classpath element. */ - public Path createClasspath() + public Path createClasspath() { - if (compileClasspath == null) + if (compileClasspath == null) { compileClasspath = new Path(project); } return compileClasspath.createPath(); } - + /** * Adds a reference to a CLASSPATH defined elsewhere. */ - public void setClasspathRef(Reference r) + public void setClasspathRef(Reference r) { createClasspath().setRefid(r); } - - + public String getConfig() { return config; } - + public void setConfig(String config) { this.config = config; } - + public String getDest() { return dest; } - + public void setDest(String dest) { this.dest = dest; } - + public boolean isVerbose() { return verbose; } - + public void setVerbose(boolean verbose) { this.verbose = verbose; - } - - + } + public void execute() throws BuildException - { + { ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader()); + Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader()); try { - String[] args= new String[]{"-dest",dest,"-config",config}; + String[] args = new String[] { "-dest", dest, "-config", config }; org.jboss.ws.tools.WSTools tools = new org.jboss.ws.tools.WSTools(); - tools.generate(args); + tools.generate(args); } catch (Exception ex) { if (ex instanceof BuildException) { - throw (BuildException) ex; + throw (BuildException)ex; } else - { - ex.printStackTrace(); - throw new BuildException("Error running jbossws: ", - ex, getLocation()); + { + throw new BuildException("Error running jbossws: ", ex, getLocation()); } } - finally + finally { Thread.currentThread().setContextClassLoader(prevCL); } - } + } } Modified: trunk/jbossws-tests/.classpath =================================================================== --- trunk/jbossws-tests/.classpath 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/.classpath 2007-01-11 15:09:20 UTC (rev 1928) @@ -9,7 +9,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/policy-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/policy.jar"/> <classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> @@ -35,16 +35,11 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/junit.jar"/> - <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-jaxrpc.jar"/> - <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-jaxws.jar"/> - <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-saaj.jar"/> - <classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-client.jar"/> - <classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-core.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -55,6 +55,7 @@ <!-- jaxrpc-benchmark --> <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> @@ -68,10 +69,10 @@ </war> <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.jar"> <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/META-INF"> <include name="ejb-jar.xml"/> @@ -83,11 +84,11 @@ </jar> <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/rpclit/META-INF"> <include name="application-client.xml"/> @@ -98,6 +99,7 @@ </jar> <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> @@ -111,10 +113,10 @@ </war> <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.jar"> <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/META-INF"> <include name="ejb-jar.xml"/> @@ -126,11 +128,11 @@ </jar> <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/benchmark/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> - <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/benchmark/doclit/META-INF"> <include name="application-client.xml"/> @@ -918,6 +920,32 @@ </metainf> </jar> + <!-- jaxrpc-jbws1378 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1378/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1378/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + + <!-- jaxrpc-jbws1384 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1384.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1384/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1384/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <!-- jaxrpc-jbws1386 --> <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -931,6 +959,19 @@ </webinf> </war> + <!-- jaxrpc-jbws1410 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1410.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <!-- jaxrpc-jbws1427 --> <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar"> <fileset dir="${tests.output.dir}/classes"> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/build.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -160,10 +160,11 @@ <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> + <pathelement location="${thirdparty.dir}/junit.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> - <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> + <pathelement location="${thirdparty.dir}/policy.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> + <pathelement location="${thirdparty.dir}/stax-api.jar"/> <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> </path> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -22,6 +22,8 @@ package org.jboss.test.ws.common.soap; import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPBody; @@ -103,4 +105,21 @@ Element expEnv = DOMUtils.parse(expEnvStr); assertEquals(expEnv, env); } + + // http://jira.jboss.org/jira/browse/JBWS-1407 + // Premature end of File exception on createMessage + public void testPrematureEndOfFile() throws Exception + { + File envFile = new File("resources/common/soap/MessageFactory/jbws1407.xml"); + assertTrue("File exists: " + envFile, envFile.exists()); + + FileInputStream inputStream = new FileInputStream(envFile); + + MessageFactory factory = new MessageFactoryImpl(); + SOAPMessage soapMsg = factory.createMessage(null, inputStream); + SOAPEnvelope env = soapMsg.getSOAPPart().getEnvelope(); + + assertEquals("SOAP-ENV:Envelope", env.getNodeName()); + assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI()); + } } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378 (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jan 11 13:01:23 CET 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jaxrpc.jbws1378; - - -public class Echo -{ - -protected java.lang.String value; -public Echo(){} - -public Echo(java.lang.String value){ -this.value=value; -} -public java.lang.String getValue() { return value ;} - -public void setValue(java.lang.String value){ this.value=value; } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jan 11 13:01:23 CET 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jaxrpc.jbws1378; - - -public class EchoResponse -{ - -protected java.lang.String result; -public EchoResponse(){} - -public EchoResponse(java.lang.String result){ -this.result=result; -} -public java.lang.String getResult() { return result ;} - -public void setResult(java.lang.String result){ this.result=result; } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jan 11 13:01:23 CET 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jaxrpc.jbws1378; -public interface ExamplePort extends java.rmi.Remote -{ - - public java.lang.String echo(java.lang.String value) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,38 +0,0 @@ -/* - * 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.jaxrpc.jbws1378; - -import java.rmi.RemoteException; - -import org.jboss.logging.Logger; - -public class ExamplePortBean implements ExamplePort -{ - private Logger log = Logger.getLogger(this.getClass()); - - public String echo(String message) throws RemoteException - { - log.info("message: " + message); - - return message; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,75 +0,0 @@ -/* - * 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.jaxrpc.jbws1378; - -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceFactory; -import javax.xml.rpc.Stub; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl; - -/** - * NPE in replaceAddressLocation with SOAP1.2 WSDL - * - * http://jira.jboss.org/jira/browse/JBWS-1378 - * - * @author Thomas.Diesler(a)jboss.org - * @since 11-Jan-2007 - */ -public class JBWS1378TestCase extends JBossWSTest -{ - private static ExamplePort port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1378TestCase.class, "jaxrpc-jbws1378.war"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName serviceName = new QName("http://org.jboss.test.ws/jbws1378", "ExampleService"); - Service service = factory.createService(wsdlURL, serviceName , mappingURL); - port = (ExamplePort)service.getPort(ExamplePort.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1378"); - } - } - - public void testEndpoint() throws Exception - { - String retStr = port.echo("Hello World"); - assertEquals("Hello World", retStr); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java) Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384 (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,81 +0,0 @@ -/* - * 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.jaxrpc.jbws1384; - -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceFactory; -import javax.xml.rpc.Stub; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl; - -/** - * Cannot obtain java/xml type mapping for attachment part - * - * http://jira.jboss.org/jira/browse/JBWS-1384 - * - * @author Thomas.Diesler(a)jboss.org - * @since 11-Jan-2007 - */ -public class JBWS1384TestCase extends JBossWSTest -{ - private static TransmulatorInterface port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1384TestCase.class, "jaxrpc-jbws1384.war"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null && false) - { - ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName serviceName = new QName("http://org.jboss.test.webservice/samples2", "Gasherbrum"); - Service service = factory.createService(wsdlURL, serviceName , mappingURL); - port = (TransmulatorInterface)service.getPort(TransmulatorInterface.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1384"); - } - } - - public void testEndpoint() throws Exception - { - if (true) - { - System.out.println("FIXME: [JBWS-1384] - Cannot obtain java/xml type mapping for attachment part"); - return; - } - - String retStr = port.invokeAttach("user", "pass", "op", "<root/>", "attach"); - assertEquals("attach", retStr); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,56 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jaxrpc.jbws1384; - - -public class ParaListType { - protected java.lang.String username; - protected java.lang.String password; - protected java.lang.String operationName; - protected java.lang.String inputXML; - - public ParaListType() { - } - - public ParaListType(java.lang.String username, java.lang.String password, java.lang.String operationName, java.lang.String inputXML) { - this.username = username; - this.password = password; - this.operationName = operationName; - this.inputXML = inputXML; - } - - public java.lang.String getUsername() { - return username; - } - - public void setUsername(java.lang.String username) { - this.username = username; - } - - public java.lang.String getPassword() { - return password; - } - - public void setPassword(java.lang.String password) { - this.password = password; - } - - public java.lang.String getOperationName() { - return operationName; - } - - public void setOperationName(java.lang.String operationName) { - this.operationName = operationName; - } - - public java.lang.String getInputXML() { - return inputXML; - } - - public void setInputXML(java.lang.String inputXML) { - this.inputXML = inputXML; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jaxrpc.jbws1384; - - -public class ResponseType { - protected java.lang.String result; - - public ResponseType() { - } - - public ResponseType(java.lang.String result) { - this.result = result; - } - - public java.lang.String getResult() { - return result; - } - - public void setResult(java.lang.String result) { - this.result = result; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,35 +0,0 @@ -/* - * 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.jaxrpc.jbws1384; - -import org.jboss.logging.Logger; - -public class TranslatorBean implements TransmulatorInterface -{ - private Logger log = Logger.getLogger(TranslatorBean.class); - - public String invokeAttach(String username, String password, String operationName, String inputXML, String attachmentContents) - { - log.info("[user=" + username + ",pass=" + password + ",op=" + operationName + ",xml=" + inputXML + ",attach=" + attachmentContents + "]"); - return attachmentContents; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,14 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jaxrpc.jbws1384; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -public interface TransmulatorInterface extends Remote -{ - public String invokeAttach(String username, String password, String operationName, String inputXML, String attachmentContents) throws RemoteException; -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java) Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410 (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-01-10 22:43:08 UTC (rev 1912) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,95 +0,0 @@ -/* - * 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.jaxrpc.jbws1410; - -import java.io.File; -import java.net.URL; -import java.rmi.RemoteException; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceFactory; -import javax.xml.rpc.Stub; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.WSException; -import org.jboss.ws.core.WSTimeoutException; -import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl; -import org.jboss.ws.core.jaxrpc.StubExt; - -/** - * NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT - * - * http://jira.jboss.com/jira/browse/JBWS-1410 - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-Jan-2007 - */ -public class JBWS1410TestCase extends JBossWSTest -{ - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1410TestCase.class, "jaxrpc-jbws1410.war"); - } - - public void setUp() throws Exception - { - if (port == null) - { - ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName serviceName = new QName("http://org.jboss.test.ws/jbws1410", "TestService"); - Service service = factory.createService(wsdlURL, serviceName, mappingURL); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1410"); - } - } - - public void testNoTimeout() throws Exception - { - String resStr = port.echoSimple("10"); - assertEquals("10", resStr); - } - - public void testTimeout() throws Exception - { - ((Stub)port)._setProperty(StubExt.PROPERTY_CLIENT_TIMEOUT, "100"); - try - { - port.echoSimple("500"); - fail("socket timeout expected"); - } - catch (RemoteException ex) - { - assertTrue ("WSTimeoutException expected", ex.getCause() instanceof WSTimeoutException); - WSTimeoutException toex = (WSTimeoutException)ex.getCause(); - assertEquals(100, toex.getTimeout()); - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java 2007-01-10 22:43:08 UTC (rev 1912) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,31 +0,0 @@ -/* - * 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.jaxrpc.jbws1410; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -public interface TestEndpoint extends Remote -{ - String echoSimple(String inStr) throws RemoteException; - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.java) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java 2007-01-10 22:43:08 UTC (rev 1912) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,45 +0,0 @@ -/* - * 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.jaxrpc.jbws1410; - -import org.jboss.logging.Logger; - -public class TestEndpointImpl implements TestEndpoint -{ - private Logger log = Logger.getLogger(TestEndpointImpl.class); - - public String echoSimple(String inStr) - { - log.info("echoSimple: " + inStr); - - try - { - Thread.currentThread().sleep(new Long(inStr).longValue()); - } - catch (Exception ex) - { - throw new RuntimeException(ex); - } - - return inStr; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.java) Copied: trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory) Deleted: trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,58 +0,0 @@ -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" - xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:cwmp="urn:dslforum-org:cwmp-1-0" xmlns="urn:dslforum-org:cwmp-1-0"> -<SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" id="_0"> -<cwmp:Inform> - <DeviceId xsi:type="cwmp:DeviceIdStruct"> - <Manufacturer xsi:type="xsd:string">Somebody</Manufacturer> - <OUI xsi:type="xsd:string">9999</OUI> - <ProductClass xsi:type="xsd:string">Somebody</ProductClass> - <SerialNumber xsi:type="xsd:string">1234567890</SerialNumber> - </DeviceId> - <Event xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="cwmp:EventStruct[2]"> - <EventStruct xsi:type="cwmp:EventStruct"> - <EventCode xsi:type="xsd:string">1 BOOT</EventCode> - <CommandKey xsi:type="xsd:string"></CommandKey> - </EventStruct> - <EventStruct xsi:type="cwmp:EventStruct"> - <EventCode xsi:type="xsd:string">4 VALUE CHANGE</EventCode> - <CommandKey xsi:type="xsd:string"></CommandKey> - </EventStruct> - </Event> - <MaxEnvelopes xsi:type="xsd:unsignedInt">1</MaxEnvelopes> - <CurrentTime xsi:type="xsd:dateTime">0000-00-00T00:04:49</CurrentTime> - <RetryCount xsi:type="xsd:unsignedInt">1</RetryCount> - <ParameterList xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="cwmp:ParameterValueStruct[7]"> - <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> - <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.SpecVersion</Name> - <Value xsi:type="xsd:string">1.0</Value> - </ParameterValueStruct> - <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> - <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.HardwareVersion</Name> - <Value xsi:type="xsd:string">1.0002.0</Value> - </ParameterValueStruct> - <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> - <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.SoftwareVersion</Name> - <Value xsi:type="xsd:string">1.01.38</Value> - </ParameterValueStruct><ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> - <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.ProvisioningCode</Name> - <Value xsi:type="xsd:string"></Value> - </ParameterValueStruct> - <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> - <Name xsi:type="xsd:string">InternetGatewayDevice.ManagementServer.ConnectionRequestURL</Name> - <Value xsi:type="xsd:string">http://123.123.123.123:12345/</Value> - </ParameterValueStruct> - <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> - <Name xsi:type="xsd:string">InternetGatewayDevice.ManagementServer.ParameterKey</Name> - <Value xsi:type="xsd:string">parameterkey</Value> - </ParameterValueStruct> - <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> - <Name xsi:type="xsd:string">InternetGatewayDevice.WANDevice.1.WANConnectionDevice.1.WANPPPConnection.1.ExternalIPAddress</Name> - <Value xsi:type="xsd:string">192.168.0.101</Value> - </ParameterValueStruct> - </ParameterList> -</cwmp:Inform> -</SOAP-ENV:Body> -</SOAP-ENV:Envelope> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378 (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,56 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1378</package-type> - <namespaceURI>http://www.example.com/Example</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1378.Echo</java-type> - <anonymous-type-qname xmlns:typeNS='http://www.example.com/Example'>typeNS:&gt;E... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>value</java-variable-name> - <xml-element-name>value</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1378.EchoResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://www.example.com/Example'>typeNS:&gt;E... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>result</java-variable-name> - <xml-element-name>result</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1378.ExampleService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://www.example.com/Example'>serviceNS:Exa... - <port-mapping> - <port-name>ExamplePort</port-name> - <java-port-name>ExamplePort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1378.ExamplePort</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://www.example.com/Example'>portTypeNS:E... - <wsdl-binding xmlns:bindingNS='http://www.example.com/Example'>bindingNS:Exa... - <service-endpoint-method-mapping> - <java-method-name>echo</java-method-name> - <wsdl-operation>Echo</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://www.example.com/Example'>wsdlMsgNS:Ech... - <wsdl-message-part-name>value</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://www.example.com/Example'>wsdlMsgNS:Ech... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1378.ExamplePortBean</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,16 +0,0 @@ -<webservices xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd' version='1.1'> - <webservice-description> - <webservice-description-name>ExampleService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/ExampleService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>ExamplePort</port-component-name> - <wsdl-port xmlns:portNS='http://www.example.com/Example'>portNS:ExamplePo... - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1378.ExamplePort</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,78 +0,0 @@ -<?xml version="1.0"?> -<definitions - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap12/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:tns="http://www.example.com/Example" - xmlns:xmime="http://www.w3.org/2005/05/xmlmime" - targetNamespace="http://www.example.com/Example" - name="Example" - > - - <types> - <xsd:schema - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.example.com/Example" - elementFormDefault="qualified" - > - - <xsd:element name="Echo"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" - minOccurs="1" maxOccurs="1" - /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="EchoResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="result" type="xsd:string" - minOccurs="1" maxOccurs="1" - /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - </xsd:schema> - </types> - - <message name="EchoInMsg"> - <part name="echo" element="tns:Echo"/> - </message> - - <message name="EchoOutMsg"> - <part name="echo" element="tns:EchoResponse"/> - </message> - - <portType name="ExamplePort"> - <operation name="Echo"> - <input message="tns:EchoInMsg"/> - <output message="tns:EchoOutMsg"/> - </operation> - </portType> - - <binding name="ExampleBinding" type="tns:ExamplePort"> - <soap:binding style="document" - transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="Echo"> - <soap:operation style="document" - soapAction="http://www.example.com/Example/Echo"/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - - <service name="ExampleService"> - <port name="ExamplePort" binding="tns:ExampleBinding"> - <soap:address location="http://REPLACE_WITH_ACTUAL_URL" /> - </port> - </service> - -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -config wstools-config.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools - http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.jbws1378" namespace="http://www.example.com/Example"/> - </global> - - <wsdl-java location="./WEB-INF/wsdl/ExampleService.wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - <webservices servlet-link="ExampleService" /> - </wsdl-java> - -</configuration> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384 (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1384</package-type> - <namespaceURI>http://org.jboss.test.webservice/samples2</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1384</package-type> - <namespaceURI>http://org.jboss.test.webservice/samples2/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1384.ParaListType</java-type> - <root-type-qname xmlns:typeNS="http://org.jboss.test.webservice/samples2/types">typeNS:paraListType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>username</java-variable-name> - <xml-element-name>username</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>password</java-variable-name> - <xml-element-name>password</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>operationName</java-variable-name> - <xml-element-name>operationName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>inputXML</java-variable-name> - <xml-element-name>inputXML</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1384.ResponseType</java-type> - <root-type-qname xmlns:typeNS="http://org.jboss.test.webservice/samples2/types">typeNS:responseType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>result</java-variable-name> - <xml-element-name>result</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1384.Gasherbrum</service-interface> - <wsdl-service-name xmlns:serviceNS="http://org.jboss.test.webservice/samples2">serviceNS:Gasherbrum</wsdl-service-name> - <port-mapping> - <port-name>TransmulatorInterfacePort</port-name> - <java-port-name>TransmulatorInterfacePort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1384.TransmulatorInterface</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://org.jboss.test.webservice/samples2">portTypeNS:TransmulatorInterface</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://org.jboss.test.webservice/samples2">bindingNS:TransmulatorInterfaceBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>invokeAttach</java-method-name> - <wsdl-operation>invokeAttach</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message> - <wsdl-message-part-name>username</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message> - <wsdl-message-part-name>password</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>2</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message> - <wsdl-message-part-name>operationName</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>3</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message> - <wsdl-message-part-name>inputXML</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>4</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message> - <wsdl-message-part-name>attachmentContents</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1384.TranslatorBean</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,16 +0,0 @@ -<webservices xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd' version='1.1'> - <webservice-description> - <webservice-description-name>ExampleService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/ExampleService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TransmulatorInterfacePort</port-component-name> - <wsdl-port xmlns:portNS='http://org.jboss.test.webservice/samples2'>portNS:TransmulatorInterfacePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1384.TransmulatorInterface</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,65 +0,0 @@ -<definitions name="Gasherbrum" targetNamespace="http://org.jboss.test.webservice/samples2" xmlns:tns="http://org.jboss.test.webservice/samples2" - xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns2="http://org.jboss.test.webservice/samples2/types" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <types> - <schema targetNamespace="http://org.jboss.test.webservice/samples2/types" xmlns:tns="http://org.jboss.test.webservice/samples2/types" - xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns="http://www.w3.org/2001/XMLSchema"> - <complexType name="paraListType"> - <sequence> - <element name="username" type="string" nillable="true"/> - <element name="password" type="string" nillable="true"/> - <element name="operationName" type="string" nillable="true"/> - <element name="inputXML" type="string" nillable="true"/> - </sequence> - </complexType> - <complexType name="responseType"> - <sequence> - <element name="result" type="string" nillable="true"/> - </sequence> - </complexType> - <element name="paraList2" type="tns:paraListType"/> - <element name="responseXML" type="tns:responseType"/> - </schema> - </types> - <message name="attachRequest"> - <part name="parameters" element="ns2:paraList2"/> - <part name="attachmentContents" type="xsd:string"/> - </message> - <message name="attachResponse"> - <part name="result" element="ns2:responseXML"/> - </message> - <portType name="TransmulatorInterface"> - <operation name="invokeAttach"> - <input message="tns:attachRequest"/> - <output message="tns:attachResponse"/> - </operation> - </portType> - <binding name="TransmulatorInterfaceBinding" type="tns:TransmulatorInterface"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <operation name="invokeAttach"> - <input> - <mime:multipartRelated> - <mime:part> - <soap:body use="literal"/> - </mime:part> - <mime:part> - <mime:content part="attachmentContents" type="text/plain"/> - </mime:part> - </mime:multipartRelated> - </input> - <output> - <mime:multipartRelated> - <mime:part> - <soap:body use="literal"/> - </mime:part> - </mime:multipartRelated> - </output> - </operation> - </binding> - <service name="Gasherbrum"> - <port name="TransmulatorInterfacePort" binding="tns:TransmulatorInterfaceBinding"> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wscompile -cp ../../../../output/classes -gen:server -mapping jaxrpc-mapping.xml -keep config.xml ---> - -<configuration - xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config"> - - <wsdl location="./WEB-INF/wsdl/ExampleService.wsdl" - packageName="org.jboss.test.ws.jaxrpc.jbws1384"> - </wsdl> - -</configuration> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml 2007-01-11 14:44:14 UTC (rev 1924) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -config wstools-config.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools - http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.jbws1384" namespace="http://org.jboss.test.webservice/samples2"/> - </global> - - <wsdl-java location="./WEB-INF/wsdl/ExampleService.wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - <webservices servlet-link="ExampleService" /> - </wsdl-java> - -</configuration> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml (from rev 1924, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410 (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml 2007-01-10 22:43:08 UTC (rev 1912) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1410</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1410/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1410.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1410'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1410.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1410'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1410'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoSimple</java-method-name> - <wsdl-operation>echoSimple</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1410'>wsdlMsgNS:TestEndpoint_echoSimple</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1410'>wsdlMsgNS:TestEndpoint_echoSimpleResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml 2007-01-10 22:43:08 UTC (rev 1912) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1410.TestEndpointImpl</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/web.xml) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml 2007-01-10 22:43:08 UTC (rev 1912) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1410' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1410.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/webservices.xml) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl 2007-01-10 22:43:08 UTC (rev 1912) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1410' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1410' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoSimple'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoSimpleResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoSimple' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoSimple'/> - <output message='tns:TestEndpoint_echoSimpleResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoSimple'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1410' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1410' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml 2007-01-10 22:43:08 UTC (rev 1912) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml 2007-01-11 15:09:20 UTC (rev 1928) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1410.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1410" type-namespace="http://org.jboss.test.ws/jbws1410/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> - -<!-- - <handler> - <handler-name>ServerHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1410.ServerHandler</handler-class> - </handler> ---> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml (from rev 1912, branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1410/wstools-config.xml)