Author: thomas.diesler(a)jboss.com Date: 2007-11-01 04:25:36 -0400 (Thu, 01 Nov 2007) New Revision: 4959 Added: stack/native/trunk/jbossws-native-2.0.2.iml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml stack/native/trunk/src/test/resources/jaxws/jbws1854/WEB-INF/jboss-web.xml Removed: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration3TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration2TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration3TestCase.java stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml stack/native/trunk/src/test/resources/jaxrpc/serviceref/ stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml stack/native/trunk/ant.properties.example stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java stack/native/trunk/src/test/resources/jaxrpc/enventry/META-INF/application-client.xml stack/native/trunk/src/test/resources/jaxrpc/jbws128/META-INF/application.xml stack/native/trunk/src/test/resources/jaxws/jbws1702/WEB-INF/jboss-web.xml stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml stack/native/trunk/src/test/resources/jaxws/jbws860/WEB-INF/jboss-web.xml stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/simple-username/WEB-INF/jboss-web.xml stack/native/trunk/src/test/resources/test-excludes-jboss421.txt stack/native/trunk/src/test/resources/test-excludes-jboss422.txt stack/native/trunk/src/test/resources/test-excludes-jboss500.txt stack/native/trunk/version.properties Log: merge -r4847:4956 jbossws-native-2.0.2 Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -2547,11 +2547,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws1762 --> - <war - warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" - webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1762 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.class"/> @@ -2559,65 +2557,26 @@ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> + <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> </war> - - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> - <unwar - src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" - dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> - - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="ejb-jar.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged"> - <include name="jboss.xml"/> - </metainf> - </jar> - - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/> - <unjar - src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar" - dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/> - <copy - file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/jboss.xml" - todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar/META-INF" - overwrite="true"/> - - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.ear"> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> + <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar"> <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws1762-packaged.jar"/> <include name="jaxrpc-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged"> - <include name="application.xml"/> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF"> + <include name="jboss-service.xml"/> </metainf> </jar> - - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear"/> - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/> - <copy - file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml" - todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/> - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"/> - <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"> - <fileset dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> - </copy> - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"/> - <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"> - <fileset dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/> - </copy> - - <!-- jaxrpc-jbws1792 --> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/> + <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"/> + + <!-- jaxrpc-jbws1792 --> <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1792/TestEndpoint.class"/> @@ -2627,11 +2586,10 @@ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> - <include name="custom-endpoint-config.xml"/> + <include name="custom-endpoint-config.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1792-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jbws1792/TestEndpoint.class"/> @@ -2645,27 +2603,8 @@ <include name="wsdl/**"/> </metainf> </jar> - - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws1762-packaged.war"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/> - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/> - <copy - file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml" - todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/> - <unwar - src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" - dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war" - /> - - <!-- jaxrpc-marshall-doclit.war --> + + <!-- jaxrpc-marshall-doclit.war --> <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> @@ -2764,60 +2703,6 @@ </metainf> </jar> - <!-- jaxrpc-serviceref --> - <war warfile="${tests.output.dir}/libs/jaxrpc-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <war destfile="${tests.output.dir}/libs/jaxrpc-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-ejb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <!-- jaxrpc-utf16 --> <war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -3307,4 +3192,4 @@ </target> -</project> +</project> \ No newline at end of file Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -9,13 +9,13 @@ <!-- $Id$ --> <project> - - <description>JBossWS test archive builder</description> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - + + <description>JBossWS test archive builder</description> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + <target name="build-jars-jaxws" description="Build the deployments."> <mkdir dir="${tests.output.dir}/libs"/> @@ -374,24 +374,19 @@ <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/> </fileset> </jar> - - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - <unjar - src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> + <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/> </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> </war> - - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> - <unwar - src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> - + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1762-packaged.war"/> @@ -400,16 +395,10 @@ <include name="jboss-service.xml"/> </metainf> </jar> - - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <copy - file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" - todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <unwar - src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> - + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1762-packaged.jar"/> @@ -417,26 +406,15 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged"> <include name="application.xml"/> - <include name="jboss-app.xml"/> </metainf> </jar> - - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <copy - file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" - todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <copy - file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml" - todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <unwar - src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> - <unjar - src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" - dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/> - - <!-- jaxws-jbws1797 --> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> + <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/> + + <!-- jaxws-jbws1797 --> <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/> @@ -501,7 +479,7 @@ </jar> <!-- jaxws-jbws1815 --> - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1815.ejb3"> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1815.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/> </fileset> @@ -533,6 +511,9 @@ <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.class"/> </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> </war> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1854.sar"> <fileset dir="${tests.output.dir}/libs"> @@ -655,147 +636,143 @@ <antcall target="build-interop-jars"/> </target> - - <target name="build-interop-jars"> - - <!-- Root.war --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-root.war" - webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml"> - <webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/root"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-BaseDataTypesDocLitB.war --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF"> - <include name="wsdl/**.*"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-BaseDataTypesDocLitW.war --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-BaseDataTypesRpcLit.war --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-wsa10.war --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10.war" - webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsa/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/wsa"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-wsse10Encrypt.war --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" - webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - - <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF"> - <include name="wsdl/**.*"/> - <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - - <fileset dir="${tests.output.dir}/resources/interop/wsse/"> - <include name="*.*"/> - </fileset> - </war> - <!-- jbossws-interop-wsse10Encrypt-client.jar --> - <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar"> - <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"/> - </jar> - - <!-- jbossws-interop-wsse10Sign.war --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" - webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - - <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF"> - <include name="wsdl/**.*"/> - <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - - <fileset dir="${tests.output.dir}/resources/interop/wsse/"> - <include name="*.*"/> - </fileset> - </war> - <!-- jbossws-interop-wsse10Sign-client.jar --> - <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar"> - <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/> - </jar> - - <!-- wrap up in an *.ear for easier deployment --> - <ear destfile="${tests.output.dir}/libs/jbossws-interop.ear" appxml="${tests.output.dir}/resources/interop/root/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/libs" includes="*interop*.war"/> - </ear> - - </target> - -</project> + + <target name="build-interop-jars"> + + <!-- Root.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-root.war" webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml"> + <webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + <fileset dir="${tests.output.dir}/resources/interop/root"> + <include name="*.*"/> + </fileset> + </war> + + <!-- jbossws-interop-BaseDataTypesDocLitB.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war" + webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF"> + <include name="wsdl/**.*"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB"> + <include name="*.*"/> + </fileset> + </war> + + <!-- jbossws-interop-BaseDataTypesDocLitW.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war" + webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF"> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW"> + <include name="*.*"/> + </fileset> + </war> + + <!-- jbossws-interop-BaseDataTypesRpcLit.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war" + webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit"> + <include name="*.*"/> + </fileset> + </war> + + <!-- jbossws-interop-wsa10.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10.war" webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/wsa/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF"> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${tests.output.dir}/resources/interop/wsa"> + <include name="*.*"/> + </fileset> + </war> + + <!-- jbossws-interop-wsse10Encrypt.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + + <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF"> + <include name="wsdl/**.*"/> + <include name="jboss-wsse-server.xml"/> + <include name="jboss-web.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> + <include name="alice.jks"/> + <include name="wsse10.truststore"/> + </webinf> + + <fileset dir="${tests.output.dir}/resources/interop/wsse/"> + <include name="*.*"/> + </fileset> + </war> + <!-- jbossws-interop-wsse10Encrypt-client.jar --> + <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar"> + <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"/> + </jar> + + <!-- jbossws-interop-wsse10Sign.war --> + <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> + <include name="org/jboss/test/ws/interop/*.class"/> + </classes> + + <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF"> + <include name="wsdl/**.*"/> + <include name="jboss-wsse-server.xml"/> + <include name="jboss-web.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> + <include name="alice.jks"/> + <include name="wsse10.truststore"/> + </webinf> + + <fileset dir="${tests.output.dir}/resources/interop/wsse/"> + <include name="*.*"/> + </fileset> + </war> + <!-- jbossws-interop-wsse10Sign-client.jar --> + <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar"> + <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/> + </jar> + + <!-- wrap up in an *.ear for easier deployment --> + <ear destfile="${tests.output.dir}/libs/jbossws-interop.ear" appxml="${tests.output.dir}/resources/interop/root/META-INF/application.xml"> + <fileset dir="${tests.output.dir}/libs" includes="*interop*.war"/> + </ear> + + </target> + +</project> \ No newline at end of file Modified: stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -461,6 +461,60 @@ </metainf> </jar> + <!-- jaxrpc-samples-serviceref --> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-ejb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <!-- jaxrpc-samples-swa --> <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/ant.properties.example 2007-11-01 08:25:36 UTC (rev 4959) @@ -8,7 +8,7 @@ #jboss405.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA #jboss421.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA #jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA -#jboss423.home=/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA/ +#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA #jboss500.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 # The JBoss server under test. This can be [jboss405|jboss405.no.ejb3|jboss421|jboss422|jboss500] Copied: stack/native/trunk/jbossws-native-2.0.2.iml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/jbossws-native-2.0.2.iml) =================================================================== --- stack/native/trunk/jbossws-native-2.0.2.iml (rev 0) +++ stack/native/trunk/jbossws-native-2.0.2.iml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,646 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss421-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/streambuffer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/wstx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-remoting.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxws-rt.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-j2ee.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/stax-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/stax-ex.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/serializer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xercesImpl.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/ant.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/mail.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss42-resources.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-jaxb-intros.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-vfs.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xmlsec.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/commons-logging.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/commons-collections.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-impl.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/concurrent.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-scripts.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xmlunit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-log4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-remoting-src.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/qdox.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/resolver.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss421.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xml-apis.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-vfs-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xalan.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-container.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss40-resources.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/javassist.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/hibernate3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/policy.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/log4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j-src.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxen.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.jaxrpc.jbws1010; +// $Id$ + import javax.naming.InitialContext; import javax.xml.rpc.Service; @@ -30,7 +32,10 @@ import org.jboss.wsf.test.JBossWSTestSetup; /** + * [JBWS-1010] - Support for inherited service endpoint interfaces - JAX-RPC 5.5.4 * + * http://jira.jboss.org/jira/browse/JBWS-1010 + * * @author darran.lofthouse(a)jboss.com * @since 27-June-2006 */ Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -29,8 +29,8 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -/** Test that we can deploy an already modified web.xml - * This also allows for redeployment of an expanded *.war +/** + * [JBWS-124] Redeployment of an unpackaged war causes a NoSuchMethodException at runtime * * http://jira.jboss.com/jira/browse/JBWS-124 * Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-exploded/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jbws1762.exploded_sar_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 19, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jbws1762.exploded_sar_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 19, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-exploded/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jbws1762.exploded_war_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 19, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jbws1762.exploded_war_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 19, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-packaged/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jbws1762.packaged_sar_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 19, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jbws1762.packaged_sar_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 19, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-packaged/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jbws1762.packaged_war_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 19, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jbws1762.packaged_war_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 19, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref) Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,68 +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.samples.serviceref; - -import java.rmi.RemoteException; -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class ApplicationClient -{ - // Provide logging - private static Logger log = Logger.getLogger(ApplicationClient.class); - - public static InitialContext encCtx; - public static String retStr; - - public static void main(String[] args) throws RemoteException - { - String inStr = args[0]; - log.info("echo: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - retStr = inStr; - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,68 @@ +/* + * 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.samples.serviceref; + +import java.rmi.RemoteException; +import java.util.ArrayList; + +import javax.naming.InitialContext; +import javax.xml.rpc.JAXRPCException; +import javax.xml.rpc.Service; + +import org.jboss.logging.Logger; + +public class ApplicationClient +{ + // Provide logging + private static Logger log = Logger.getLogger(ApplicationClient.class); + + public static InitialContext encCtx; + public static String retStr; + + public static void main(String[] args) throws RemoteException + { + String inStr = args[0]; + log.info("echo: " + inStr); + + ArrayList ports = new ArrayList(); + try + { + ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + } + catch (Exception ex) + { + log.error("Cannot add port", ex); + throw new JAXRPCException(ex); + } + + for (int i = 0; i < ports.size(); i++) + { + TestEndpoint port = (TestEndpoint)ports.get(i); + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new JAXRPCException("Invalid echo return: " + inStr); + } + + retStr = inStr; + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,93 +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.samples.serviceref; - -import java.rmi.RemoteException; -import java.util.ArrayList; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class EJBClient implements SessionBean -{ - // Provide logging - private static Logger log = Logger.getLogger(EJBClient.class); - - private SessionContext context; - - public String echo(String inStr) throws RemoteException - { - log.info("echo: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - InitialContext iniCtx = new InitialContext(); - ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - return inStr; - } - - // EJB Lifecycle ---------------------------------------------------------------------- - - public void setSessionContext(SessionContext context) throws EJBException, RemoteException - { - this.context = context; - } - - public void ejbCreate() - { - } - - public void ejbRemove() - { - } - - public void ejbActivate() - { - } - - public void ejbPassivate() - { - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,93 @@ +/* + * 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.samples.serviceref; + +import java.rmi.RemoteException; +import java.util.ArrayList; + +import javax.ejb.EJBException; +import javax.ejb.SessionBean; +import javax.ejb.SessionContext; +import javax.naming.InitialContext; +import javax.xml.rpc.JAXRPCException; +import javax.xml.rpc.Service; + +import org.jboss.logging.Logger; + +public class EJBClient implements SessionBean +{ + // Provide logging + private static Logger log = Logger.getLogger(EJBClient.class); + + private SessionContext context; + + public String echo(String inStr) throws RemoteException + { + log.info("echo: " + inStr); + + ArrayList ports = new ArrayList(); + try + { + InitialContext iniCtx = new InitialContext(); + ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + } + catch (Exception ex) + { + log.error("Cannot add port", ex); + throw new JAXRPCException(ex); + } + + for (int i = 0; i < ports.size(); i++) + { + TestEndpoint port = (TestEndpoint)ports.get(i); + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new JAXRPCException("Invalid echo return: " + inStr); + } + + return inStr; + } + + // EJB Lifecycle ---------------------------------------------------------------------- + + public void setSessionContext(SessionContext context) throws EJBException, RemoteException + { + this.context = context; + } + + public void ejbCreate() + { + } + + public void ejbRemove() + { + } + + public void ejbActivate() + { + } + + public void ejbPassivate() + { + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.samples.serviceref; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -public interface EJBRemote extends EJBObject -{ - String echo(String input) throws RemoteException; -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,31 @@ +/* + * 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.samples.serviceref; + +import java.rmi.RemoteException; + +import javax.ejb.EJBObject; + +public interface EJBRemote extends EJBObject +{ + String echo(String input) throws RemoteException; +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,32 +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.samples.serviceref; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -public interface EJBRemoteHome extends EJBHome -{ - EJBRemote create() throws CreateException, RemoteException; -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,32 @@ +/* + * 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.samples.serviceref; + +import java.rmi.RemoteException; + +import javax.ejb.CreateException; +import javax.ejb.EJBHome; + +public interface EJBRemoteHome extends EJBHome +{ + EJBRemote create() throws CreateException, RemoteException; +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxrpc.samples.serviceref; - -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.namespace.QName; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jun 29, 2007 - */ -public class ExampleHandler extends GenericHandler { - - public QName[] getHeaders() - { - return new QName[] { new QName("http://extra-header.org", "extra-header")}; - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,37 @@ +/* + * 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.samples.serviceref; + +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.namespace.QName; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jun 29, 2007 + */ +public class ExampleHandler extends GenericHandler { + + public QName[] getHeaders() + { + return new QName[] { new QName("http://extra-header.org", "extra-header")}; + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,104 +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.samples.serviceref; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceException; -import javax.xml.rpc.ServiceFactory; - -import junit.framework.Test; - -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class ServiceRefClientTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; - - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-client.jar"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testDynamicProxyNeg() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); - try - { - TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); - fail("Expected ServiceException, but got: " + port); - } - catch (ServiceException ex) - { - // this is tested by the CTS - } - catch (Exception ex) - { - fail("Expected ServiceException, but got: " + ex); - } - } - - public void testApplicationClient() throws Exception - { - String helloWorld = "Hello World!"; - ApplicationClient.encCtx = getInitialContext(); - ApplicationClient.main(new String[] { helloWorld }); - assertEquals(helloWorld, ApplicationClient.retStr); - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,104 @@ +/* + * 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.samples.serviceref; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.rpc.ServiceException; +import javax.xml.rpc.ServiceFactory; + +import junit.framework.Test; + +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefClientTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; + + public static Test suite() + { + return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-client.jar"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testDynamicProxyNeg() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); + try + { + TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); + fail("Expected ServiceException, but got: " + port); + } + catch (ServiceException ex) + { + // this is tested by the CTS + } + catch (Exception ex) + { + fail("Expected ServiceException, but got: " + ex); + } + } + + public void testApplicationClient() throws Exception + { + String helloWorld = "Hello World!"; + ApplicationClient.encCtx = getInitialContext(); + ApplicationClient.main(new String[] { helloWorld }); + assertEquals(helloWorld, ApplicationClient.retStr); + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,87 +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.samples.serviceref; - -import java.io.File; -import java.net.MalformedURLException; -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.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class ServiceRefEJBTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; - - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejb-client.jar"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testEJBClient() throws Exception - { - InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/EJBClient"); - EJBRemote ejbRemote = ejbHome.create(); - - String helloWorld = "Hello World!"; - Object retObj = ejbRemote.echo(helloWorld); - assertEquals(helloWorld, retObj); - - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,87 @@ +/* + * 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.samples.serviceref; + +import java.io.File; +import java.net.MalformedURLException; +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.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefEJBTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; + + public static Test suite() + { + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejb-client.jar"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testEJBClient() throws Exception + { + InitialContext iniCtx = getInitialContext(); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/EJBClient"); + EJBRemote ejbRemote = ejbHome.create(); + + String helloWorld = "Hello World!"; + Object retObj = ejbRemote.echo(helloWorld); + assertEquals(helloWorld, retObj); + + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,84 +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.samples.serviceref; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class ServiceRefServletTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; - - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefServletTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-servlet-client.war"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testServletClient() throws Exception - { - URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,84 @@ +/* + * 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.samples.serviceref; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefServletTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; + + public static Test suite() + { + return new JBossWSTestSetup(ServiceRefServletTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-servlet-client.war"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testServletClient() throws Exception + { + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + assertEquals("HelloWorld", retStr); + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,70 +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.samples.serviceref; - -import java.io.IOException; -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class ServletClient extends HttpServlet -{ - // Provide logging - private static Logger log = Logger.getLogger(ServletClient.class); - - protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - String inStr = req.getParameter("echo"); - log.info("doGet: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - InitialContext iniCtx = new InitialContext(); - ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - res.getWriter().print(inStr); - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,70 @@ +/* + * 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.samples.serviceref; + +import java.io.IOException; +import java.util.ArrayList; + +import javax.naming.InitialContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.rpc.JAXRPCException; +import javax.xml.rpc.Service; + +import org.jboss.logging.Logger; + +public class ServletClient extends HttpServlet +{ + // Provide logging + private static Logger log = Logger.getLogger(ServletClient.class); + + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + String inStr = req.getParameter("echo"); + log.info("doGet: " + inStr); + + ArrayList ports = new ArrayList(); + try + { + InitialContext iniCtx = new InitialContext(); + ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + } + catch (Exception ex) + { + log.error("Cannot add port", ex); + throw new JAXRPCException(ex); + } + + for (int i = 0; i < ports.size(); i++) + { + TestEndpoint port = (TestEndpoint)ports.get(i); + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new JAXRPCException("Invalid echo return: " + inStr); + } + + res.getWriter().print(inStr); + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.samples.serviceref; - -import java.rmi.Remote; -import java.rmi.RemoteException; - - -public interface TestEndpoint extends Remote -{ - String echo(String arg0) throws RemoteException; -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,31 @@ +/* + * 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.samples.serviceref; + +import java.rmi.Remote; +import java.rmi.RemoteException; + + +public interface TestEndpoint extends Remote +{ + String echo(String arg0) throws RemoteException; +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,42 +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.samples.serviceref; - -import org.jboss.logging.Logger; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.org - * @since 23-Oct-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - public String echo(String input) - { - log.info(input); - return input; - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,42 @@ +/* + * 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.samples.serviceref; + +import org.jboss.logging.Logger; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.org + * @since 23-Oct-2006 + */ +public class TestEndpointImpl implements TestEndpoint +{ + // Provide logging + private static Logger log = Logger.getLogger(TestEndpointImpl.class); + + public String echo(String input) + { + log.info(input); + return input; + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,19 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.samples.serviceref; - - -import javax.xml.rpc.ServiceException; - - -public interface TestEndpointService extends javax.xml.rpc.Service -{ - - public org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException; - -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,19 @@ +/* +* JBoss, the OpenSource EJB server +* Distributable under LGPL license. See terms of license at gnu.org. +*/ + +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.samples.serviceref; + + +import javax.xml.rpc.ServiceException; + + +public interface TestEndpointService extends javax.xml.rpc.Service +{ + + public org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException; + +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_ear_ejb3; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_ear_ejb3; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-exploded/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_ear_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_ear_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_jar_ejb3; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_jar_ejb3; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-exploded/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_sar_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_sar_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-exploded/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_war_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.exploded_war_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_ear_ejb3; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_ear_ejb3; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-packaged/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_ear_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_ear_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_jar_ejb3; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_jar_ejb3; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-packaged/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_sar_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_sar_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} \ No newline at end of file Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-packaged/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration2TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_war_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration2TestCase extends Iteration1TestCase {} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration3TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.jaxws.jbws1762.packaged_war_pojo; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public class Iteration3TestCase extends Iteration2TestCase {} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -33,11 +33,7 @@ import javax.jws.WebService; @Stateless -@WebService -( - name = "JBWS1762EJB3", - serviceName = "JBWS1762EJB3Service" -) +@WebService(name = "JBWS1762EJB3", serviceName = "JBWS1762EJB3Service") public class EJB3Bean { @WebMethod Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2007-11-01 08:25:36 UTC (rev 4959) @@ -64,7 +64,7 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS1815TestCase.class, "jaxws-jbws1815.ejb3"); + return new JBossWSTestSetup(JBWS1815TestCase.class, "jaxws-jbws1815.jar"); } public void testWSDLAccess() throws Exception Modified: stack/native/trunk/src/test/resources/jaxrpc/enventry/META-INF/application-client.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/enventry/META-INF/application-client.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxrpc/enventry/META-INF/application-client.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -7,6 +7,18 @@ <display-name>JAXRPC simple tests</display-name> + <env-entry> + <env-entry-name>jsr109/entry1</env-entry-name> + <env-entry-type>java.lang.String</env-entry-type> + <env-entry-value>appclient</env-entry-value> + </env-entry> + + <env-entry> + <env-entry-name>jsr109/entry2</env-entry-name> + <env-entry-type>java.lang.Integer</env-entry-type> + <env-entry-value>8</env-entry-value> + </env-entry> + <service-ref> <service-ref-name>service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> @@ -21,17 +33,5 @@ </handler> </service-ref> - <env-entry> - <env-entry-name>jsr109/entry1</env-entry-name> - <env-entry-type>java.lang.String</env-entry-type> - <env-entry-value>appclient</env-entry-value> - </env-entry> - - <env-entry> - <env-entry-name>jsr109/entry2</env-entry-name> - <env-entry-type>java.lang.Integer</env-entry-type> - <env-entry-value>8</env-entry-value> - </env-entry> - </application-client> Modified: stack/native/trunk/src/test/resources/jaxrpc/jbws128/META-INF/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws128/META-INF/application.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws128/META-INF/application.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -10,11 +10,13 @@ <module> <web> <web-uri>jaxrpc-jbws128-service.war</web-uri> + <context-root>/jaxrpc-jbws128-service</context-root> </web> </module> <module> <web> <web-uri>jaxrpc-jbws128-client.war</web-uri> + <context-root>/jaxrpc-jbws128-client</context-root> </web> </module> Copied: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxrpc-jbws1762</context-root> +</jboss-web> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref) Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF) Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,31 +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>JAXRPC simple tests</display-name> - - <service-ref> - <service-ref-name>service1</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.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.samples.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - - <service-ref> - <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.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.samples.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,31 @@ +<?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>JAXRPC simple tests</display-name> + + <service-ref> + <service-ref-name>service1</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestEndpoint.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.samples.serviceref.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + + <service-ref> + <service-ref-name>service2</service-ref-name> + <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> + <wsdl-file>META-INF/wsdl/TestEndpoint.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.samples.serviceref.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<ejb-jar 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/ejb-jar_2_1.xsd" - version="2.1"> - - <enterprise-beans> - <session> - <ejb-name>EJBClient</ejb-name> - <home>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBRemoteHome</home> - <remote>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBRemote</remote> - <ejb-class>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBClient</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - - <service-ref> - <service-ref-name>service1</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.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.samples.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - - <service-ref> - <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.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.samples.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - - </session> - </enterprise-beans> - -</ejb-jar> - Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<ejb-jar 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/ejb-jar_2_1.xsd" + version="2.1"> + + <enterprise-beans> + <session> + <ejb-name>EJBClient</ejb-name> + <home>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBRemoteHome</home> + <remote>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBRemote</remote> + <ejb-class>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBClient</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + + <service-ref> + <service-ref-name>service1</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestEndpoint.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.samples.serviceref.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + + <service-ref> + <service-ref-name>service2</service-ref-name> + <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> + <wsdl-file>META-INF/wsdl/TestEndpoint.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.samples.serviceref.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + + </session> + </enterprise-beans> + +</ejb-jar> + Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -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.samples.serviceref</package-type> - <namespaceURI>http://org.jboss.ws/wsref/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/wsref'>serviceNS:TestEndpointService</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.samples.serviceref.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/wsref'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/wsref'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echo</java-method-name> - <wsdl-operation>echo</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.ws/wsref'>wsdlMsgNS:TestEndpoint_echo</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.ws/wsref'>wsdlMsgNS:TestEndpoint_echoResponse</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: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,37 @@ +<?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.samples.serviceref</package-type> + <namespaceURI>http://org.jboss.ws/wsref/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/wsref'>serviceNS:TestEndpointService</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.samples.serviceref.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/wsref'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/wsref'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echo</java-method-name> + <wsdl-operation>echo</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.ws/wsref'>wsdlMsgNS:TestEndpoint_echo</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.ws/wsref'>wsdlMsgNS:TestEndpoint_echoResponse</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 Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,7 +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: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,7 @@ +<?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: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl) Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echo'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </output> - </operation> - </binding> - <service name='TestEndpointService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-samples-serviceref'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_echo'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </output> + </operation> + </binding> + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-samples-serviceref'/> + </port> + </service> +</definitions> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF) Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,15 +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.samples.serviceref.TestEndpointImpl</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: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,15 @@ +<?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.samples.serviceref.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.ws/wsref' 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>TestEndpointService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestEndpoint.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.samples.serviceref.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: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,15 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.ws/wsref' 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>TestEndpointService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestEndpoint.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.samples.serviceref.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: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/servlet-client) Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF) Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,42 +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>ServletClient</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.samples.serviceref.ServletClient</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ServletClient</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - - <service-ref> - <service-ref-name>service1</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> - <handler> - <handler-name>Handler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.samples.serviceref.ExampleHandler</handler-class> - <!--soap-header xmlns:soap-header_ns__="http://extra-header.org">soap-header_ns__:extra-header</soap-header> - <soap-role>extra-header-actor</soap-role--> - </handler> - </service-ref> - - <service-ref> - <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> - <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</web-app> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,42 @@ +<?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>ServletClient</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.samples.serviceref.ServletClient</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ServletClient</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + + <service-ref> + <service-ref-name>service1</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>Handler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.samples.serviceref.ExampleHandler</handler-class> + <!--soap-header xmlns:soap-header_ns__="http://extra-header.org">soap-header_ns__:extra-header</soap-header> + <soap-role>extra-header-actor</soap-role--> + </handler> + </service-ref> + + <service-ref> + <service-ref-name>service2</service-ref-name> + <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> + <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</web-app> \ No newline at end of file Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -cp ../../../../../output/classes -config wstools-java-wsdl.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.samples.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <java-wsdl> - <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint"/> - <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools -cp ../../../../../output/classes -config wstools-java-wsdl.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.samples.serviceref" namespace="http://org.jboss.ws/wsref"/> + </global> + + <java-wsdl> + <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint"/> + <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> \ No newline at end of file Deleted: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml 2007-10-31 14:39:59 UTC (rev 4956) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -config wstools-wsdl-java.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.samples.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> - -</configuration> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools -config wstools-wsdl-java.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.samples.serviceref" namespace="http://org.jboss.ws/wsref"/> + </global> + + <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> + +</configuration> \ No newline at end of file Modified: stack/native/trunk/src/test/resources/jaxws/jbws1702/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1702/WEB-INF/jboss-web.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxws/jbws1702/WEB-INF/jboss-web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + <jboss-web> <security-domain flushOnSessionInvalidation="false"/> <context-root>/jbws1702</context-root> Modified: stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -9,7 +9,7 @@ <module> <web> <web-uri>jaxws-jbws1762-exploded.war</web-uri> - <context-root>jaxws-jbws1762-exploded</context-root> + <context-root>jaxws-jbws1762</context-root> </web> </module> </application> Deleted: stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> -<jboss-app> - <loader-repository>jbossws.jbws1762:domain=jaxws-jbws1762-exploded.ear</loader-repository> -</jboss-app> \ No newline at end of file Modified: stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -9,7 +9,7 @@ <module> <web> <web-uri>jaxws-jbws1762-packaged.war</web-uri> - <context-root>jaxws-jbws1762-packaged</context-root> + <context-root>jaxws-jbws1762</context-root> </web> </module> </application> Deleted: stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> -<jboss-app> - <loader-repository>jbossws.jbws1762:domain=jaxws-jbws1762-packaged.ear</loader-repository> -</jboss-app> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbws1762</context-root> +</jboss-web> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxws/jbws1854/WEB-INF/jboss-web.xml (from rev 4956, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1854/WEB-INF/jboss-web.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1854/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1854/WEB-INF/jboss-web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <!-- Use an explicit context, because the default context in jboss-5.0.0 prepends the sar name --> + <context-root>/jaxws-jbws1854</context-root> +</jboss-web> Modified: stack/native/trunk/src/test/resources/jaxws/jbws860/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws860/WEB-INF/jboss-web.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxws/jbws860/WEB-INF/jboss-web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + <jboss-web> <context-root>/test</context-root> </jboss-web> \ No newline at end of file Modified: stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/simple-username/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/simple-username/WEB-INF/jboss-web.xml 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/simple-username/WEB-INF/jboss-web.xml 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + <jboss-web> <security-domain>java:/jaas/JBossWS</security-domain> </jboss-web> \ No newline at end of file Modified: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,6 +1,8 @@ # EJB3/Injection excludes org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/webserviceref/** +org/jboss/test/ws/jaxws/jbws1762/** +org/jboss/test/ws/jaxrpc/jbws1762/** # [JBWS-1797] Setting .NET friendly Endpoint in web.xml org/jboss/test/ws/jaxws/jbws1797/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,6 +1,8 @@ # EJB3/Injection excludes org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/webserviceref/** +org/jboss/test/ws/jaxws/jbws1762/** +org/jboss/test/ws/jaxrpc/jbws1762/** # [JBWS-1797] Setting .NET friendly Endpoint in web.xml org/jboss/test/ws/jaxws/jbws1797/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-01 08:25:36 UTC (rev 4959) @@ -1,7 +1,42 @@ -# Fix before JBoss50 goes final -org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* -org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* -org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* +# Fix BPEL before AS50 goes final org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* -org/jboss/test/ws/jaxrpc/wsdlpublish/** +# [JBAS-4901] Reverse paths are not allowed (containing a . or ..) +org/jboss/test/ws/jaxws/jbws1798/** +org/jboss/test/ws/jaxrpc/jbws153/** + +# [JBAS-4902] nested jar not deployed +org/jboss/test/ws/jaxrpc/jbws128/** +org/jboss/test/ws/jaxrpc/jbws165/** +org/jboss/test/ws/jaxrpc/jbws331/** +org/jboss/test/ws/jaxrpc/jbws358/** +org/jboss/test/ws/jaxrpc/jbws772/** +org/jboss/test/ws/jaxws/jbws1813/** +org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/** +org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/** +org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/** +org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/** + +# [JBAS-4890] EJBAccessException: Caller unauthorized +org/jboss/test/ws/jaxws/samples/context/** + +# [JBAS-4903] EJB 2.1 view cannot be realized +org/jboss/test/ws/jaxws/jbws944/** + +# [JBAS-4923] No valid security context for the caller identity +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* + +# [JBAS-4930] Cannot lookup ejb3 remote proxy +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* +org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.* + +# [JBAS-4931] Fix ejb3 ClientLaucher +org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.* +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBAS-4932] Invalid principal: anonymous +org/jboss/test/ws/jaxrpc/jbws723/** +org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.* +org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.* + + Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2007-10-31 14:41:44 UTC (rev 4958) +++ stack/native/trunk/version.properties 2007-11-01 08:25:36 UTC (rev 4959) @@ -25,9 +25,9 @@ # Dependend integration projects jbossws-spi=1.0.0.GA -jbossws-common=snapshot -jbossws-framework=snapshot -jbossws-jboss40=snapshot +jbossws-common=1.0.1.GA +jbossws-framework=2.0.2.GA +jbossws-jboss40=2.0.2.GA jbossws-jboss42=2.0.1.GA # JBossAS-5.0