Author: thomas.diesler(a)jboss.com Date: 2007-10-24 09:10:52 -0400 (Wed, 24 Oct 2007) New Revision: 4882 Added: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java Log: [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail use explicit context root Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml 2007-10-24 13:10:52 UTC (rev 4882) @@ -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,17 +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 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"/> - <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" - /> - - <!-- jaxrpc-jbws1792 --> + <!-- 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"/> @@ -2579,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"/> @@ -2597,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"/> @@ -3259,4 +3246,4 @@ </target> -</project> +</project> \ No newline at end of file Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml 2007-10-24 13:10:52 UTC (rev 4882) @@ -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,26 +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"/> @@ -402,17 +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"/> @@ -423,25 +409,14 @@ <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"/> + <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 --> <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"/> @@ -663,147 +638,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/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-exploded/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-exploded/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-packaged/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-packaged/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-exploded/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-exploded/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-exploded/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-packaged/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-packaged/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration1TestCase.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxws-jbws1762-packaged/POJOBean?wsdl"; + return "jaxws-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java 2007-10-24 12:56:38 UTC (rev 4881) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.java 2007-10-24 13:10:52 UTC (rev 4882) @@ -33,11 +33,7 @@ import javax.jws.WebService; @Stateless -@WebService -( - name = "JBWS1762EJB3", - serviceName = "JBWS1762EJB3Service" -) +@WebService(name = "JBWS1762EJB3", serviceName = "JBWS1762EJB3Service") public class EJB3Bean { @WebMethod Added: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/WEB-INF/jboss-web.xml 2007-10-24 13:10:52 UTC (rev 4882) @@ -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 Added: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/WEB-INF/jboss-web.xml 2007-10-24 13:10:52 UTC (rev 4882) @@ -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