Author: thomas.diesler(a)jboss.com Date: 2007-05-22 03:40:03 -0400 (Tue, 22 May 2007) New Revision: 3173 Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java Log: Fix tools dependency on jaxws samples Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-22 07:27:02 UTC (rev 3172) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-22 07:40:03 UTC (rev 3173) @@ -110,7 +110,6 @@ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> </target> <!-- @@ -202,7 +201,6 @@ <classpath location="${tests.output.dir}/classes"/> </taskdef> - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> </target> <target name="tests-generate-resources" depends="servicegen,wstools,wsprovide"> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-22 07:27:02 UTC (rev 3172) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-22 07:40:03 UTC (rev 3173) @@ -27,9 +27,6 @@ import java.net.URLClassLoader; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.jaxws.samples.soapbinding.DocWrappedServiceImpl; -import org.jboss.test.ws.jaxws.samples.soapbinding.PurchaseOrder; -import org.jboss.test.ws.jaxws.samples.soapbinding.PurchaseOrderAck; import org.jboss.ws.tools.jaxws.api.WSContractProvider; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.utils.JavaUtils; @@ -62,8 +59,8 @@ private void checkWrapperSource(File outputDir, boolean shouldExist) { - File file1 = new File(outputDir, "org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPO.java"); - File file2 = new File(outputDir, "org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/SubmitPOResponse.java"); + File file1 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/SubmitPO.java"); + File file2 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/SubmitPOResponse.java"); assertEquals(shouldExist, file1.exists()); assertEquals(shouldExist, file2.exists()); } @@ -74,12 +71,12 @@ URLClassLoader classLoader = new URLClassLoader(new URL[]{outputDir.toURL()}, Thread.currentThread().getContextClassLoader()); // Check request wrapper - Class wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitPO", classLoader); + Class wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.SubmitPO", classLoader); wrapper.getMethod("setPurchaseOrder", PurchaseOrder.class); assertEquals(PurchaseOrder.class.getName(), wrapper.getMethod("getPurchaseOrder").getReturnType().getName()); // Check response wrapper - wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitPOResponse", classLoader); + wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.SubmitPOResponse", classLoader); wrapper.getMethod("setPurchaseOrderAck", PurchaseOrderAck.class); assertEquals(PurchaseOrderAck.class.getName(), wrapper.getMethod("getPurchaseOrderAck").getReturnType().getName()); }