Author: heiko.braun(a)jboss.com Date: 2008-02-26 09:48:36 -0500 (Tue, 26 Feb 2008) New Revision: 5811 Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.java Log: Fix JBWS-1124: Load resources from WEB-INF/classes Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml 2008-02-26 14:46:32 UTC (rev 5810) +++ stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml 2008-02-26 14:48:36 UTC (rev 5811) @@ -2150,17 +2150,26 @@ <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"/> <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/> </fileset> <filterset> <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"> + <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxrpc/jbws1124/" overwrite="true"> + <fileset dir="${tests.resources.dir}/jaxrpc/jbws1124/WEB-INF/"> + <include name="test-resource.txt"/> + </fileset> + <filterset> + <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"> <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"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF"> <include name="webservices.xml"/> @@ -2174,17 +2183,26 @@ <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"/> <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/> </fileset> <filterset> <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"> + <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxrpc/jbws1124/" overwrite="true"> + <fileset dir="${tests.resources.dir}/jaxrpc/jbws1124/WEB-INF/"> + <include name="test-resource.txt"/> + </fileset> + <filterset> + <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"> <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"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF"> <include name="webservices.xml"/> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.java 2008-02-26 14:46:32 UTC (rev 5810) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.java 2008-02-26 14:48:36 UTC (rev 5811) @@ -36,7 +36,7 @@ public class TestEndpointImpl implements TestEndpoint { private Logger log = Logger.getLogger(TestEndpointImpl.class); - private static final String WEB_INF_TEST_RESOURCE_TXT = "WEB-INF/test-resource.txt"; + private static final String WEB_INF_TEST_RESOURCE_TXT = "org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"; public String getResourceString() throws RemoteException {