[jbossws-commits] JBossWS SVN: r6552 - in framework/trunk: testsuite/test/java/org/jboss/test/ws/jaxws/complex and 10 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-19 16:39:56 -0400 (Sat, 19 Apr 2008) New Revision: 6552 Removed: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java Modified: framework/trunk/.classpath framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java Log: Use getResourceFile/URL Modified: framework/trunk/.classpath =================================================================== --- framework/trunk/.classpath 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/.classpath 2008-04-19 20:39:56 UTC (rev 6552) @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java"> <attributes> <attribute name="maven.type" value="test"/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="src/main/etc" path="src/main/etc"/> - <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/eclipse-classes"/> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -39,6 +39,8 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; +import sun.reflect.ReflectionFactory.GetReflectionFactoryAction; + /** * A complex JAX-WS test * @@ -57,7 +59,7 @@ protected void setUp() throws Exception { super.setUp(); - URL wsdlURL = new File("resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"); QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/";, "RegistrationService"); Service service = Service.create(wsdlURL, serviceName); port = (Registration)service.getPort(Registration.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -86,7 +86,7 @@ public void testClientAccess() throws Exception { // Create the port - URL wsdlURL = new File("resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService"); Service service = Service.create(wsdlURL, qname); EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -51,7 +51,7 @@ protected void setUp() throws Exception { super.setUp(); - URL wsdlURL = new File("resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/holder/META-INF/wsdl/HolderService.wsdl"); QName serviceName = new QName("http://holder.jaxws.ws.test.jboss.org/";, "HolderService"); Service service = Service.create(wsdlURL, serviceName); port = (org.jboss.test.ws.jaxws.holder.Holder)service.getPort(org.jboss.test.ws.jaxws.holder.Holder.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -66,7 +66,7 @@ public void testWSDLReader() throws Exception { - File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); + File wsdlFile = getResourceFile("jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); assertTrue(wsdlFile.exists()); WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -54,7 +54,7 @@ { if (port == null) { - URL wsdlURL = new File("resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService"); Service service = Service.create(wsdlURL, qname); port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -54,7 +54,7 @@ { if (port == null) { - URL wsdlURL = new File("resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService"); Service service = Service.create(wsdlURL, qname); port = (TestEndpoint)service.getPort(TestEndpoint.class); Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -1,66 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.eardeployment; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 - * Generated source version: 2.1 - * - */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/", wsdlLocation = "file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl") -public class TestEndpointService - extends Service -{ - - private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; - - static { - URL url = null; - try { - url = new URL("file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl"); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - TESTENDPOINTSERVICE_WSDL_LOCATION = url; - } - - public TestEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public TestEndpointService() { - super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointService")); - } - - /** - * - * @return - * returns TestEndpoint - */ - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort() { - return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointPort"), TestEndpoint.class); - } - - /** - * TDI: commented out because WebServiceFeature is not part of xfire-jsr181-api (xfire-1.2.6) - * - * @param features - * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. - * @return - * returns TestEndpoint - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort(WebServiceFeature... features) { - return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointPort"), TestEndpoint.class, features); - } - */ -} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -69,7 +69,7 @@ if (isTargetJBoss50() == false) return; - URL wsdlURL = new File("resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "TestEndpointService"); Service service = Service.create(wsdlURL, qname); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -69,7 +69,7 @@ // JAXWS <service-ref> is only supported in EE5 if (isTargetJBoss50()) { - URL wsdlURL = new File("resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "TestEndpointService"); Service service = Service.create(wsdlURL, qname); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -66,7 +66,7 @@ if (isTargetJBoss50() == false) return; - URL wsdlURL = new File("resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "TestEndpointService"); Service service = Service.create(wsdlURL, qname); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -55,7 +55,7 @@ if (port == null) { QName serviceName = new QName(targetNS, "PingServiceService"); - URL wsdlURL = new File("resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl"); Service service = Service.create(wsdlURL, serviceName); port = service.getPort(PingService.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -60,7 +60,7 @@ if (port == null) { QName serviceName = new QName(targetNS, "CustomerServiceService"); - URL wsdlURL = new File("resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl"); Service service = Service.create(wsdlURL, serviceName); port = service.getPort(CustomerService.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -41,7 +41,7 @@ */ public abstract class XOPBase extends JBossWSTest { - private File imgFile = new File("resources/jaxws/samples/xop/shared/attach.jpeg"); + private File imgFile = getResourceFile("jaxws/samples/xop/shared/attach.jpeg"); protected MTOMEndpoint port; protected SOAPBinding binding; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -40,9 +40,9 @@ * * @author Heiko.Braun(a)jboss.com */ -public class ScriptTestCase extends TestCase +public class ScriptTestCase extends JBossWSTestCase { - private String WSDL_LOCATION = "resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl"; + private String WSDL_LOCATION = "jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl"; private String ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean"; private String JBOSS_HOME; @@ -68,7 +68,7 @@ } // use absolute path for the output to be re-usable - String absWsdlLoc= new File(WSDL_LOCATION).getAbsolutePath(); + String absWsdlLoc= getResourceFile(WSDL_LOCATION).getAbsolutePath(); String absOutput = new File("wsconsume/java").getAbsolutePath(); String command = JBOSS_HOME + "/bin/wsconsume.sh -k -o "+absOutput+" "+ absWsdlLoc; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-04-19 20:28:52 UTC (rev 6551) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-04-19 20:39:56 UTC (rev 6552) @@ -37,6 +37,8 @@ import org.jboss.wsf.spi.tools.WSContractConsumer; +import sun.reflect.ReflectionFactory.GetReflectionFactoryAction; + /** * Test the WSContractConsumer API across different implementations. * NOTE: All tests expect to be executed below 'output/tests'. @@ -44,7 +46,7 @@ * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ -public class WSConsumerTestCase extends TestCase +public class WSConsumerTestCase extends JBossWSTestCase { // Tools delegate. Recreated for every test. See setup(...) @@ -79,7 +81,7 @@ public void testBindingFiles() throws Exception { List<File> files = new ArrayList<File>(); - files.add( new File("resources/jaxws/smoke/tools/wsdl/async-binding.xml") ); + files.add( getResourceFile("jaxws/smoke/tools/wsdl/async-binding.xml") ); consumer.setBindingFiles(files); consumer.setTargetPackage("org.jboss.test.ws.tools.testBindingFiles"); @@ -112,10 +114,10 @@ public void testCatalog() throws Exception { consumer.setTargetPackage("org.jboss.test.ws.tools.testCatalog"); - consumer.setCatalog( new File("resources/jaxws/spi/tools/wsdl/jax-ws-catalog.xml") ); + consumer.setCatalog( getResourceFile("jaxws/spi/tools/wsdl/jax-ws-catalog.xml") ); consumer.setGenerateSource(true); consumer.setOutputDirectory(outputDirectory); - consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl"); + consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl").getCanonicalPath()); } /** @@ -298,7 +300,7 @@ consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension"); consumer.setGenerateSource(true); consumer.setExtension(true); - consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl"); + consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl").getCanonicalPath()); File sei = new File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/EndpointInterface.java"); assertTrue("SEI not generated", sei.exists()); File service = new File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/TestService.java"); @@ -308,7 +310,7 @@ private void consumeWSDL() throws Exception { consumer.setOutputDirectory(outputDirectory); - consumer.consume("resources/jaxws/smoke/tools/wsdl/TestService.wsdl"); + consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath()); } }