Author: thomas.diesler(a)jboss.com Date: 2006-11-21 15:29:19 -0500 (Tue, 21 Nov 2006) New Revision: 1495 Added: trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/ trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java trunk/src/test/resources/jaxrpc/jbws1093/ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml trunk/src/test/resources/jaxws/jbws981/ trunk/src/test/resources/jaxws/jbws981/META-INF/ trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/ trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxws/jbws981/wstools-config.xml trunk/src/test/resources/tools/jbws1080/ trunk/src/test/resources/tools/jbws1080/wstools-config.xml Removed: trunk/docs/JBossWS.doc trunk/docs/project/ trunk/docs/wscompileIssues.txt trunk/docs/wsdl_mapping.doc trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java trunk/src/test/resources/jaxrpc/jbws1093/META-INF/ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml trunk/src/test/resources/jaxws/jbws981/META-INF/ trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/ trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxws/jbws981/wstools-config.xml trunk/src/test/resources/tools/jbws1080/wstools-config.xml Modified: trunk/build.xml trunk/docs/user-guide/project/build.xml trunk/docs/user-guide/project/en/modules/installation/install-jboss.xml trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml trunk/docs/user-guide/project/en/modules/introduction.xml trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java trunk/src/main/resources/dist/ReleaseNotes.txt trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml trunk/src/main/resources/schema/jbossws-tool_1_0.xsd trunk/src/test/ant/build-jars-jaxrpc.xml trunk/src/test/ant/build-jars-jaxws.xml trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java Log: [JBWS-1301] Link install instructions in the user guide to release specific file [JBWS-1080] Made namespaces element mandatory in wstools configuration as it is required. [JBWS-981] Allow virtual hosts to be specified for EJB3 endpoints. [JBWS-1093] Refactoring of deployment to allow correct identification of servlets and web services. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/build.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -468,7 +468,7 @@ <target name="most" description="Builds almost everything." depends="jars"/> <target name="all" description="Create a distribution zip file" - depends="main,jbossws-thirdparty-jar,build-samples,build-docs,build-bin-dist,build-src-dist"> + depends="build-bin-dist,build-src-dist"> </target> <!-- Build the documentation --> @@ -477,7 +477,8 @@ </target> <!-- Build the bin dist --> - <target name="build-bin-dist" description="Build the binary distribution"> + <target name="build-bin-dist" description="Build the binary distribution" + depends="main,jbossws-thirdparty-jar,build-samples,build-docs"> <mkdir dir="${build.bin.dist}"/> <mkdir dir="${build.bin.dist}/bin"/> @@ -489,6 +490,7 @@ <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/> <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/> + <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> <fileset dir="${src.dist.dir}"/> <filterset> Deleted: trunk/docs/JBossWS.doc =================================================================== (Binary files differ) Modified: trunk/docs/user-guide/project/build.xml =================================================================== --- trunk/docs/user-guide/project/build.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/user-guide/project/build.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -16,10 +16,14 @@ <!-- all.doc --> <target name="all.doc" depends="get-docbook-support, copy-templates"> - <ant antfile="${doc.module.home}/build-docbook.xml" inheritall="false"> <property name="docbook-support.home" value="${docbook-support.home}"/> </ant> + <copy todir="build/en" file="../../../src/main/resources/dist/Install.txt" filtering="yes" overwrite="yes"> + <filterset> + <filtersfile file="../../../version.properties"/> + </filterset> + </copy> </target> <!-- get-docbook-support --> Modified: trunk/docs/user-guide/project/en/modules/installation/install-jboss.xml =================================================================== --- trunk/docs/user-guide/project/en/modules/installation/install-jboss.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/user-guide/project/en/modules/installation/install-jboss.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -34,5 +34,7 @@ <para>The integration layer hooks into the JBoss deployer architecture and allows you to hot-deploy POJO and EJB endpoints. The packaging of a standard portable J2EE-1.4 web service endpoints is defined by the JSR109 specification. JBossWS also supports JSR181 endpoints, which are significantly easier to develop and maintain.</para> + + <para>Additionally, please have a look at the <ulink url="http://labs.jboss.com/jbossws/user-guide/en/Install.txt"&g... specific install instructions</ulink>.</para> </sect1> Modified: trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml =================================================================== --- trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/user-guide/project/en/modules/installation/install-tomcat.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -64,4 +64,6 @@ </tomcat-users> ]]></programlisting></para> + <para>Additionally, please have a look at the <ulink url="http://labs.jboss.com/jbossws/user-guide/en/Install.txt"&g... specific install instructions</ulink>.</para> + </sect1> Modified: trunk/docs/user-guide/project/en/modules/introduction.xml =================================================================== --- trunk/docs/user-guide/project/en/modules/introduction.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/user-guide/project/en/modules/introduction.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <chapter id="introduction"> - <title>Introdcution</title> + <title>Introduction</title> <sect1 id="features"> <title>Features</title> Deleted: trunk/docs/wscompileIssues.txt =================================================================== --- trunk/docs/wscompileIssues.txt 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/docs/wscompileIssues.txt 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,10 +0,0 @@ -Issues seen using wscompile tool from Sun -======================================== -1. wscompile tool does not support element groups. It does not support the presence of <xsd:group> inside a complex type. -2. wscompile does not support complex type inheritance with restriction. -3. xsd:choice construct is unsupported. -4. Complex Types with mixed content. Does not generate java classes, but does the trick in serializers. -5. When <xsd:anyAttribute/> is added to a schema type, wscompile will not generate the java type for that schema type. It generates a literalserializer class instead. -6. When <xsd:element name="street" substitutionGroup="avenue"/> substitutionGroup will make wscompile to not generate a Java class but a literalserializer class. -7. Noticed an issue with Nillable Types where wscompile does not generate accessors for byte. This is the reason for the sole failure in XSDToJavaTestCase. - Deleted: trunk/docs/wsdl_mapping.doc =================================================================== (Binary files differ) Modified: trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -34,10 +34,8 @@ import org.jboss.ws.metadata.UnifiedMetaData; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; -import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB21; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; -import org.jboss.ws.metadata.builder.jaxws.JAXWSProviderMetaDataBuilder; import org.jboss.ws.server.ServiceEndpointInfo; import org.jboss.ws.server.ServiceEndpointManager; import org.jboss.ws.server.WSDLFilePublisher; Copied: trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java (from rev 1385, branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentLoader.java) Modified: trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -150,7 +150,7 @@ { this.virtualHosts = virtualHosts; } - + public String getURLPattern() { return urlPattern; Modified: trunk/src/main/resources/dist/ReleaseNotes.txt =================================================================== --- trunk/src/main/resources/dist/ReleaseNotes.txt 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/resources/dist/ReleaseNotes.txt 2006-11-21 20:29:19 UTC (rev 1495) @@ -13,27 +13,72 @@ If you have any questions, please post to the JBossWS User Forum http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 +For details see the change log. +http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel + +For issues that are scheduled for future versions see the road map. +http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:roadmap-panel + What's new in jbossws-(a)version.id@ ---------------------------------- -* [JBWS-852] Integration with Mikrocontainer -* [JBWS-865] Support security annotations for EJB3 endpoints -* [JBWS-871] Arrays with JSR181 endpoints -* [JBWS-923] Complete MTOM for rpc/literal -* [JBWS-776] WSDLToJava Support wildcards +* [JBWS-660] XOP inline base64Binary and sign message +* [JBWS-779] Add webservices.xml support to wsdlTojava +* [JBWS-868] BPEL in jbossws-samples +* [JBWS-1113] Improve performance of Service.getPort() +* [JBWS-1178] Multiple virtual host and soap:address problem +* [JBWS-1182] Change wsdl-java@file to wsdl-java@location +* [JBWS-1200] Provide source download for GA release +* [JBWS-1261] Provide support for additional MTOM java types besides byte[] +* [JBWS-1299] Add support for wsdl-java@parameter-style +* [JBWS-1302] Use EAR name in context root for EJB endpoints +* [JBWS-1323] Add JBoss EULA * Bug fixes -For details see the change log. -http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel - Errata ------ -* None +* FIXME: [JBWS-1291] Fix JaxrpcMappingValidator +* FIXME: [JBWS-1292] Fix XOPElementRPCTestCase +* FIXME: [JBWS-269] Support attachments in Web Services Tools +* FIXME: [JBWS-269] Support attachments in Web Services Tools +* FIXME: [JBWS-434] Support sequences of anys +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums -For issues that are scheduled for future versions see the road map. -http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:roadmap-panel +Enjoy, +The JBossWS Team +Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +What's new in jbossws-1.0.3 +---------------------------------- + +* [JBWS-983] Configure SOAPAction on the Call object +* [JBWS-1090] preventing override of webservices.xml when multiple web services are processed with wstools +* [JBWS-1160] XOP Inline base64 for doc/lit requests +* Bug fixes + +What's new in jbossws-1.0.2 +---------------------------------- + +* [JBWS-855] Provide MTOM for document/literal +* [JBWS-920] integrate wstools wsdl2java functionality +* [JBWS-921] integrate wstools java2wsdl functionality +* [JBWS-932] Performance bottleneck when marshalling array types +* Bug fixes + +What's new in jbossws-1.0.1 +---------------------------------- + +* [JBWS-776] WSDLToJava Support wildcards +* [JBWS-852] Integration with Mikrocontainer +* [JBWS-865] Support security annotations for EJB3 endpoints +* [JBWS-871] Arrays with JSR181 endpoints +* [JBWS-923] Complete MTOM for rpc/literal +* Bug fixes + Enjoy, The JBossWS Team \ No newline at end of file Modified: trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml =================================================================== --- trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -7,7 +7,7 @@ <!-- --> <!-- ===================================================================== --> -<!-- $Id$ --> +<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler(a)jboss.com $ --> <!-- | For more configuration infromation and examples see the Jakarta Log4j @@ -22,7 +22,7 @@ <!-- A time/date based rolling appender --> <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="/usr/java/tomcat/logs/jbossws.log"/> + <param name="File" value="../logs/jbossws.log"/> <param name="Append" value="false"/> <!-- Rollover at midnight each day --> Modified: trunk/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 20:29:19 UTC (rev 1495) @@ -201,7 +201,7 @@ <xs:complexType name="javaToWsdlType"> <xs:sequence> <xs:element name="service" type="ns1:serviceType"/> - <xs:element name="namespaces" type="ns1:namespacesType" minOccurs="0"> + <xs:element name="namespaces" type="ns1:namespacesType"> <xs:annotation> <xs:documentation>Namespaces to use when generating the WSDL file.</xs:documentation> </xs:annotation> Modified: trunk/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -565,6 +565,33 @@ </metainf> </jar> + <!-- jbossws-jbws1093 --> + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1093.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1093-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <!-- jaxrpc-jbws1107 --> <war warfile="${build.test.dir}/libs/jaxrpc-jbws1107.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -106,6 +106,25 @@ </fileset> </jar> + <!-- jaxws-jbws981 --> + <jar destfile="${build.test.dir}/libs/jaxws-jbws981.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/> + </fileset> + </jar> + <jar destfile="${build.test.dir}/libs/jaxws-jbws981-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxws/jbws981/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/TestService.wsdl"/> + </metainf> + </jar> + <!-- jaxws-jbws1178 --> <war destfile="${build.test.dir}/libs/jaxws-jbws1178.war" webxml="${build.test.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -320,12 +320,9 @@ inObj.setMyString("String1"); inObj.setMyStringArray(new String[] { "String1", "String2" }); - System.out.println("FIXME: [JBWS-485] SOAP encoded arrays as bean properties"); - if (true) - return; - - JavaBean retObj = port.javaBeanTest(inObj); - assertEquals(inObj, retObj); + //Wont't fix: [JBWS-485] SOAP encoded arrays as bean properties + //JavaBean retObj = port.javaBeanTest(inObj); + //assertEquals(inObj, retObj); } public void testLongArrayTest() throws Exception @@ -470,12 +467,9 @@ inObj.setMyString("String1"); inObj.setMyStringArray(new String[] { "String1", "String2" }); - System.out.println("FIXME: [JBWS-485] SOAP encoded arrays as bean properties"); - if (true) - return; - - ValueType retObj = port.valueTypeTest(inObj); - assertEquals(inObj, retObj); + //Wont't fix: [JBWS-485] SOAP encoded arrays as bean properties + //ValueType retObj = port.valueTypeTest(inObj); + //assertEquals(inObj, retObj); } public void testVoidTest() throws Exception Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093 (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,99 +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.jbws1093; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.jaxrpc.ServiceFactoryImpl; - -/** - * Test case to test that when a deployment contains both an endpoint and a - * servlet both are deployed correctly and can be accessed. - * - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class JBWS1093TestCase extends JBossWSTest -{ - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar"); - } - - public void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - if (isTargetServerJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1093", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - } - - public void testAccessServlet() throws Exception - { - String host = System.getProperty("jbosstest.host.name"); - URL servletURL = new URL("http://" + host + ":8080" + "/jaxrpc-jbws1093/ServletTest"); - - InputStream is = servletURL.openStream(); - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr); - - String line = br.readLine(); - - assertEquals(ServletTest.MESSAGE, line); - } - - public void testAccessEnpoint() throws Exception - { - assertEquals(ServletTest.MESSAGE, port.echoString(ServletTest.MESSAGE)); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,53 +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.jbws1093; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * JBWS-1093 - This servlet is called ServletTest to check that we are - * not identifying servlets by the classname ending in 'Servlet'. - * - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class ServletTest extends HttpServlet -{ - - private static final long serialVersionUID = 8465532467878198647L; - - public static final String MESSAGE = "Success!!"; - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - ServletOutputStream sos = response.getOutputStream(); - sos.println(MESSAGE); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,36 +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.jbws1093; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public interface TestEndpoint extends Remote -{ - - public String echoString(final String message) throws RemoteException; - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -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.jbws1093; - -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public String echoString(String message) throws RemoteException - { - return message; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java) Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -133,6 +133,31 @@ } + /** + * An element declared as wildcard uses an element + * declared in schema as wildcard contents. + */ + public void testWildCardContentsDeclared() throws Exception + { + SOAPFactory factory = SOAPFactory.newInstance(); + + SOAPElement el1 = factory.createElement("knownWildcard", "ns1", "http://somens"); + el1.setValue("Kermmit"); + + System.out.println("FIXME: [JBWS-434] Support sequences of anys"); + if (true) return; + + TypeOfAny3 inObj = new TypeOfAny3(el1); + TypeOfAny3 retObj = port.echo3(inObj); + + assertNotNull(retObj); + assertNotNull(retObj._any); + + SOAPElement inE = inObj._any; + SOAPElement retE = retObj._any; + assertEquals(inE, retE); + } + private static void assertEquals(SOAPElement myE, SOAPElement otherE) { assertEquals(otherE.getLocalName(), myE.getLocalName()); Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981 (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,67 +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.jaxws.jbws981; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.annotation.PortComponent; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -@Stateless -@WebService(name = "EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "TestService") -@SOAPBinding(style = SOAPBinding.Style.RPC) -@PortComponent(virtualHosts = { "localhost", "www.jboss.org" }) -public class EJB3Bean implements EJB3RemoteInterface -{ - - private static final Logger log = Logger.getLogger(EJB3Bean.class); - - @WebMethod - public String hello(final String message) - { - MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); - try - { - ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule...; - mbeanServer.getMBeanInfo(on); - } - catch (Exception e) - { - log.error(e); - return e.getMessage(); - } - - return message; - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -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.jaxws.jbws981; - - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public interface EJB3RemoteInterface -{ - - public String hello(final String message); - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 02 21:17:37 CET 2006 - * - * 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.jaxws.jbws981; -public interface EndpointInterface extends java.rmi.Remote -{ - - public java.lang.String hello(java.lang.String string_1) throws java.rmi.RemoteException; -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java) Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,64 +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.jaxws.jbws981; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public class JBWS981TestCase extends JBossWSTest -{ - - private static EndpointInterface port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar, jaxws-jbws981-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (EndpointInterface)service.getPort(EndpointInterface.class); - } - } - - public void testCall() throws Exception - { - String message = "hello"; - assertEquals(message, port.hello(message)); - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java) Copied: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080 (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080) Deleted: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,54 +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.tools.jbws1080; - -import java.io.IOException; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.tools.WSTools; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public class JBWS1080TestCase extends JBossWSTest -{ - - public final void testNoNamespaceElement() throws Exception - { - String resourceDir = "resources/tools/jbws1080"; - String toolsDir = "tools/jbws1080"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - - try - { - new WSTools().generate(args); - fail("Expected exception not thrown."); - } - catch (IOException e) - { - assertTrue("Expected error", e.getMessage().contains("'{\"http://www.jboss.org/jbossws-t... is expected.")); - } - } - -} Copied: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java) Deleted: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,37 +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.tools.jbws1080; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public interface TestEndpoint extends Remote -{ - - public String hello(final String message) throws RemoteException; - -} Copied: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java (from rev 1385, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/TestEndpoint.java) Modified: trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-21 20:02:08 UTC (rev 1494) +++ trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2006-11-21 20:29:19 UTC (rev 1495) @@ -65,7 +65,8 @@ System.out.println("FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums"); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); - //Add Enum support! + + System.out.println("FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums"); //assertTrue("Source Files Match:", sc.validate()); //sc.validateImports(); Copied: trunk/src/test/resources/jaxrpc/jbws1093 (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093) Copied: trunk/src/test/resources/jaxrpc/jbws1093/META-INF (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client 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/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/application-client.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1093/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -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.jbws1093</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1093/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1093'>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.jbws1093.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1093'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1093'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoString</java-method-name> - <wsdl-operation>echoString</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/jbws1093'>wsdlMsgNS:TestEndpoint_echoString</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/jbws1093'>wsdlMsgNS:TestEndpoint_echoStringResponse</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/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,29 +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>ServletTest</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1093.ServletTest</servlet-class> - </servlet> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ServletTest</servlet-name> - <url-pattern>/ServletTest</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/web.xml) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1093' 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.jbws1093.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/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml) Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1093' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1093' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoString'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoStringResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoString' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoString'/> - <output message='tns:TestEndpoint_echoStringResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoString'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://localhost:8080//jaxrpc-jbws1093/TestEndpoint?wsdl'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl) Deleted: trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml ---> - -<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl' to run with Tomcat --> - -<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.jbws1093.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1093" type-namespace="http://org.jboss.test.ws/jbws1093/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> Copied: trunk/src/test/resources/jaxrpc/jbws1093/wstools-config.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1093/wstools-config.xml) Copied: trunk/src/test/resources/jaxws/jbws981 (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981) Copied: trunk/src/test/resources/jaxws/jbws981/META-INF (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF) Deleted: trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/application-client.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client 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/application-client_1_4.xsd" - version="1.4"> - - <display-name>JBWS981 Test</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws981.EndpointInterface</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/application-client.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/application-client.xml) Deleted: trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -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.jaxws.jbws981</package-type> - <namespaceURI>http://www.jboss.org/test/ws/jaxws/jbws981</namespaceU... - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxws.jbws981.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://www.jboss.org/test/ws/jaxws/jbws981'>s... - <port-mapping> - <port-name>EndpointInterfacePort</port-name> - <java-port-name>EndpointInterfacePort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws981.EndpointInterface</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://www.jboss.org/test/ws/jaxws/jbws981'>... - <wsdl-binding xmlns:bindingNS='http://www.jboss.org/test/ws/jaxws/jbws981'>b... - <service-endpoint-method-mapping> - <java-method-name>hello</java-method-name> - <wsdl-operation>hello</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://www.jboss.org/test/ws/jaxws/jbws981'>w... - <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://www.jboss.org/test/ws/jaxws/jbws981'>w... - <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/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/jaxrpc-mapping.xml) Deleted: trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,9 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/jboss-client.xml) Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/wsdl) Deleted: trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,35 +0,0 @@ -<definitions name='TestService' targetNamespace='http://www.jboss.org/test/ws/jaxws/jbws981' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://www.jboss.org/test/ws/jaxws/jbws981' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types></types> - <message name='EndpointInterface_hello'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='EndpointInterface_helloResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='EndpointInterface'> - - <operation name='hello' parameterOrder='String_1'> - <input message='tns:EndpointInterface_hello'/> - <output message='tns:EndpointInterface_helloResponse'/> - </operation> - </portType> - <binding name='EndpointInterfaceBinding' type='tns:EndpointInterface'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='hello'> - <soap:operation soapAction=''/> - - <input> - <soap:body namespace='http://www.jboss.org/test/ws/jaxws/jbws981' use='literal'/> - </input> - <output> - <soap:body namespace='http://www.jboss.org/test/ws/jaxws/jbws981' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - - <port binding='tns:EndpointInterfaceBinding' name='EndpointInterfacePort'> - <soap:address location='http://localhost.localdomain:8080/jaxws-jbws981/EJB3Bean'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/META-INF/wsdl/TestService.wsdl) Deleted: trunk/src/test/resources/jaxws/jbws981/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jbws981/wstools-config.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/jaxws/jbws981/wstools-config.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,15 +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"> - - <wsdl-java location="META-INF/wsdl/TestService.wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> - -</configuration> \ No newline at end of file Copied: trunk/src/test/resources/jaxws/jbws981/wstools-config.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/jaxws/jbws981/wstools-config.xml) Copied: trunk/src/test/resources/tools/jbws1080 (from rev 1385, branches/jbossws-1.0/src/test/resources/tools/jbws1080) Deleted: trunk/src/test/resources/tools/jbws1080/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml 2006-11-05 13:11:31 UTC (rev 1385) +++ trunk/src/test/resources/tools/jbws1080/wstools-config.xml 2006-11-21 20:29:19 UTC (rev 1495) @@ -1,14 +0,0 @@ -<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.tools.jbws1080.TestEndpoint" style="rpc" /> - <!--namespaces target-namespace="http://org.jboss.test.ws/jbws1080" - type-namespace="http://org.jboss.test.ws/jbws1080/type" /--> - <mapping file="jaxrpc-mapping.xml" /> - <webservices servlet-link="TestService" append="true" /> - </java-wsdl> - -</configuration> \ No newline at end of file Copied: trunk/src/test/resources/tools/jbws1080/wstools-config.xml (from rev 1385, branches/jbossws-1.0/src/test/resources/tools/jbws1080/wstools-config.xml)