Author: chris.laprun(a)jboss.com Date: 2007-04-27 10:04:25 -0400 (Fri, 27 Apr 2007) New Revision: 2946 Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/SessionCreatingServlet.java branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/SessionCreatingServlet/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/SessionCreatingServlet/WEB-INF/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/SessionCreatingServlet/WEB-INF/web.xml Modified: branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java Log: - JBWS-1619: Added test case (and supporting code) to check propagation of cookie information when the session is created from a dispatched request. Modified: branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-27 12:39:48 UTC (rev 2945) +++ branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-27 14:04:25 UTC (rev 2946) @@ -11,17 +11,18 @@ <project name="JBossWS"> <description>JBossWS test archive builder</description> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-jars-jaxrpc" description="Build the jaxrpc deployments"> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="build-jars-jaxrpc" description="Build the jaxrpc deployments"> <mkdir dir="${tests.output.dir}/libs"/> - - <!-- jaxrpc-anonymous --> - <war warfile="${tests.output.dir}/libs/jaxrpc-anonymous.war" webxml="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml"> + + <!-- jaxrpc-anonymous --> + <war warfile="${tests.output.dir}/libs/jaxrpc-anonymous.war" + webxml="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.class"/> <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/> @@ -51,9 +52,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-benchmark --> - <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml"> + + <!-- jaxrpc-benchmark --> + <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" + webxml="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> @@ -97,7 +99,8 @@ <include name="wsdl/**"/> </metainf> </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" + webxml="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> @@ -141,9 +144,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-encoded-href.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF/web.xml"> + + <!-- jaxrpc-encoded-href.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-href.war" + webxml="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTest.class"/> @@ -169,9 +173,10 @@ <include name="jboss-client.xml"/> </metainf> </jar> - - <!-- jaxrpc-encoded-marshalltest.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml"> + + <!-- jaxrpc-encoded-marshalltest.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-marshalltest.war" + webxml="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/> @@ -197,9 +202,10 @@ <include name="jboss-client.xml"/> </metainf> </jar> - - <!-- jaxrpc-encoded-parametermode.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml"> + + <!-- jaxrpc-encoded-parametermode.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-parametermode.war" + webxml="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/> <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/> @@ -227,9 +233,10 @@ <include name="jboss-client.xml"/> </metainf> </jar> - - <!-- jaxrpc-enventry.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-enventry.war" webxml="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml"> + + <!-- jaxrpc-enventry.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-enventry.war" + webxml="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.class"/> @@ -274,9 +281,9 @@ <include name="jboss-client.xml"/> </metainf> </jar> - - <!-- jaxrpc-jbas897 --> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbas897.jar"> + + <!-- jaxrpc-jbas897 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbas897.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/> @@ -304,7 +311,8 @@ <include name="ejb-jar.xml"/> </metainf> </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897.war" webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloJavaBean.class"/> @@ -317,7 +325,8 @@ <include name="webservices.xml"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897-fail.war" webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web-fail.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897-fail.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web-fail.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloJavaBean.class"/> @@ -330,9 +339,10 @@ <include name="webservices.xml"/> </webinf> </war> - - <!-- jaxrpc-jbws64 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws64.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws64/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws64 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws64.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws64/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws64/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws64/HelloJavaBean.class"/> @@ -343,9 +353,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-jbws68 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws68.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws68 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws68.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws68/HelloJavaBean.class"/> @@ -371,9 +382,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws70 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws70.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws70 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws70.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws70/HelloJavaBean.class"/> @@ -401,16 +413,17 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws71 --> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws71-types.jar"> + + <!-- jaxrpc-jbws71 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws71-types.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.class"/> </fileset> </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws71.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws71.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/HelloJavaBean.class"/> @@ -440,9 +453,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws79 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws79.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws79 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws79.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.class"/> @@ -471,9 +485,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws82 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws82.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws82 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws82.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws82/HelloJavaBean.class"/> @@ -499,9 +514,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws83 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws83.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws83 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws83.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws83/HelloJavaBean.class"/> @@ -527,9 +543,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws84 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws84.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws84 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws84.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> @@ -555,9 +572,10 @@ <include name="wsdl/*.wsdl"/> </metainf> </jar> - - <!-- jaxrpc-jbws124 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws124.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws124 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws124.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws124/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws124/HelloJavaBean.class"/> @@ -581,9 +599,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws128 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-service.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-service/web.xml"> + + <!-- jaxrpc-jbws128 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-service.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-service/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws128/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws128/HelloJavaBean.class"/> @@ -594,7 +613,8 @@ <include name="wsdl/**"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-client.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-client/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-client.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws128/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws128/HelloClientServlet.class"/> @@ -604,15 +624,17 @@ <include name="wsdl/**"/> </webinf> </war> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws128.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws128/META-INF/application.xml"> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws128.ear" + appxml="${tests.output.dir}/resources/jaxrpc/jbws128/META-INF/application.xml"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxrpc-jbws128-service.war"/> <include name="jaxrpc-jbws128-client.war"/> </fileset> </ear> - - <!-- jaxrpc-jbws153 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws153.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws153 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws153.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws153/Order.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws153/OrderJavaBean.class"/> @@ -637,9 +659,10 @@ <include name="jaxrpc-deployment.xml"/> </metainf> </jar> - - <!-- jaxrpc-jbws163 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws163.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws163 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws163.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws163/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws163/HelloJavaBean.class"/> @@ -663,9 +686,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws165 --> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-none.jar"> + + <!-- jaxrpc-jbws165 --> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-none.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> @@ -727,7 +750,8 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws165.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF/application.xml"> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws165.ear" + appxml="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF/application.xml"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxrpc-jbws165-none.jar"/> <include name="jaxrpc-jbws165-pcuri.jar"/> @@ -736,9 +760,10 @@ <include name="jaxrpc-jbws165-client.jar"/> </fileset> </ear> - - <!-- jaxrpc-jbws167 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws167.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws167/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws167 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws167.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws167/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws167/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws167/HelloJavaBean.class"/> @@ -750,9 +775,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-jbws168 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws168.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws168 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws168.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws168/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws168/HelloJavaBean.class"/> @@ -785,9 +811,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws217 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws217.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws217 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws217.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws217/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws217/HelloJavaBean.class"/> @@ -811,9 +838,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws231 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws231.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws231 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws231.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpointImpl.class"/> @@ -839,9 +867,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws251 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws251.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws251 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws251.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws251/HelloJavaBean.class"/> @@ -871,12 +900,14 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jbws-314 --> - <copy todir="${tests.output.dir}/resources/META-INF" file="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/jaxrpc-mapping.xml"/> - - <!-- jaxrpc-jbws316 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws316.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF/web.xml"> + + <!-- jbws-314 --> + <copy todir="${tests.output.dir}/resources/META-INF" + file="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/jaxrpc-mapping.xml"/> + + <!-- jaxrpc-jbws316 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws316.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/> @@ -902,9 +933,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws331 --> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-ws.jar"> + + <!-- jaxrpc-jbws331 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-ws.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloEndpoint.class"/> @@ -942,16 +973,18 @@ <include name="wsdl/**"/> </metainf> </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws331.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws331/META-INF/application.xml"> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws331.ear" + appxml="${tests.output.dir}/resources/jaxrpc/jbws331/META-INF/application.xml"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxrpc-jbws331-ejb.jar"/> <include name="jaxrpc-jbws331-ws.jar"/> <include name="jaxrpc-jbws331-client.jar"/> </fileset> </ear> - - <!-- jaxrpc-jbws349 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws349 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws349.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*TestCase.class"/> @@ -977,9 +1010,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws358 --> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws358.jar"> + + <!-- jaxrpc-jbws358 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws358.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws358/HelloBean.class"/> @@ -1004,7 +1037,8 @@ </metainf> </jar> <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/> - <unjar dest="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/libs/jaxrpc-jbws358.jar"/> + <unjar dest="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" + src="${tests.output.dir}/libs/jaxrpc-jbws358.jar"/> <copy todir="${tests.output.dir}/libs/jaxrpc-jbws358.ear"> <fileset dir="${tests.output.dir}/resources/jaxrpc/jbws358"> <include name="META-INF/application.xml"/> @@ -1013,9 +1047,10 @@ <include name="jaxrpc-jbws358-client.jar"/> </fileset> </copy> - - <!-- jaxrpc-jbws377 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws377.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws377 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws377.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws377/HelloJavaBean.class"/> @@ -1045,9 +1080,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws381 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws381.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws381 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws381.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.class"/> @@ -1073,9 +1109,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws383 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws383.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws383 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws383.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws383/TestJavaBean.class"/> @@ -1101,9 +1138,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws413 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws413.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws413 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws413.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws413/TestJavaBean.class"/> @@ -1129,9 +1167,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws414 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws414.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws414 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws414.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws414/TestJavaBean.class"/> @@ -1163,9 +1202,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws423 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws423.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws423 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws423.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoBean.class"/> @@ -1193,9 +1233,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws424 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws424.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws424 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws424.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws424/TestJavaBean.class"/> @@ -1224,9 +1265,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws425 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws425.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws425 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws425.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws425/HelloJavaBean.class"/> @@ -1250,9 +1292,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws434 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws434.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws434 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws434.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpointImpl.class"/> @@ -1280,9 +1323,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws456 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws456.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws456 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws456.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws456/TestJavaBean.class"/> @@ -1309,9 +1353,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws463 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws463.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws463 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws463.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws463/TestJavaBean.class"/> @@ -1335,9 +1380,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws464 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws464.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws464 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws464.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws464/HelloJavaBean.class"/> @@ -1362,9 +1408,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws484 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws484.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws484 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws484.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.class"/> @@ -1390,9 +1437,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws626 --> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws626.jar"> + + <!-- jaxrpc-jbws626 --> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws626.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.class"/> @@ -1421,7 +1468,8 @@ <include name="wsdl/**"/> </metainf> </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws626.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF/application.xml"> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws626.ear" + appxml="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF/application.xml"> <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF"> <include name="jboss-app.xml"/> </metainf> @@ -1430,9 +1478,10 @@ <include name="jaxrpc-jbws626-client.jar"/> </fileset> </ear> - - <!-- jaxrpc-jbws632 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws632.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws632 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws632.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws632/TestJavaBean.class"/> @@ -1458,9 +1507,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws637 --> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws637-client.jar"> + + <!-- jaxrpc-jbws637 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws637-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws637/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws637/*TestCase.class"/> @@ -1472,9 +1521,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws643 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws643.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws643 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws643.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*TestCase.class"/> @@ -1499,9 +1549,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws663 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663b.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws663 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663b.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> @@ -1528,7 +1579,8 @@ <include name="wsdl/**"/> </metainf> </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663bb.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663bb.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> @@ -1555,7 +1607,8 @@ <include name="wsdl/**"/> </metainf> </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663w.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663w.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> @@ -1582,7 +1635,8 @@ <include name="wsdl/**"/> </metainf> </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663wb.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663wb.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> @@ -1609,9 +1663,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws706 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws706.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws706 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws706.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws706/ClientHandler.class"/> @@ -1638,9 +1693,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws707 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws707.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws707 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws707.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpoint.class"/> @@ -1666,9 +1722,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws710 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws710.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws710 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws710.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.class"/> @@ -1694,9 +1751,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws720 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws720.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws720 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws720.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/> @@ -1722,9 +1780,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws723 --> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723.jar"> + + <!-- jaxrpc-jbws723 --> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> @@ -1752,9 +1810,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws732 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws732 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws732.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/> @@ -1781,9 +1840,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws751 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws751.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws751 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws751.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws751/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*TestCase.class"/> @@ -1809,9 +1869,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jws772 --> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-endpoint.jar"> + + <!-- jaxrpc-jws772 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-endpoint.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> @@ -1845,16 +1905,18 @@ <include name="wsdl/**"/> </metainf> </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws772.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE/application.xml"> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws772.ear" + appxml="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE/application.xml"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxrpc-jbws772-endpoint.jar"/> <include name="jaxrpc-jbws772-remote.jar"/> <include name="jaxrpc-jbws772-client.jar"/> </fileset> </ear> - - <!-- jaxrpc-jws775 --> - <war destfile="${tests.output.dir}/libs/jaxrpc-jbws775.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml"> + + <!-- jaxrpc-jws775 --> + <war destfile="${tests.output.dir}/libs/jaxrpc-jbws775.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/> @@ -1880,9 +1942,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws801 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws801.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws801 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws801.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachment.class"/> @@ -1893,9 +1956,10 @@ <include name="webservices.xml"/> </webinf> </war> - - <!-- jaxrpc-jbws807 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws807.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws807 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws807.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> @@ -1920,9 +1984,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-jbws812 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws812.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws812 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws812.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpointImpl.class"/> @@ -1947,9 +2012,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws950 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws950.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws950 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws950.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpoint.class"/> @@ -1961,9 +2027,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-jbws956 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws956.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws956 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws956.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpoint.class"/> @@ -1976,9 +2043,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-jbws1010 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1010.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1010 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1010.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/> @@ -2004,9 +2072,9 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws1011 --> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011.jar"> + + <!-- jaxrpc-jbws1011 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityLocal.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityHome.class"/> @@ -2034,9 +2102,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jbossws-jbws1093 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1093.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> + + <!-- jbossws-jbws1093 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1093.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> @@ -2061,9 +2130,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws1107 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1107.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1107 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1107.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/> @@ -2087,9 +2157,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws1121 --> - <war destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1121 --> + <war destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorldBean.class"/> @@ -2133,9 +2204,9 @@ <include name="jboss-app.xml"/> </metainf> </ear> - - <!-- jaxrpc-jbws1124one --> - <copy todir="${tests.output.dir}/resources" overwrite="true"> + + <!-- jaxrpc-jbws1124one --> + <copy todir="${tests.output.dir}/resources" overwrite="true"> <fileset dir="${tests.resources.dir}"> <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> @@ -2145,7 +2216,8 @@ <filter token="jbws1124.domain" value="jbws1124one"/> </filterset> </copy> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124one.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124one.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> @@ -2157,9 +2229,9 @@ <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> - </war> - <!-- jaxrpc-jbws1124two --> - <copy todir="${tests.output.dir}/resources" overwrite="true"> + </war> + <!-- jaxrpc-jbws1124two --> + <copy todir="${tests.output.dir}/resources" overwrite="true"> <fileset dir="${tests.resources.dir}"> <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> @@ -2169,7 +2241,8 @@ <filter token="jbws1124.domain" value="jbws1124two"/> </filterset> </copy> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124two.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124two.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> @@ -2181,10 +2254,11 @@ <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> - </war> - - <!-- jaxrpc-jbws1125 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1125.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml"> + </war> + + <!-- jaxrpc-jbws1125 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1125.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> @@ -2212,9 +2286,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-jbws1148 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1148.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1148 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1148.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> @@ -2238,10 +2313,11 @@ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF"> <include name="jaxrpc-mapping.xml"/> </metainf> - </jar> - - <!-- jbossws-jbws1179 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml"> + </jar> + + <!-- jbossws-jbws1179 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1179.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> @@ -2265,9 +2341,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jbossws-jbws1186 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1186.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> + + <!-- jbossws-jbws1186 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1186.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/> @@ -2281,8 +2358,9 @@ </webinf> </war> - <!-- jaxrpc-jbws1190 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> + <!-- jaxrpc-jbws1190 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1190.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> @@ -2309,10 +2387,11 @@ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF"> <include name="test-mapping.xml"/> </metainf> - </jar> - - <!-- jaxrpcws-jbws1205 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> + </jar> + + <!-- jaxrpcws-jbws1205 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-simple.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/> @@ -2325,7 +2404,8 @@ <include name="wsdl/**"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-test.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/> @@ -2358,10 +2438,11 @@ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> <include name="test-mapping.xml"/> </metainf> - </jar> - - <!-- jaxrpc-jbws1303 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1303.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml"> + </jar> + + <!-- jaxrpc-jbws1303 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1303.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> @@ -2386,9 +2467,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-jbws1378 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1378 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1378.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1378/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1378/*TestCase.class"/> @@ -2399,9 +2481,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-jbws1384 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1384.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1384 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1384.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1384/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1384/*TestCase.class"/> @@ -2412,9 +2495,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-jbws1386 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1386 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1386/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1386/*TestCase.class"/> @@ -2425,9 +2509,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-jbws1410 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1410.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF/web.xml"> + + <!-- jaxrpc-jbws1410 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1410.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.class"/> @@ -2438,9 +2523,9 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-jbws1427 --> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar"> + + <!-- jaxrpc-jbws1427 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1427/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1427/*TestCase.class"/> @@ -2452,9 +2537,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jbossws-jbws1619 --> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF/web.xml"> + + <!-- jbossws-jbws1619 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.class"/> @@ -2464,7 +2550,13 @@ <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - </war> + </war> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619-servlet.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/SessionCreatingServlet/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1619/SessionCreatingServlet.class"/> + </classes> + </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1619-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jbws1619/TestEndpoint.class"/> @@ -2479,9 +2571,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- 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"> + + <!-- 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"/> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> @@ -2508,9 +2601,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-marshall-rpclit.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml"> + + <!-- jaxrpc-marshall-rpclit.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-rpclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> @@ -2537,9 +2631,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-outparam.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-outparam.war" webxml="${tests.output.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml"> + + <!-- jaxrpc-outparam.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-outparam.war" + webxml="${tests.output.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/outparam/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/outparam/*ServiceBean.class"/> @@ -2550,9 +2645,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-overloaded --> - <war warfile="${tests.output.dir}/libs/jaxrpc-overloaded.war" webxml="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml"> + + <!-- jaxrpc-overloaded --> + <war warfile="${tests.output.dir}/libs/jaxrpc-overloaded.war" + webxml="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/> <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/> @@ -2578,9 +2674,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-serviceref --> - <war warfile="${tests.output.dir}/libs/jaxrpc-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF/web.xml"> + + <!-- 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"/> @@ -2606,7 +2703,8 @@ <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"> + <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"/> @@ -2631,9 +2729,10 @@ <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"> + + <!-- 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"> <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/utf16/HelloJavaBean.class"/> @@ -2657,9 +2756,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-wsdlpublish --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml"> + + <!-- jaxrpc-wsdlpublish --> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsdlpublish.war" + webxml="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.class"/> @@ -2671,9 +2771,10 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxrpc-wsse-account-signup.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> + + <!-- jaxrpc-wsse-account-signup.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" + webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> @@ -2712,9 +2813,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-wsse-rpc.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + + <!-- jaxrpc-wsse-rpc.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc.war" + webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> @@ -2766,9 +2868,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-wsse-simple-sign-encrypt --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + + <!-- jaxrpc-wsse-simple-sign-encrypt --> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" + webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> @@ -2807,9 +2910,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-wsse-sign-fault.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + + <!-- jaxrpc-wsse-sign-fault.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault.war" + webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> @@ -2849,8 +2953,9 @@ </metainf> </jar> - <!-- jaxrpc-wsse-sign-encrypt-fault.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <!-- jaxrpc-wsse-sign-encrypt-fault.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" + webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> @@ -2890,9 +2995,11 @@ </metainf> </jar> - <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war --> - <replace file="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war --> + <replace file="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" + token="${buildpath}" value="${tests.output.dir}"/> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" + webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> @@ -2932,9 +3039,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-wsse-web-client.war --> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml"> + + <!-- jaxrpc-wsse-web-client.war --> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-web-client.war" + webxml="${tests.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> @@ -2957,9 +3065,9 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxrpc-wsse-username --> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-username.jar"> + + <!-- jaxrpc-wsse-username --> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-username.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/*Service.class"/> @@ -2996,9 +3104,10 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxrpc-xop-doclit without handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> + + <!-- jaxrpc-xop-doclit without handlers --> + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> @@ -3025,9 +3134,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-xop-doclit with handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> + + <!-- jaxrpc-xop-doclit with handlers --> + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" + webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> @@ -3056,9 +3166,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-xop-rpclit without handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> + + <!-- jaxrpc-xop-rpclit without handlers --> + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> @@ -3085,9 +3196,10 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - - <!-- jaxrpc-xop-rpclit with handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> + + <!-- jaxrpc-xop-rpclit with handlers --> + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" + webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> @@ -3116,9 +3228,9 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + + <!-- Please add alphabetically --> - <!-- Please add alphabetically --> - </target> </project> Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-04-27 12:39:48 UTC (rev 2945) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-04-27 14:04:25 UTC (rev 2946) @@ -21,24 +21,22 @@ */ package org.jboss.test.ws.jaxrpc.jbws1619; -import java.io.File; -import java.net.URL; +import junit.framework.Test; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; +import java.io.File; +import java.net.URL; -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; - /** * ServletEndpointContext.getHttpSession has an incorrect implementation - * + * <p/> * http://jira.jboss.org/jira/browse/JBWS-1619 - * + * * @author Thomas.Diesler(a)jboss.com * @since 23-Apr-2007 */ @@ -49,7 +47,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar"); + return JBossWSTestSetup.newTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-servlet.war, jaxrpc-jbws1619-client.jar"); } public void setUp() throws Exception @@ -73,6 +71,9 @@ port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + + // reset cookie + ClientHandler.cookie = null; } public void testServletEndpointContext() throws Exception @@ -89,4 +90,12 @@ assertTrue("Expect a session", retStr.startsWith("httpSession") && !retStr.endsWith("null")); assertTrue("Expect a cookie", ClientHandler.cookie.startsWith("JSESSIONID")); } + + public void testRequestDispatch() throws Exception + { + ClientHandler.message = "Use RequestDispatcher"; + port.echoString(ClientHandler.message); + assertNotNull(ClientHandler.cookie); + assertTrue("Expect a cookie", ClientHandler.cookie.startsWith("JSESSIONID")); + } } Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/SessionCreatingServlet.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/SessionCreatingServlet.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/SessionCreatingServlet.java 2007-04-27 14:04:25 UTC (rev 2946) @@ -0,0 +1,61 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, 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.jbws1619; + +import org.jboss.logging.Logger; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; + +/** + * http://jira.jboss.org/jira/browse/JBWS-1619 + * + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class SessionCreatingServlet extends HttpServlet +{ + private Logger log = Logger.getLogger(SessionCreatingServlet.class); + + protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException + { + process(httpServletRequest); + } + + protected void doPost(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException + { + process(httpServletRequest); + } + + private void process(HttpServletRequest httpServletRequest) throws IOException + { + HttpSession session = httpServletRequest.getSession(); + String msg = "Session id:" + session.getId(); + log.info(msg); + } + +} Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/SessionCreatingServlet.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java 2007-04-27 12:39:48 UTC (rev 2945) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java 2007-04-27 14:04:25 UTC (rev 2946) @@ -21,20 +21,23 @@ */ package org.jboss.test.ws.jaxrpc.jbws1619; -import java.rmi.RemoteException; +import org.jboss.logging.Logger; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpSession; import javax.xml.rpc.ServiceException; import javax.xml.rpc.handler.MessageContext; import javax.xml.rpc.server.ServiceLifecycle; import javax.xml.rpc.server.ServletEndpointContext; +import java.rmi.RemoteException; -import org.jboss.logging.Logger; - public class TestEndpointImpl implements TestEndpoint, ServiceLifecycle { private Logger log = Logger.getLogger(TestEndpointImpl.class); - + private ServletEndpointContext context; public String echoString(String message) throws RemoteException @@ -49,7 +52,22 @@ MessageContext msgContext = context.getMessageContext(); httpSession = (HttpSession)msgContext.getProperty("javax.xml.ws.servlet.session"); } - + else if ("Use RequestDispatcher".equals(message)) + { + ServletContext servletContext = context.getServletContext().getContext("/jaxrpc-jbws1619-servlet"); + MessageContext msgContext = context.getMessageContext(); + RequestDispatcher dispatcher = servletContext.getRequestDispatcher("/"); + try + { + dispatcher.include((ServletRequest)msgContext.getProperty("javax.xml.ws.servlet.request"), + (ServletResponse)msgContext.getProperty("javax.xml.ws.servlet.response")); + } + catch (Exception e) + { + throw new RemoteException("An error occurred during the request dispatch", e); + } + } + log.info("echoString: " + httpSession); return "httpSession: " + httpSession; } Added: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/SessionCreatingServlet/WEB-INF/web.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/SessionCreatingServlet/WEB-INF/web.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/SessionCreatingServlet/WEB-INF/web.xml 2007-04-27 14:04:25 UTC (rev 2946) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>SessionCreatingServlet</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1619.SessionCreatingServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>SessionCreatingServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> +