Author: thomas.diesler(a)jboss.com Date: 2007-05-31 07:08:38 -0400 (Thu, 31 May 2007) New Revision: 3319 Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/DocWrappedServiceImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java Log: Fix test regression Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-31 10:43:29 UTC (rev 3318) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-31 11:08:38 UTC (rev 3319) @@ -190,7 +190,7 @@ </taskdef> <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/> + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/> </target> <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide"> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 10:43:29 UTC (rev 3318) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 11:08:38 UTC (rev 3319) @@ -68,7 +68,7 @@ private Hello getPort() throws Exception { - URL wsdlURL = new File("WSProvideTask/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); + URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 10:43:29 UTC (rev 3318) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 11:08:38 UTC (rev 3319) @@ -64,7 +64,7 @@ private Hello getPort() throws Exception { - URL wsdlURL = new File("WSProvideTask/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); + URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL(); QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/DocWrappedServiceImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/DocWrappedServiceImpl.java 2007-05-31 10:43:29 UTC (rev 3318) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/DocWrappedServiceImpl.java 2007-05-31 11:08:38 UTC (rev 3319) @@ -33,7 +33,7 @@ * @since 16-Oct-2005 */ -@WebService(endpointInterface = "org.jboss.test.ws.tools.jaxws.DocWrapped", name="DocWrapped") +@WebService(name="DocWrapped", serviceName="DocWrappedService", endpointInterface = "org.jboss.test.ws.tools.jaxws.DocWrapped") public class DocWrappedServiceImpl implements DocWrapped { // Provide logging 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-31 10:43:29 UTC (rev 3318) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-31 11:08:38 UTC (rev 3319) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.tools.jaxws; +// $Id$ + import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -35,14 +37,13 @@ * Tests the WSContractProvider API. * * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ */ public class WSContractProviderTestCase extends JBossWSTest { public void testBasic() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/WSProvideTask/basic/out"); + File outputDir = new File("tools/jaxws/wscontractprovider/basic/out"); gen.setOutputDirectory(outputDir); gen.provide(DocWrappedServiceImpl.class); @@ -84,7 +85,7 @@ public void testSource() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/WSProvideTask/source/out"); + File outputDir = new File("tools/jaxws/wscontractprovider/source/out"); gen.setOutputDirectory(outputDir); gen.setGenerateSource(true); gen.provide(DocWrappedServiceImpl.class); @@ -96,8 +97,8 @@ public void testSourceDir() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/WSProvideTask/sourcedir/out"); - File sourceDir = new File("tools/WSProvideTask/sourcedir/source"); + File outputDir = new File("tools/jaxws/wscontractprovider/sourcedir/out"); + File sourceDir = new File("tools/jaxws/wscontractprovider/sourcedir/source"); gen.setOutputDirectory(outputDir); gen.setSourceDirectory(sourceDir); @@ -112,7 +113,7 @@ public void testWsdl() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/WSProvideTask/wsdl/out"); + File outputDir = new File("tools/jaxws/wscontractprovider/wsdl/out"); gen.setOutputDirectory(outputDir); gen.setGenerateWsdl(true); gen.provide(DocWrappedServiceImpl.class); @@ -130,8 +131,8 @@ public void testResourceDir() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/WSProvideTask/resourcedir/out"); - File wsdlDir = new File("tools/WSProvideTask/resourcedir/wsdl"); + File outputDir = new File("tools/jaxws/wscontractprovider/resourcedir/out"); + File wsdlDir = new File("tools/jaxws/wscontractprovider/resourcedir/wsdl"); gen.setOutputDirectory(outputDir); gen.setResourceDirectory(wsdlDir); gen.setGenerateWsdl(true);