Author: thomas.diesler(a)jboss.com Date: 2008-04-22 00:51:23 -0400 (Tue, 22 Apr 2008) New Revision: 6603 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/AbstractWSSEBase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1814/SimpleEncryptTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1857/JBWS1857TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/validation/WSDL11ValidationTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java Log: User getResourceFile/URL Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -57,7 +57,7 @@ if (endpoint == null) { - URL wsdlLocation = new File("resources/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl").toURL(); + URL wsdlLocation = getResourceURL("benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl"); Service service = Service.create(wsdlLocation, new QName("http://org.jboss.ws/benchmark", "BenchmarkWebService")); endpoint = service.getPort(BenchmarkService.class); ((BindingProvider)endpoint).getRequestContext().put( Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -27,9 +27,9 @@ import javax.xml.namespace.QName; import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig; +import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig; import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig; -import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMPortConfig; import org.jboss.ws.metadata.config.EndpointProperty; import org.jboss.ws.metadata.config.JBossWSConfigFactory; @@ -50,10 +50,10 @@ */ public class ConfigFactoryTestCase extends JBossWSTest { - + public void testJAXRPCObjectModelFactory() throws Exception { - File confFile = new File("resources/common/config/jaxrpc-endpoint-config.xml"); + File confFile = getResourceFile("common/config/jaxrpc-endpoint-config.xml"); assertTrue(confFile.exists()); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); @@ -68,7 +68,7 @@ assertEquals("Standard Endpoint", epc1.getConfigName()); assertNull(epc1.getPreHandlerChain()); assertNull(epc1.getPostHandlerChain()); - assertFalse("MTOM should not be enabled" , epc1.hasFeature("http://org.jboss.ws/mtom")); + assertFalse("MTOM should not be enabled", epc1.hasFeature("http://org.jboss.ws/mtom")); assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName()); UnifiedHandlerChainMetaData preChain = epc2.getPreHandlerChain(); @@ -80,7 +80,7 @@ public void testJAXWSFeatures() throws Exception { - File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); + File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml"); assertTrue(confFile.exists()); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); @@ -88,7 +88,7 @@ assertNotNull("Null config", config); EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard MTOM Endpoint"); - assertTrue("Feature not set" , epConfig.hasFeature("http://org.jboss.ws/mtom")); + assertTrue("Feature not set", epConfig.hasFeature("http://org.jboss.ws/mtom")); // disable feature epConfig.setFeature("http://org.jboss.ws/mtom", false); @@ -97,14 +97,14 @@ public void testJAXRPCFeatures() throws Exception { - File confFile = new File("resources/common/config/jaxrpc-endpoint-config.xml"); + File confFile = getResourceFile("common/config/jaxrpc-endpoint-config.xml"); assertTrue(confFile.exists()); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURL()); assertNotNull("Null config", config); CommonConfigJAXRPC epConfig = (CommonConfigJAXRPC)config.getConfigByName("Standard MTOM Endpoint"); - assertTrue("Feature not set" , epConfig.hasFeature("http://org.jboss.ws/mtom")); + assertTrue("Feature not set", epConfig.hasFeature("http://org.jboss.ws/mtom")); // disable feature epConfig.setFeature("http://org.jboss.ws/mtom", false); @@ -113,7 +113,7 @@ public void testProperties() throws Exception { - File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); + File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml"); assertTrue(confFile.exists()); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); @@ -125,10 +125,10 @@ assertNotNull("Property does not exist", value); assertEquals("Wrong property valule", value, "5000"); } - + public void testWSRMConfiguration() throws Exception { - File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); + File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml"); assertTrue(confFile.exists()); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -50,7 +50,7 @@ /** Get the URL to the defining schema */ protected XSModel getSchemaModel(QName xmlType, Class javaType) throws Exception { - File xsdFile = new File("resources/common/jbossxb/ComplexTypesService_RPC.xsd"); + File xsdFile = getResourceFile("common/jbossxb/ComplexTypesService_RPC.xsd"); assertTrue(xsdFile.exists()); return parseSchema(xsdFile.toURL()); @@ -178,7 +178,7 @@ private JavaWsdlMapping getJavaWSDLMapping() throws Exception { JavaWsdlMappingFactory factory = JavaWsdlMappingFactory.newInstance(); - URL mappingURL = new File("resources/common/jbossxb/ComplexTypesService_RPC.xml").toURL(); + URL mappingURL = getResourceURL("common/jbossxb/ComplexTypesService_RPC.xml"); JavaWsdlMapping javaWsdlMapping = factory.parse(mappingURL); return javaWsdlMapping; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -50,7 +50,7 @@ /** Get the URL to the defining schema */ protected XSModel getSchemaModel(QName xmlType, Class javaType) throws Exception { - File xsdFile = new File("resources/common/jbossxb/ComplexTypesService_RPC.xsd"); + File xsdFile = getResourceFile("common/jbossxb/ComplexTypesService_RPC.xsd"); assertTrue(xsdFile.exists()); return new JavaToXSD().parseSchema(xsdFile.toURL()); @@ -161,7 +161,7 @@ private JavaWsdlMapping getJavaWSDLMapping() throws Exception { JavaWsdlMappingFactory factory = JavaWsdlMappingFactory.newInstance(); - URL mappingURL = new File("resources/common/jbossxb/ComplexTypesService_RPC.xml").toURL(); + URL mappingURL = getResourceURL("common/jbossxb/ComplexTypesService_RPC.xml"); JavaWsdlMapping javaWsdlMapping = factory.parse(mappingURL); return javaWsdlMapping; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -49,7 +49,7 @@ protected XSModel getSchemaModel() throws Exception { - File xsdFile = new File("resources/common/jbossxb/DocumentStyle.xsd"); + File xsdFile = getResourceFile("common/jbossxb/DocumentStyle.xsd"); assertTrue(xsdFile.exists()); return parseSchema(xsdFile.toURL()); @@ -92,7 +92,7 @@ private JavaWsdlMapping getJavaWSDLMapping() throws Exception { JavaWsdlMappingFactory factory = JavaWsdlMappingFactory.newInstance(); - URL mappingURL = new File("resources/common/jbossxb/DocumentStyle.xml").toURL(); + URL mappingURL = getResourceURL("common/jbossxb/DocumentStyle.xml"); JavaWsdlMapping javaWsdlMapping = factory.parse(mappingURL); return javaWsdlMapping; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -47,7 +47,7 @@ protected XSModel getSchemaModel() throws Exception { - File xsdFile = new File("resources/common/jbossxb/DocumentStyle.xsd"); + File xsdFile = getResourceFile("common/jbossxb/DocumentStyle.xsd"); assertTrue(xsdFile.exists()); return parseSchema(xsdFile.toURL()); @@ -83,7 +83,7 @@ private JavaWsdlMapping getJavaWSDLMapping() throws Exception { JavaWsdlMappingFactory factory = JavaWsdlMappingFactory.newInstance(); - URL mappingURL = new File("resources/common/jbossxb/DocumentStyle.xml").toURL(); + URL mappingURL = getResourceURL("common/jbossxb/DocumentStyle.xml"); JavaWsdlMapping javaWsdlMapping = factory.parse(mappingURL); return javaWsdlMapping; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -47,11 +47,11 @@ public void testImportNode() throws Exception { MessageFactory factory = MessageFactory.newInstance(); - File soapreqfile = new File("resources/common/jbws1692/soap-request-template.xml"); + File soapreqfile = getResourceFile("common/jbws1692/soap-request-template.xml"); SOAPMessage msg = factory.createMessage(null, new FileInputStream(soapreqfile)); // Get the node that needs to be imported - Node someNode = getNode("resources/common/jbws1692/import-node.xml"); + Node someNode = getNode(getResourceFile("common/jbws1692/import-node.xml").getPath()); // Import the node Node importedNode = msg.getSOAPPart().getOwnerDocument().importNode(someNode, true); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -119,7 +119,7 @@ // [JBWS-1407] Premature end of File exception on createMessage public void testPrematureEndOfFile() throws Exception { - File envFile = new File("resources/common/soap/MessageFactory/jbws1407.xml"); + File envFile = getResourceFile("common/soap/MessageFactory/jbws1407.xml"); assertTrue("File exists: " + envFile, envFile.exists()); FileInputStream inputStream = new FileInputStream(envFile); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -40,7 +40,7 @@ { public void testBaseRpcLit() throws Exception { - File wsdlFile = new File("resources/common/wsdl11/microsoft-interop/rpclit/BaseTypesRpcLit.wsdl"); + File wsdlFile = getResourceFile("common/wsdl11/microsoft-interop/rpclit/BaseTypesRpcLit.wsdl"); assertTrue(wsdlFile.exists()); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -39,7 +39,7 @@ { public void testMultipleSchemas() throws Exception { - File wsdlFile = new File("resources/jaxrpc/marshall-rpclit/WEB-INF/wsdl/MarshallService.wsdl"); + File wsdlFile = getResourceFile("jaxrpc/marshall-rpclit/WEB-INF/wsdl/MarshallService.wsdl"); assertTrue(wsdlFile.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -41,7 +41,7 @@ */ public class SimpleFileImportTestCase extends JBossWSTest { - public static final String WSDL_LOCATION = "resources/common/wsdl11/simplefile/SimpleFile.wsdl"; + private final String WSDL_LOCATION = getResourceFile("common/wsdl11/simplefile/SimpleFile.wsdl").getPath(); public void testFileURL() throws Exception { Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -61,7 +61,7 @@ public void testDocLitSimple() throws Exception { - File wsdlFile = new File("resources/common/wsdl11/DocLitSimple.wsdl"); + File wsdlFile = getResourceFile("common/wsdl11/DocLitSimple.wsdl"); assertTrue(wsdlFile.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -107,12 +107,12 @@ public void testRpcLitSimple() throws Exception { - verifyRPC("resources/common/wsdl11/RpcLitSimple.wsdl"); + verifyRPC(getResourceFile("common/wsdl11/RpcLitSimple.wsdl").getPath()); } public void testRpcLitImport() throws Exception { - verifyRPC("resources/common/wsdl11/RpcLitImport.wsdl"); + verifyRPC(getResourceFile("common/wsdl11/RpcLitImport.wsdl").getPath()); } private void verifyRPC(String fileName) throws Exception @@ -158,7 +158,7 @@ public void testEventSourceBinding() throws Exception { - File wsdlFile = new File("resources/common/wsdl11/inherit/wind_inherit.wsdl"); + File wsdlFile = getResourceFile("common/wsdl11/inherit/wind_inherit.wsdl"); assertTrue(wsdlFile.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -184,7 +184,7 @@ public void testSwaMessages() throws Exception { - File wsdlFile = new File("resources/common/wsdl11/SwaTestService.wsdl"); + File wsdlFile = getResourceFile("common/wsdl11/SwaTestService.wsdl"); assertTrue(wsdlFile.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -198,10 +198,10 @@ public void testPolicyAttachment() throws Exception { - File wsdlFile = new File("resources/common/wsdl11/PolicyAttachment.wsdl"); + File wsdlFile = getResourceFile("common/wsdl11/PolicyAttachment.wsdl"); assertTrue(wsdlFile.exists()); testPolicyAttachment(wsdlFile); - wsdlFile = new File("resources/common/wsdl11/PolicyAttachmentFragment.wsdl"); + wsdlFile = getResourceFile("common/wsdl11/PolicyAttachmentFragment.wsdl"); assertTrue(wsdlFile.exists()); testPolicyAttachment(wsdlFile); } @@ -227,9 +227,9 @@ public void testServicePolicyRef() throws Exception { - File wsdlFile = new File("resources/common/wsdl11/PolicyAttachment.wsdl"); + File wsdlFile = getResourceFile("common/wsdl11/PolicyAttachment.wsdl"); testServicePolicyRef(wsdlFile); - wsdlFile = new File("resources/common/wsdl11/PolicyAttachmentFragment.wsdl"); + wsdlFile = getResourceFile("common/wsdl11/PolicyAttachmentFragment.wsdl"); testServicePolicyRef(wsdlFile); } @@ -247,9 +247,9 @@ public void testEndpointPolicyRef() throws Exception { - File wsdlFile = new File("resources/common/wsdl11/PolicyAttachment.wsdl"); + File wsdlFile = getResourceFile("common/wsdl11/PolicyAttachment.wsdl"); testEndpointPolicyRef(wsdlFile); - wsdlFile = new File("resources/common/wsdl11/PolicyAttachmentFragment.wsdl"); + wsdlFile = getResourceFile("common/wsdl11/PolicyAttachmentFragment.wsdl"); testEndpointPolicyRef(wsdlFile); } @@ -292,7 +292,7 @@ { //Read wsdl containing policies from file and get the wsdl metadata model WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(new File("resources/common/wsdl11/PolicyAttachment.wsdl").toURL()); + WSDLDefinitions wsdlDefinitions = factory.parse(getResourceURL("/common/wsdl11/PolicyAttachment.wsdl")); assertNotNull(wsdlDefinitions); //set wsdlOneOne to null to force wsdl generation from metadata model wsdlDefinitions.setWsdlOneOneDefinition(null); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -40,7 +40,7 @@ { public void testIncludedSchema() throws Exception { - File wsdlLocation = new File("resources/tools/wsdl11/TestServiceXsdInclude.wsdl"); + File wsdlLocation = getResourceFile("tools/wsdl11/TestServiceXsdInclude.wsdl"); assertTrue(wsdlLocation.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -53,7 +53,7 @@ public void testImportedSchema() throws Exception { - File wsdlLocation = new File("resources/tools/wsdl11/TestServiceXsdImport.wsdl"); + File wsdlLocation = getResourceFile("tools/wsdl11/TestServiceXsdImport.wsdl"); assertTrue(wsdlLocation.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -46,7 +46,7 @@ */ public class WSDLWithAnonTypesTestCase extends WSToolsTest { - String wsdlfile = "resources/jaxrpc/anonymous/WEB-INF/wsdl/TestService.wsdl"; + String wsdlfile = getResourceFile("jaxrpc/anonymous/WEB-INF/wsdl/TestService.wsdl").getPath(); public void testWSDLParse() throws IOException { Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/AddressingTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -93,7 +93,7 @@ if (echoPort==null || notifyPort==null) { - wsdlLocation = new File("resources/interop/nov2007/wsaSoap12/WEB-INF/wsdl/service.wsdl").toURL(); + wsdlLocation = getResourceURL("interop/nov2007/wsaSoap12/WEB-INF/wsdl/service.wsdl"); Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/";, "WSAddressingCR")); echoPort = service.getPort(Echo.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/AbstractWSSEBase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/AbstractWSSEBase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/AbstractWSSEBase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -56,7 +56,7 @@ if (port == null) { - URL wsdlLocation = new File("resources/interop/nov2007/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl").toURL(); + URL wsdlLocation = getResourceURL("interop/nov2007/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl"); QName serviceName = new QName("http://InteropBaseAddress/interop", "PingService10"); Service service = Service.create(wsdlLocation, serviceName); port = (IPingService)service.getPort(getScenarioPortQName(), IPingService.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -72,8 +72,8 @@ { ((StubExt)port).setConfigName("Standard WSSecurity Client"); - System.setProperty("org.jboss.ws.wsse.keyStore", "resources/interop/nov2007/wsse/shared/META-INF/alice-sign_enc.jks"); - System.setProperty("org.jboss.ws.wsse.trustStore", "resources/interop/nov2007/wsse/shared/META-INF/wsse10.truststore"); + System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("interop/nov2007/wsse/shared/META-INF/alice-sign_enc.jks").getPath()); + System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("interop/nov2007/wsse/shared/META-INF/wsse10.truststore").getPath()); System.setProperty("org.jboss.ws.wsse.keyStorePassword", "password"); System.setProperty("org.jboss.ws.wsse.trustStorePassword", "password"); System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -141,8 +141,8 @@ { ((StubExt)port).setConfigName("Standard WSSecurity Client"); - System.setProperty("org.jboss.ws.wsse.keyStore", "resources/interop/nov2007/wsse/shared/META-INF/alice-sign_enc.jks"); - System.setProperty("org.jboss.ws.wsse.trustStore", "resources/interop/nov2007/wsse/shared/META-INF/wsse10.truststore"); + System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("interop/nov2007/wsse/shared/META-INF/alice-sign_enc.jks").getPath()); + System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("interop/nov2007/wsse/shared/META-INF/wsse10.truststore").getPath()); System.setProperty("org.jboss.ws.wsse.keyStorePassword", "password"); System.setProperty("org.jboss.ws.wsse.trustStorePassword", "password"); System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -55,7 +55,7 @@ if (targetPort == null) { - URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl").toURL(); + URL wsdlLocation = getResourceURL("interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl"); Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/";, "BaseDataTypesDocLitBService") ); targetPort = service.getPort(IBaseDataTypesDocLitB.class); ((BindingProvider)targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -54,7 +54,7 @@ if (targetPort == null) { - URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl").toURL(); + URL wsdlLocation = getResourceURL("interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl"); Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/";, "BaseDataTypesDocLitWService") ); BaseDataTypesDocLitWTestCase.targetPort = service.getPort(IBaseDataTypesDocLitW.class); ((BindingProvider)BaseDataTypesDocLitWTestCase.targetPort).getRequestContext().put( Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -56,7 +56,7 @@ if (targetPort == null) { - URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl").toURL(); + URL wsdlLocation = getResourceURL("interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl"); Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/";, "BaseDataTypesRpcLitService") ); targetPort = service.getPort(IBaseDataTypesRpcLit.class); ((BindingProvider)targetPort).getRequestContext().put( Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -80,7 +80,7 @@ if (echoPort==null || notifyPort==null) { - this.wsdlLocation = new File("resources/interop/wsa/WEB-INF/wsdl/service.wsdl").toURL(); + this.wsdlLocation = getResourceURL("interop/wsa/WEB-INF/wsdl/service.wsdl"); Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/";, "WSAddressingCR")); echoPort = service.getPort(EchoPortType.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ if (port == null) { - URL wsdlLocation = new File("resources/interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl").toURL(); + URL wsdlLocation = getResourceURL("interop/wsse/shared/WEB-INF/wsdl/WsSecurity10.wsdl"); QName serviceName = new QName("http://tempuri.org/";, "PingService10"); Service service = Service.create(wsdlLocation, serviceName); port = service.getPort(IPingService.class); @@ -69,8 +69,8 @@ protected void defaultSetup(IPingService port) { ((StubExt)port).setConfigName("Standard WSSecurity Client"); - System.setProperty("org.jboss.ws.wsse.keyStore", "resources/interop/wsse/shared/META-INF/alice.jks"); - System.setProperty("org.jboss.ws.wsse.trustStore", "resources/interop/wsse/shared/META-INF/wsse10.truststore"); + System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("interop/wsse/shared/META-INF/alice.jks").getPath()); + System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("interop/wsse/shared/META-INF/wsse10.truststore").getPath()); System.setProperty("org.jboss.ws.wsse.keyStorePassword", "password"); System.setProperty("org.jboss.ws.wsse.trustStorePassword", "password"); System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -39,7 +39,7 @@ { public void testWSDLParse() throws Exception { - File wsdlFile = new File("resources/jaxrpc/jbws1068/wsrp_services.wsdl"); + File wsdlFile = getResourceFile("jaxrpc/jbws1068/wsrp_services.wsdl"); assertTrue(wsdlFile.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -52,7 +52,7 @@ { ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1124one/TestEndpoint?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws1124/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws1124/WEB-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.test.ws/jbws1124", "TestService"); Service service = factory.createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); @@ -64,7 +64,7 @@ { ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1124two/TestEndpoint?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws1124/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws1124/WEB-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.test.ws/jbws1124", "TestService"); Service service = factory.createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -63,8 +63,8 @@ if (port == null) { ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/jbws1186/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1186/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1186/WEB-INF/wsdl/TestService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1186/WEB-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.test.ws/jbws1186", "TestService"); Service service = factory.createService(wsdlURL, qname, mappingURL); port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -42,7 +42,7 @@ private WSSecurityConfiguration load(final String fileName) throws IOException { - File configFile = new File("resources/jaxrpc/jbws1316/config/" + fileName); + File configFile = new File(getResourceFile("jaxrpc/jbws1316/config/").getPath() + fileName); WSSecurityOMFactory factory = WSSecurityOMFactory.newInstance(); return factory.parse(configFile.toURL()); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -58,8 +58,8 @@ if (port == null) { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://www.example.com/Example";, "ExampleService"); Service service = factory.createService(wsdlURL, serviceName , mappingURL); port = (ExamplePort)service.getPort(ExamplePort.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -59,8 +59,8 @@ if (port == null) { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.webservice/samples2", "Gasherbrum"); Service service = factory.createService(wsdlURL, serviceName , mappingURL); port = (TransmulatorInterface)service.getPort(TransmulatorInterface.class); @@ -71,7 +71,7 @@ public void testWsdlToJava() throws Exception { WSTools wstools = new WSTools(); - boolean ret = wstools.generate("resources/jaxrpc/jbws1384/wstools-config.xml", "./wstools/jbws1384"); + boolean ret = wstools.generate(getResourceFile("jaxrpc/jbws1384/wstools-config.xml").getPath(), "./wstools/jbws1384"); assertTrue("wstools success", ret); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -58,8 +58,8 @@ if (port == null) { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1386/WEB-INF/wsdl/TestService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1386/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.ws/jbws1386", "TestService"); Service service = factory.createService(wsdlURL, serviceName , mappingURL); port = (RequestService)service.getPort(RequestService.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -59,8 +59,8 @@ if (port == null) { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1410/WEB-INF/wsdl/TestService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1410/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.ws/jbws1410", "TestService"); Service service = factory.createService(wsdlURL, serviceName, mappingURL); port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -61,8 +61,8 @@ if (port == null) { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://za.co.testws.interfaces", "ProcessClaim"); Service service = factory.createService(wsdlURL, serviceName , mappingURL); port = (RequestService)service.getPort(RequestService.class); @@ -73,7 +73,7 @@ public final void testWsdlParser() throws Exception { WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - File wsdlFile = new File("resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl"); + File wsdlFile = getResourceFile("jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl"); assertTrue("File exists: " + wsdlFile, wsdlFile.exists()); factory.parse(wsdlFile.toURL()); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -55,7 +55,7 @@ public void testNone() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceNone"); Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); Hello port = (Hello) service.getPort(Hello.class); @@ -67,7 +67,7 @@ { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCOne?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI"); Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); QName portName = new QName("http://org.jboss.test.webservice/jbws165", "HelloPortOne"); @@ -80,7 +80,7 @@ { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCTwo?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI"); Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); QName portName = new QName("http://org.jboss.test.webservice/jbws165", "HelloPortTwo"); @@ -92,7 +92,7 @@ public void testContextRoot() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Context/HelloContextRoot?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceCtxRoot"); Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); Hello port = (Hello) service.getPort(Hello.class); @@ -103,7 +103,7 @@ public void testBoth() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Both/Explicit/Path?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceBoth"); Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); Hello port = (Hello) service.getPort(Hello.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -89,7 +89,7 @@ { ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws1653/TestEndpoint?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.test.ws/jbws1653", "TestService"); Service service = factory.createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); @@ -109,7 +109,7 @@ try { if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) - resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL(); + resURL = getResourceURL("jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml"); } catch (MalformedURLException ex) { @@ -124,7 +124,7 @@ try { if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) - resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL(); + resURL = getResourceURL("jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml"); } catch (MalformedURLException ex) { @@ -170,7 +170,7 @@ try { if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) - resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL(); + resURL = getResourceURL("jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml"); } catch (MalformedURLException ex) { @@ -215,7 +215,7 @@ try { if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) - resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL(); + resURL = getResourceURL("jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml"); } catch (MalformedURLException ex) { @@ -228,7 +228,7 @@ ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws1653/TestEndpoint?wsdl"); - URL mappingURL = new File("resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.test.ws/jbws1653", "TestService"); Service service = factory.createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -46,7 +46,7 @@ { super.setUp(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - URL mappingURL = new File("resources/jaxrpc/jbws1762/META-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws1762/META-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.webservice/jbws1762", "EJB2Bean"); ServiceFactoryImpl factory = new ServiceFactoryImpl(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -53,7 +53,7 @@ { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - URL mappingURL = new File("resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName(pojoTargetNS, pojoServiceName); Service service = factory.createService(wsdlURL, serviceName, mappingURL); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -57,8 +57,8 @@ if (port == null) { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws950/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws950/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws950/WEB-INF/wsdl/TestService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws950/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.ws/jbws950", "TestService"); Service service = factory.createService(wsdlURL, serviceName, mappingURL); port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -57,8 +57,8 @@ if (port == null) { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws956/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws956/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws956/WEB-INF/wsdl/TestService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/jbws956/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.ws/jbws956", "TestService"); Service service = factory.createService(wsdlURL, serviceName, mappingURL); port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -41,7 +41,7 @@ public void testWSDLReader() throws Exception { WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - URL wsdlURL = new File("resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl"); WSDLDefinitions wsdlDefs = factory.parse(wsdlURL); assertNotNull(wsdlDefs); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -61,7 +61,7 @@ if (endpoint == null) { - File javaWsdlMappingFile = new File("resources/jaxrpc/samples/handler/WEB-INF/jaxrpc-mapping.xml"); + File javaWsdlMappingFile = getResourceFile("jaxrpc/samples/handler/WEB-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); QName serviceName = new QName(NAMESPACE_URI, "TestService"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -60,7 +60,7 @@ if (call == null) { - File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); + File javaWsdlMappingFile = getResourceFile("jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); ServiceFactoryImpl factory = new ServiceFactoryImpl(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -57,7 +57,7 @@ if (port == null) { - File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); + File javaWsdlMappingFile = getResourceFile("jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); QName serviceName = new QName(TARGET_NAMESPACE, "TestService"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -60,7 +60,7 @@ if (call == null) { - File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml"); + File javaWsdlMappingFile = getResourceFile("jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); ServiceFactoryImpl factory = new ServiceFactoryImpl(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -66,8 +66,8 @@ { System.out.println("FIXME [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.ws/samples/jsr109pojo", "TestService"); Service service = factory.createService(wsdlURL, qname, mappingURL); port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -57,7 +57,7 @@ if (endpoint == null) { - File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml"); + File javaWsdlMappingFile = getResourceFile("jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); QName serviceName = new QName(TARGET_NAMESPACE, "TestService"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -63,8 +63,8 @@ public void testDynamicProxy() throws Exception { - URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); @@ -76,7 +76,7 @@ public void testDynamicProxyNeg() throws Exception { - URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); try Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -62,8 +62,8 @@ public void testDynamicProxy() throws Exception { - URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -63,8 +63,8 @@ public void testDynamicProxy() throws Exception { - URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml"); QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -70,7 +70,7 @@ String rpcMethodName = "sendMimeImageGIF"; Call call = setupMimeMessage(rpcMethodName, "image/gif"); - URL url = new File("resources/jaxrpc/samples/swa/attach.gif").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.gif"); // On Linux the X11 server must be installed properly to create images successfully. // If the image cannot be created in the test VM, we assume it cannot be done on the @@ -98,7 +98,7 @@ String rpcMethodName = "sendMimeImageJPEG"; Call call = setupMimeMessage(rpcMethodName, "image/jpeg"); - URL url = new File("resources/jaxrpc/samples/swa/attach.jpeg").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.jpeg"); // On Linux the X11 server must be installed properly to create images successfully. // If the image cannot be created in the test VM, we assume it cannot be done on the @@ -126,7 +126,7 @@ String rpcMethodName = "sendMimeTextPlain"; Call call = setupMimeMessage(rpcMethodName, "text/plain"); - URL url = new File("resources/jaxrpc/samples/swa/attach.txt").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.txt"); sendAndValidateMimeMessage(call, new DataHandler(url)); } @@ -137,7 +137,7 @@ String rpcMethodName = "sendMimeMultipart"; Call call = setupMimeMessage(rpcMethodName, "multipart/mixed"); - URL url = new File("resources/jaxrpc/samples/swa/attach.txt").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.txt"); MimeMultipart mimepart = new MimeMultipart("mixed"); MimeBodyPart bodyPart = new MimeBodyPart(); bodyPart.setDataHandler(new DataHandler(url)); @@ -154,7 +154,7 @@ { String rpcMethodName = "sendMimeTextXML"; Call call = setupMimeMessage(rpcMethodName, "text/xml"); - FileInputStream stream = new FileInputStream("resources/jaxrpc/samples/swa/attach.xml"); + FileInputStream stream = new FileInputStream(getResourceFile("jaxrpc/samples/swa/attach.xml").getPath()); StreamSource source = new StreamSource(stream); sendAndValidateMimeMessage(call, new DataHandler(source, "text/xml")); @@ -167,7 +167,7 @@ String rpcMethodName = "sendMimeApplicationXML"; Call call = setupMimeMessage(rpcMethodName, "application/xml"); - URL url = new File("resources/jaxrpc/samples/swa/attach.xml").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.xml"); sendAndValidateMimeMessage(call, new DataHandler(url)); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -72,7 +72,7 @@ */ public void testSendMimeImageGIF() throws Exception { - URL url = new File("resources/jaxrpc/samples/swa/attach.gif").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.gif"); // On Linux the X11 server must be installed properly to create images successfully. // If the image cannot be created in the test VM, we assume it cannot be done on the @@ -98,7 +98,7 @@ */ public void testSendMimeImageJPEG() throws Exception { - URL url = new File("resources/jaxrpc/samples/swa/attach.jpeg").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.jpeg"); // On Linux the X11 server must be installed properly to create images successfully. // If the image cannot be created in the test VM, we assume it cannot be done on the @@ -132,7 +132,7 @@ */ public void testSendMimeMultipart() throws Exception { - URL url = new File("resources/jaxrpc/samples/swa/attach.txt").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.txt"); MimeMultipart multipart = new MimeMultipart("mixed"); MimeBodyPart bodyPart = new MimeBodyPart(); bodyPart.setDataHandler(new DataHandler(url)); @@ -148,7 +148,7 @@ */ public void testSendMimeTextXML() throws Exception { - FileInputStream stream = new FileInputStream("resources/jaxrpc/samples/swa/attach.xml"); + FileInputStream stream = new FileInputStream(getResourceFile("jaxrpc/samples/swa/attach.xml").getPath()); StreamSource source = new StreamSource(stream); String value = port.sendMimeTextXML("Some text message", new DataHandler(source, "text/xml")); @@ -159,7 +159,7 @@ */ public void testSendMimeApplicationXML() throws Exception { - FileInputStream stream = new FileInputStream("resources/jaxrpc/samples/swa/attach.xml"); + FileInputStream stream = new FileInputStream(getResourceFile("jaxrpc/samples/swa/attach.xml").getPath()); StreamSource source = new StreamSource(stream); String value = port.sendMimeApplicationXML("Some text message", source); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -80,7 +80,7 @@ String rpcMethodName = "sendMimeImageGIF"; SOAPMessage msg = setupMimeMessage(rpcMethodName); - URL url = new File("resources/jaxrpc/samples/swa/attach.gif").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.gif"); // On Linux the X11 server must be installed properly to create images successfully. // If the image cannot be created in the test VM, we assume it cannot be done on the @@ -110,7 +110,7 @@ String rpcMethodName = "sendMimeImageJPEG"; SOAPMessage msg = setupMimeMessage(rpcMethodName); - URL url = new File("resources/jaxrpc/samples/swa/attach.jpeg").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.jpeg"); // On Linux the X11 server must be installed properly to create images successfully. // If the image cannot be created in the test VM, we assume it cannot be done on the @@ -140,7 +140,7 @@ String rpcMethodName = "sendMimeTextPlain"; SOAPMessage msg = setupMimeMessage(rpcMethodName); - URL url = new File("resources/jaxrpc/samples/swa/attach.txt").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.txt"); addAttachmentPart(msg, "text/plain", new DataHandler(url)); //msg.writeTo(new FileOutputStream(rpcMethodName + "_RequestMessage.txt")); @@ -155,7 +155,7 @@ String rpcMethodName = "sendMimeMultipart"; SOAPMessage msg = setupMimeMessage(rpcMethodName); - URL url = new File("resources/jaxrpc/samples/swa/attach.txt").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.txt"); MimeMultipart multipart = new MimeMultipart("mixed"); MimeBodyPart bodyPart = new MimeBodyPart(); bodyPart.setDataHandler(new DataHandler(url)); @@ -184,7 +184,7 @@ String rpcMethodName = "sendMimeTextXML"; SOAPMessage msg = setupMimeMessage(rpcMethodName); - URL url = new File("resources/jaxrpc/samples/swa/attach.xml").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.xml"); addAttachmentPart(msg, "text/xml", new DataHandler(url)); //msg.writeTo(new FileOutputStream(rpcMethodName + "_RequestMessage.txt")); @@ -198,7 +198,7 @@ String rpcMethodName = "sendMimeApplicationXML"; SOAPMessage msg = setupMimeMessage(rpcMethodName); - URL url = new File("resources/jaxrpc/samples/swa/attach.xml").toURL(); + URL url = getResourceURL("jaxrpc/samples/swa/attach.xml"); addAttachmentPart(msg, "application/xml", new DataHandler(url)); //msg.writeTo(new FileOutputStream(rpcMethodName + "_RequestMessage.txt")); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -65,9 +65,9 @@ else { ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml").toURL(); - URL securityURL = new File("resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml").toURL(); + URL wsdlURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml"); + URL securityURL = getResourceURL("jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml"); QName qname = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, qname, mappingURL, securityURL); port = (Hello)service.getPort(Hello.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -49,7 +49,7 @@ public void testClientProxy() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsdlpublish?wsdl"); - URL mappingURL = new File("resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml").toURL(); + URL mappingURL = getResourceURL("jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml"); QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService"); Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -75,7 +75,7 @@ " </soap:Body>" + "</soap:Envelope>"; - InputStream inputStream = new FileInputStream("resources/jaxrpc/wsse/interop/microsoft-wse.xml"); + InputStream inputStream = new FileInputStream(getResourceFile("jaxrpc/wsse/interop/microsoft-wse.xml").getPath()); MessageFactory factory = new MessageFactoryImpl(); SOAPMessage soapMsg = factory.createMessage(null, inputStream); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -51,7 +51,7 @@ /** Test that we can build an envelope from InputStream */ public void testSunSTRRequest() throws Exception { - InputStream inputStream = new FileInputStream("resources/jaxrpc/wsse/interop/sun-xws.xml"); + InputStream inputStream = new FileInputStream(getResourceFile("jaxrpc/wsse/interop/sun-xws.xml").getPath()); MessageFactory factory = new MessageFactoryImpl(); SOAPMessage soapMsg = factory.createMessage(null, inputStream); @@ -85,7 +85,7 @@ /** Test that we can build an envelope from InputStream */ public void testSunIssuerSerialSignEncrypt() throws Exception { - InputStream inputStream = new FileInputStream("resources/jaxrpc/wsse/interop/sun-xws-issuerserial-sign-encrypt.xml"); + InputStream inputStream = new FileInputStream(getResourceFile("jaxrpc/wsse/interop/sun-xws-issuerserial-sign-encrypt.xml").getPath()); MessageFactory factory = new MessageFactoryImpl(); SOAPMessage soapMsg = factory.createMessage(null, inputStream); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -2,40 +2,29 @@ import java.io.File; -import junit.framework.TestCase; - import org.apache.xerces.xs.XSComplexTypeDefinition; import org.apache.xerces.xs.XSModel; import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; +import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; +import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.wsf.test.JBossWSTest; import org.jboss.xb.binding.NamespaceRegistry; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @since Jun 9, 2006 */ -public class XOPTypeDefTestCase extends TestCase +public class XOPTypeDefTestCase extends JBossWSTest { - public XOPTypeDefTestCase(String string) - { - super(string); - } - - protected void setUp() throws Exception - { - super.setUp(); - } - public void testCircularReferences() throws Exception { SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/circular.xsd"); + File f = getResourceFile("jaxrpc/xop/circular.xsd"); assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); XSModel xsModel = utils.parseSchema(f.toURL()); @@ -60,7 +49,7 @@ public void testXOPElementScan() throws Exception { SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/schema.xsd"); + File f = getResourceFile("jaxrpc/xop/schema.xsd"); assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); XSModel xsModel = utils.parseSchema(f.toURL()); @@ -96,10 +85,10 @@ } public void testMSFTElementScan() throws Exception - { + { SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/schema.xsd"); + File f = getResourceFile("jaxrpc/xop/schema.xsd"); assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); XSModel xsModel = utils.parseSchema(f.toURL()); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ */ public abstract class XOPBase extends JBossWSTest { - private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); + private File imgFile = getResourceFile("jaxrpc/xop/shared/attach.jpeg"); protected abstract XOPPing getPort(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -49,7 +49,7 @@ */ public abstract class XOPBase extends JBossWSTest { - private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); + private File imgFile = getResourceFile("jaxrpc/xop/shared/attach.jpeg"); protected abstract XOPPing getPort(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbintros/AnnotationReaderTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -21,53 +21,50 @@ */ package org.jboss.test.ws.jaxws.jaxbintros; -import com.sun.xml.bind.api.JAXBRIContext; -import junit.framework.TestCase; -import org.jboss.jaxb.intros.IntroductionsAnnotationReader; -import org.jboss.jaxb.intros.IntroductionsConfigParser; -import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.util.HashMap; +import java.util.Map; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; -import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.util.HashMap; -import java.util.Map; +import org.jboss.jaxb.intros.IntroductionsAnnotationReader; +import org.jboss.jaxb.intros.IntroductionsConfigParser; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import org.jboss.wsf.test.JBossWSTest; + +import com.sun.xml.bind.api.JAXBRIContext; + /** * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ -public class AnnotationReaderTestCase extends TestCase +public class AnnotationReaderTestCase extends JBossWSTest { public void testUnmarshal() throws Exception { - String reqString = - " <ns1:user xmlns:ns1='http://org.jboss.ws/provider' string='Kermit'>" + - " <qname>The Frog</qname>" + - " </ns1:user>"; + String reqString = + " <ns1:user xmlns:ns1='http://org.jboss.ws/provider' string='Kermit'>" + + " <qname>The Frog</qname>" + + " </ns1:user>"; - JaxbIntros config = IntroductionsConfigParser.parseConfig( - new FileInputStream("resources/jaxws/jaxbintros/WEB-INF/jaxb-intros.xml") - ); - + JaxbIntros config = IntroductionsConfigParser.parseConfig(new FileInputStream(getResourceFile("jaxws/jaxbintros/WEB-INF/jaxb-intros.xml").getPath())); + IntroductionsAnnotationReader reader = new IntroductionsAnnotationReader(config); Map<String, Object> jaxbConfig = new HashMap<String, Object>(); jaxbConfig.put(JAXBRIContext.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.ws/provider"); jaxbConfig.put(JAXBRIContext.ANNOTATION_READER, reader); - JAXBContext jaxbContext = JAXBContext.newInstance(new Class[] {UserType.class}, jaxbConfig); + JAXBContext jaxbContext = JAXBContext.newInstance(new Class[] { UserType.class }, jaxbConfig); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); - JAXBElement jbe = unmarshaller.unmarshal( - new StreamSource( - new ByteArrayInputStream(reqString.getBytes()) + JAXBElement jbe = unmarshaller.unmarshal(new StreamSource(new ByteArrayInputStream(reqString.getBytes()) - ), UserType.class - ); + ), UserType.class); UserType ut = (UserType)jbe.getValue(); assertEquals("Kermit", ut.getString()); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -61,7 +61,7 @@ public void testSchemaValidationPositive() throws Exception { - URL wsdlURL = new File("resources/jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl"); URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL); String inxml = "<performTest xmlns='http://www.my-company.it/ws/my-test'><Code>1000</Code></performTest>"; new SchemaValidationHelper(xsdURL).validateDocument(inxml); @@ -69,7 +69,7 @@ public void testSchemaValidationNegative() throws Exception { - URL wsdlURL = new File("resources/jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl"); URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL); String inxml = "<performTest xmlns='http://www.my-company.it/ws/my-test'><Code>2000</Code></performTest>"; try @@ -93,7 +93,7 @@ public void testValidatingClientWithExplicitSchema() throws Exception { - URL wsdlURL = new File("resources/jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl"); URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL); Service21 service = Service21.create(wsdlURL, SERVICE_NAME); @@ -114,7 +114,7 @@ public void testValidatingClientWithErrorHandler() throws Exception { - URL wsdlURL = new File("resources/jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl"); URL xsdURL = new SchemaExtractor().getSchemaUrl(wsdlURL); Service21 service = Service21.create(wsdlURL, SERVICE_NAME); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1814/SimpleEncryptTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1814/SimpleEncryptTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1814/SimpleEncryptTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -91,7 +91,7 @@ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1814", "HelloService"); Hello port = Service.create(wsdlURL, serviceName).getPort(Hello.class); - URL securityURL = new File("resources/jaxws/jbws1814/META-INF/jboss-wsse-client.xml").toURL(); + URL securityURL = getResourceURL("jaxws/jbws1814/META-INF/jboss-wsse-client.xml"); ((StubExt)port).setSecurityConfig(securityURL.toExternalForm()); ((StubExt)port).setConfigName("Standard WSSecurity Client"); return port; @@ -107,8 +107,8 @@ trustStorePassword = System.getProperty("org.jboss.ws.wsse.trustStorePassword"); trustStoreType = System.getProperty("org.jboss.ws.wsse.trustStoreType"); //Set values - System.setProperty("org.jboss.ws.wsse.keyStore", "resources/jaxws/jbws1814/META-INF/" + client + "-sign_enc.jks"); - System.setProperty("org.jboss.ws.wsse.trustStore", "resources/jaxws/jbws1814/META-INF/wsse10.truststore"); + System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("jaxws/jbws1814/META-INF/" + client + "-sign_enc.jks").getPath()); + System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("jaxws/jbws1814/META-INF/wsse10.truststore").getPath()); System.setProperty("org.jboss.ws.wsse.keyStorePassword", "password"); System.setProperty("org.jboss.ws.wsse.trustStorePassword", "password"); System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1857/JBWS1857TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1857/JBWS1857TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1857/JBWS1857TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -42,7 +42,7 @@ { public void testPortCreation() throws Exception { - File wsdlFile = new File("resources/jaxws/jbws1857/StammdatenService.wsdl"); + File wsdlFile = getResourceFile("jaxws/jbws1857/StammdatenService.wsdl"); QName serviceName = new QName("http://example.com", "StammdatenService"); Service service = Service.create(wsdlFile.toURL(), serviceName); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -89,7 +89,7 @@ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1988", "HelloService"); Hello port = Service.create(wsdlURL, serviceName).getPort(Hello.class); - URL securityURL = new File("resources/jaxws/jbws1988/META-INF/jboss-wsse-client.xml").toURL(); + URL securityURL = getResourceURL("jaxws/jbws1988/META-INF/jboss-wsse-client.xml"); ((StubExt)port).setSecurityConfig(securityURL.toExternalForm()); ((StubExt)port).setConfigName("Standard WSSecurity Client"); ((BindingProvider)port).getRequestContext().put(StubExt.PROPERTY_AUTH_TYPE, StubExt.PROPERTY_AUTH_TYPE_WSSE); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -88,7 +88,7 @@ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1991", "HelloService"); Hello port = Service.create(wsdlURL, serviceName).getPort(Hello.class); - URL securityURL = new File("resources/jaxws/jbws1991/META-INF/jboss-wsse-client.xml").toURL(); + URL securityURL = getResourceURL("jaxws/jbws1991/META-INF/jboss-wsse-client.xml"); ((StubExt)port).setSecurityConfig(securityURL.toExternalForm()); ((StubExt)port).setConfigName("Standard WSSecurity Client"); ((BindingProvider)port).getRequestContext().put(StubExt.PROPERTY_AUTH_TYPE, StubExt.PROPERTY_AUTH_TYPE_WSSE); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -64,7 +64,7 @@ if (endpoint == null) { - URL wsdlURL = new File("resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl"); QName serviceName = new QName("http://jbws871.jaxws.ws.test.jboss.org/";, "RpcArrayEndpointService"); Service service = Service.create(wsdlURL, serviceName); endpoint = (RpcArrayEndpoint)service.getPort(RpcArrayEndpoint.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -49,7 +49,7 @@ public void testJMSEndpointPort() throws Exception { - URL wsdlURL = new File("resources/jaxws/samples/jmstransport/jmsservice.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/jmstransport/jmsservice.wsdl"); QName serviceName = new QName("http://org.jboss.ws/samples/jmstransport", "OrganizationJMSEndpointService"); QName portName = new QName("http://org.jboss.ws/samples/jmstransport", "JMSEndpointPort"); @@ -62,7 +62,7 @@ public void testHTTPEndpointPort() throws Exception { - URL wsdlURL = new File("resources/jaxws/samples/jmstransport/jmsservice.wsdl").toURL(); + URL wsdlURL = getResourceURL("jaxws/samples/jmstransport/jmsservice.wsdl"); QName serviceName = new QName("http://org.jboss.ws/samples/jmstransport", "OrganizationJMSEndpointService"); QName portName = new QName("http://org.jboss.ws/samples/jmstransport", "HTTPEndpointPort"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestWSDDParser.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -21,34 +21,34 @@ */ package org.jboss.test.ws.jaxws.wsdd; -import junit.framework.TestCase; +// $Id: $ +import java.io.InputStream; +import java.net.URL; + import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.test.JBossWSTest; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import java.io.File; -import java.io.InputStream; -import java.net.URL; - /** * Tets webservice.xml additions that are related to JAX-WS * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since Mar 12, 2007 */ -public class TestWSDDParser extends TestCase { +public class TestWSDDParser extends JBossWSTest +{ public void testJAXWSElementParsing() throws Exception { - URL webservicesURL = new File("resources/jaxws/wsdd/webservices.xml").toURL(); + URL webservicesURL = getResourceURL("jaxws/wsdd/webservices.xml"); // Unmarshall webservices.xml WebservicesMetaData webservices = null; InputStream is = webservicesURL.openStream(); @@ -67,11 +67,11 @@ WebserviceDescriptionMetaData wsDesc = webservices.getWebserviceDescriptions()[0]; assertNotNull(wsDesc); - assertTrue(wsDesc.getPortComponents().length==1); + assertTrue(wsDesc.getPortComponents().length == 1); PortComponentMetaData portComp = wsDesc.getPortComponents()[0]; assertNotNull(portComp); - assertTrue(portComp.getHandlerChains().getHandlerChains().size()>0); + assertTrue(portComp.getHandlerChains().getHandlerChains().size() > 0); // wsdlService assertTrue(portComp.getWsdlService().getLocalPart().equals("HelloService")); @@ -82,7 +82,7 @@ // handler chains UnifiedHandlerChainMetaData handlerChain = portComp.getHandlerChains().getHandlerChains().get(0); assertNotNull(handlerChain); - assertTrue( ((UnifiedHandlerMetaData)handlerChain.getHandlers().get(0)).getHandlerName().equals("ServerHandler1")); + assertTrue(((UnifiedHandlerMetaData)handlerChain.getHandlers().get(0)).getHandlerName().equals("ServerHandler1")); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -56,7 +56,7 @@ { public void testEndpointScopePolicies() throws Exception { - UnifiedVirtualFile vfRoot = new URLLoaderAdapter(new File("resources/jaxws/wspolicy").toURL()); + UnifiedVirtualFile vfRoot = new URLLoaderAdapter(getResourceURL("jaxws/wspolicy")); UnifiedMetaData umd = new UnifiedMetaData(vfRoot); QName serviceName = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService"); @@ -72,7 +72,7 @@ PolicyDeployer deployer = PolicyDeployer.newInstance(map); PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer); - WSDLDefinitions wsdlDefinitions = readWsdl("resources/jaxws/wspolicy/TestService.wsdl"); + WSDLDefinitions wsdlDefinitions = readWsdl(getResourceFile("jaxws/wspolicy/TestService.wsdl").getPath()); builder.processPolicyExtensions(epMetaData, wsdlDefinitions); PolicyMetaExtension policyExt = (PolicyMetaExtension)epMetaData.getExtension(Constants.URI_WS_POLICY); @@ -108,7 +108,7 @@ PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer); builder.setToolMode(true); - UnifiedVirtualFile vfRoot = new URLLoaderAdapter(new File("resources/jaxws/wspolicy").toURL()); + UnifiedVirtualFile vfRoot = new URLLoaderAdapter(getResourceURL("jaxws/wspolicy")); UnifiedMetaData umd = new UnifiedMetaData(vfRoot); ServiceMetaData serviceMetaData = new ServiceMetaData(umd, new QName("dummyServiceName")); umd.addService(serviceMetaData); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -54,7 +54,7 @@ public void testPrimitiveTypes() throws Exception { Class seiClass = PrimitiveTypes.class; - String fixturefile = "resources/tools/wsdlfixture/PrimitiveTypesService_RPC_11.wsdl"; + String fixturefile = getResourceFile("tools/wsdlfixture/PrimitiveTypesService_RPC_11.wsdl").getPath(); doWSDLTest(seiClass, fixturefile); } @@ -62,7 +62,7 @@ public void testStandardJavaTypes() throws Exception { Class seiClass = StandardJavaTypes.class; - String fixturefile = "resources/tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl"; + String fixturefile = getResourceFile("tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl").getPath(); doWSDLTest(seiClass, fixturefile); } @@ -70,7 +70,7 @@ public void testCustomTypes() throws Exception { Class seiClass = CustomInterface.class; - String fixturefile = "resources/tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl"; + String fixturefile = getResourceFile("tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl").getPath(); doWSDLTest(seiClass, fixturefile); } @@ -78,7 +78,7 @@ public void testExceptionTypes() throws Exception { Class seiClass = ServiceException.class; - String fixturefile = "resources/tools/wsdlfixture/ServiceExceptionService_RPC_11.wsdl"; + String fixturefile = getResourceFile("tools/wsdlfixture/ServiceExceptionService_RPC_11.wsdl").getPath(); doWSDLTest(seiClass, fixturefile); } @@ -86,7 +86,7 @@ public void testComplexTypes() throws Exception { Class seiClass = ComplexTypes.class; - String fixturefile = "resources/tools/wsdlfixture/ComplexTypesService_RPC_11.wsdl"; + String fixturefile = getResourceFile("tools/wsdlfixture/ComplexTypesService_RPC_11.wsdl").getPath(); doWSDLTest(seiClass, fixturefile); } @@ -94,8 +94,8 @@ public void testArrayTypes() throws Exception { Class seiClass = ArrayInterface.class; - // String fixturefile = "resources/tools/wsdlfixture/ArrayInterfaceService_RPC_11.wsdl"; - String fixturefile = "resources/tools/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl"; + // String fixturefile = getResourceFile("tools/wsdlfixture/ArrayInterfaceService_RPC_11.wsdl").getPath(); + String fixturefile = getResourceFile("tools/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl").getPath(); doWSDLTest(seiClass, fixturefile); } @@ -103,7 +103,7 @@ public void testPrimitiveArrayTypes() throws Exception { Class seiClass = PrimitiveArrayTypes.class; - String fixturefile = "resources/tools/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl"; + String fixturefile = getResourceFile("tools/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl").getPath(); doWSDLTest(seiClass, fixturefile); } @@ -111,7 +111,7 @@ public void testInterfaceInheritence() throws Exception { Class seiClass = InheritenceChildInterface.class; - String fixturefile = "resources/tools/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl"; + String fixturefile = getResourceFile("tools/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl").getPath(); doWSDLTest(seiClass, fixturefile); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -76,7 +76,7 @@ public void testW3CSample() throws Exception { - File wsdlFile = new File("resources/tools/wsdlfixture/W3CExample_DOC_11.wsdl"); + File wsdlFile = getResourceFile("tools/wsdlfixture/W3CExample_DOC_11.wsdl"); assertTrue(wsdlFile.exists()); WSDLDefinitions wsdlDefinitions = getWSDLDefinitions(wsdlFile); } @@ -99,7 +99,7 @@ private WSDLDefinitions getWSDLDefinitions(Class seiClass, String wsdlFileName) throws Exception { - File wsdlFile = new File("resources/tools/wsdlfixture/" + wsdlFileName); + File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + wsdlFileName); assertTrue(wsdlFile.exists()); WSDLDefinitions wsdlDefinitions = getWSDLDefinitions(wsdlFile); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -62,7 +62,7 @@ private void doWSDLTest(String wsdlname) { // System property passed through the ant build script - String wsdldir = System.getProperty("wsdl.dir", "resources/tools"); + String wsdldir = System.getProperty("wsdl.dir", getResourceFile("tools").getPath()); File wsdlFile = new File(wsdldir + "/wsdl20assertions/" + wsdlname); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -67,7 +67,7 @@ public void testSimpleCase() throws Exception { WSDLToJava wsdlJava = new WSDLToJava(); - File wsdlFile = new File("resources/tools/jbws-161/wscompile/simple/wsdl/HelloWsService.wsdl"); + File wsdlFile = getResourceFile("tools/jbws-161/wscompile/simple/wsdl/HelloWsService.wsdl"); wsdlJava.setTypeMapping(new LiteralTypeMapping()); WSDLDefinitions wsdl = wsdlJava.convertWSDL2Java(wsdlFile.toURL()); wsdlJava.generateSEI(wsdl, new File("tools/jbws-160/jbossws/simple/sei")); @@ -93,7 +93,7 @@ //Match the Service File String fname = "HelloWsService.java"; - File file1 = new File("resources/tools/jbws-160/wscompile/simple/service/" + fname); + File file1 = new File(getResourceFile("tools/jbws-160/wscompile/simple/service/").getPath() + fname); File file2 = new File("tools/jbws-160/jbossws/simple/service/org/jboss/types/" + fname); try @@ -107,7 +107,7 @@ //Match the SEI fname = "HelloWs.java"; - file1 = new File("resources/tools/jbws-160/wscompile/simple/sei/" + fname); + file1 = new File(getResourceFile("tools/jbws-160/wscompile/simple/sei/").getPath() + fname); file2 = new File("tools/jbws-160/jbossws/simple/sei/org/jboss/types/" + fname); try @@ -120,7 +120,7 @@ } //Compare mapping files - File expFile = new File("resources/tools/jbws-160/wscompile/simple/mapping/jaxrpc-mapping.xml"); + File expFile = getResourceFile("tools/jbws-160/wscompile/simple/mapping/jaxrpc-mapping.xml"); File genFile = new File("tools/jbws-160/jbossws/simple/mapping/jaxrpc-mapping.xml"); compareXMLFiles(expFile.toURL(), genFile.toURL()); @@ -130,7 +130,7 @@ public void testCustomCase() throws Exception { WSDLToJava wsdlJava = new WSDLToJava(); - File wsdlFile = new File("resources/tools/jbws-161/wscompile/custom/wsdl/HelloCustomService.wsdl"); + File wsdlFile = getResourceFile("tools/jbws-161/wscompile/custom/wsdl/HelloCustomService.wsdl"); wsdlJava.setTypeMapping(new LiteralTypeMapping()); WSDLDefinitions wsdl = wsdlJava.convertWSDL2Java(wsdlFile.toURL()); wsdlJava.setTypeMapping(new LiteralTypeMapping()); @@ -158,7 +158,7 @@ //Match the Service File String fname = "HelloCustomService.java"; - File file1 = new File("resources/tools/jbws-160/wscompile/custom/service/" + fname); + File file1 = new File(getResourceFile("tools/jbws-160/wscompile/custom/service/").getPath() + fname); File file2 = new File("tools/jbws-160/jbossws/custom/service/org/jboss/types/" + fname); try @@ -172,7 +172,7 @@ //Match the SEI fname = "HelloCustomRemote.java"; - file1 = new File("resources/tools/jbws-160/wscompile/custom/sei/" + fname); + file1 = new File(getResourceFile("tools/jbws-160/wscompile/custom/sei/").getPath() + fname); file2 = new File("tools/jbws-160/jbossws/custom/sei/org/jboss/types/" + fname); /*try @@ -185,7 +185,7 @@ }*/ //Compare mapping files - String fix = "resources/tools/jbws-160/wscompile/custom/mapping/jaxrpc-mapping.xml"; + String fix = getResourceFile("tools/jbws-160/wscompile/custom/mapping/jaxrpc-mapping.xml").getPath(); String gen = "tools/jbws-160/jbossws/custom/mapping/jaxrpc-mapping.xml"; JaxrpcMappingValidator mv = new JaxrpcMappingValidator(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -42,7 +42,7 @@ { public void testJavaToWSDL() throws Exception { - String j2wConfigFile = "resources/tools/config/java2wsdl.xml"; + String j2wConfigFile = getResourceFile("tools/config/java2wsdl.xml").getPath(); ToolsSchemaConfigReader configReader = new ToolsSchemaConfigReader(); Configuration config = configReader.readConfig(j2wConfigFile); assertNotNull("config is null?", config); @@ -51,7 +51,7 @@ public void testWSDLToJava() throws Exception { - String w2jConfigFile = "resources/tools/config/wsdl2java.xml"; + String w2jConfigFile = getResourceFile("tools/config/wsdl2java.xml").getPath(); ToolsSchemaConfigReader configReader = new ToolsSchemaConfigReader(); Configuration config = configReader.readConfig(w2jConfigFile); assertNotNull("config is null?", config); @@ -61,7 +61,7 @@ // [JBWS-719] Enable schema validation on wstools config public void testInvalidConfig() throws IOException, ClassNotFoundException { - String[] args = new String[] { "-dest", "tools/globalconfig", "-config", "resources/tools/config/invalidConfig.xml" }; + String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/invalidConfig.xml").getPath() }; WSTools tools = new WSTools(); try { Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -49,7 +49,7 @@ public void testJavaToWSDL() throws IOException { - String[] args = new String[] { "-dest", "tools/globalconfig", "-config", "resources/tools/config/java2wsdlglobal.xml" }; + String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/java2wsdlglobal.xml").getPath() }; WSTools tools = new WSTools(); tools.generate(args); @@ -60,7 +60,7 @@ public void testWSDLToJava() throws IOException, ClassNotFoundException { - String[] args = new String[] { "-dest", "tools/globalconfig", "-config", "resources/tools/config/wsdl2javaglobal.xml" }; + String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/wsdl2javaglobal.xml").getPath() }; WSTools tools = new WSTools(); tools.generate(args); File file = new File("tools/globalconfig/org/jboss/test/ws/StandardJavaTypes.java"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -61,7 +61,7 @@ new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET); fw.close(); - String fixturefile = "resources/tools/doc-lit/trivial/wsdl/SampleService.wsdl"; + String fixturefile = getResourceFile("tools/doc-lit/trivial/wsdl/SampleService.wsdl").getPath(); //Validate the generated WSDL File wsdlfix = new File(fixturefile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -44,18 +44,18 @@ public final void testEnumWsdl() throws Exception { - String config = "resources/tools/enums/wstools-config.xml"; + String config = getResourceFile("tools/enums/wstools-config.xml").getPath(); String[] args= new String[]{"-dest", "tools/enums", "-config", config}; new WSTools().generate(args); Element exp; if (hasJDK15()) { - exp = DOMUtils.parse(new FileInputStream("resources/tools/enums/EnumService15.wsdl")); + exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService15.wsdl").getPath())); } else { - exp = DOMUtils.parse(new FileInputStream("resources/tools/enums/EnumService14.wsdl")); + exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService14.wsdl").getPath())); } Element was = DOMUtils.parse(new FileInputStream("tools/enums/wsdl/EnumService.wsdl")); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -60,7 +60,7 @@ generateSEI(wsdlDefinitions); //Now validate the SEI String fname="HoldersServiceInterface.java"; - File file1 = new File("resources/tools/holders/java/org/jboss/test/" + fname); + File file1 = new File(getResourceFile("tools/holders/java/org/jboss/test/").getPath() + fname); File file2 = new File("tools/org/jboss/test/" + fname); try @@ -93,7 +93,7 @@ //First check if the wsdl files are well formed try { - String fixturefile = "resources/tools/holders/wsdl/HolderService.wsdl"; + String fixturefile = getResourceFile("tools/holders/wsdl/HolderService.wsdl").getPath(); File wsdlfix = new File(fixturefile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); File wsdlFile = new File(wsdlPath); @@ -134,7 +134,7 @@ private WSDLDefinitions getWSDLDefinitions(String wsdlFileName) throws Exception { - File wsdlFile = new File("resources/tools/holders/wsdl/" + wsdlFileName); + File wsdlFile = new File(getResourceFile("tools/holders/wsdl/").getPath() + wsdlFileName); assertTrue("WSDL File exists?",wsdlFile.exists()); WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -38,7 +38,7 @@ public void testAnonymousType() throws Exception { - String resourceDir = "resources/tools/jbws1079"; + String resourceDir = getResourceFile("tools/jbws1079").getPath(); String toolsDir = "tools/jbws1079"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -36,7 +36,7 @@ public final void testNoNamespaceElement() throws Exception { - String resourceDir = "resources/tools/jbws1080"; + String resourceDir = getResourceFile("tools/jbws1080").getPath(); String toolsDir = "tools/jbws1080"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -45,17 +45,17 @@ new File("tools/jbws1090").mkdirs(); // copy webservices.xml fixture to output folder - FileInputStream src = new FileInputStream("resources/tools/metadatafixture/webservices.xml"); + FileInputStream src = new FileInputStream(getResourceFile("tools/metadatafixture/webservices.xml").getPath()); FileOutputStream dest = new FileOutputStream("tools/jbws1090/webservices.xml"); IOUtils.copyStream(dest, src); src.close(); dest.close(); // run wstools - String[] args = { "-dest", "tools/jbws1090", "-config", "resources/tools/jbws1090/wstools-config.xml" }; + String[] args = { "-dest", "tools/jbws1090", "-config", getResourceFile("tools/jbws1090/wstools-config.xml").getPath() }; new WSTools().generate(args); - Element expected = DOMUtils.parse(new FileInputStream("resources/tools/jbws1090/webservices.xml")); + Element expected = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1090/webservices.xml").getPath())); Element was = DOMUtils.parse(new FileInputStream("tools/jbws1090/webservices.xml")); assertEquals(expected, was); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -37,7 +37,7 @@ { public final void testHyphenatedElement() throws Exception { - String resourceDir = "resources/tools/jbws1170"; + String resourceDir = getResourceFile("tools/jbws1170").getPath(); String toolsDir = "tools/jbws1170"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -76,7 +76,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1184/scenario_" + scenario; + String resourceDir = getResourceFile("tools/jbws1184/scenario_").getPath() + scenario; String toolsDir = "tools/jbws1184/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -39,7 +39,7 @@ { public final void testMultiplePackageNameSpace() throws Exception { - String resourceDir = "resources/tools/jbws1217"; + String resourceDir = getResourceFile("tools/jbws1217").getPath(); String toolsDir = "tools/jbws1217"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -35,7 +35,7 @@ public final void testGenerate() throws Exception { - String resourceDir = "resources/tools/jbws1231"; + String resourceDir = getResourceFile("tools/jbws1231").getPath(); String toolsDir = "tools/jbws1231"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -38,7 +38,7 @@ { public final void testPortTypePort() throws Exception { - String resourceDir = "resources/tools/jbws1253"; + String resourceDir = getResourceFile("tools/jbws1253").getPath(); String toolsDir = "tools/jbws1253"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -129,7 +129,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1259/scenario_" + scenario; + String resourceDir = getResourceFile("tools/jbws1259/scenario_").getPath() + scenario; String toolsDir = "tools/jbws1259/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -871,7 +871,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1260/scenario_" + scenario; + String resourceDir = getResourceFile("tools/jbws1260/scenario_").getPath() + scenario; String toolsDir = "tools/jbws1260/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -47,7 +47,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1278/" + scenario; + String resourceDir = getResourceFile("tools/jbws1278/").getPath() + scenario; String toolsDir = "tools/jbws1278/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -37,7 +37,7 @@ public void testGenerate() throws Exception { - String resourceDir = "resources/tools/jbws1428"; + String resourceDir = getResourceFile("tools/jbws1428").getPath(); String toolsDir = "tools/jbws1428"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -35,10 +35,9 @@ */ public class JBWS1441TestCase extends JBossWSTest { + private String resourceDir = getResourceFile("tools/jbws1441").getPath(); + private String toolsDir = "tools/jbws1441"; - private static final String resourceDir = "resources/tools/jbws1441"; - private static final String toolsDir = "tools/jbws1441"; - public void testGenerate() throws Exception { String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; @@ -53,7 +52,7 @@ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); } - private static void compareSource(final String fileName) throws Exception + private void compareSource(final String fileName) throws Exception { File expected = new File(resourceDir + "/" + fileName); File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -122,7 +122,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1450/scenario_" + scenario; + String resourceDir = getResourceFile("tools/jbws1450/scenario_").getPath() + scenario; String toolsDir = "tools/jbws1450/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -47,7 +47,7 @@ */ public void testGenerate() throws Exception { - String resourceDir = "resources/tools/jbws1453"; + String resourceDir = getResourceFile("tools/jbws1453").getPath(); String toolsDir = "tools/jbws1453"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -36,8 +36,8 @@ public class JBWS1455TestCase extends JBossWSTest { - private static final String resourceDir = "resources/tools/jbws1455"; - private static final String toolsDir = "tools/jbws1455"; + private String resourceDir = getResourceFile("tools/jbws1455").getPath(); + private String toolsDir = "tools/jbws1455"; public void testGenerate() throws Exception { @@ -51,7 +51,7 @@ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); } - private static void compareSource(final String fileName) throws Exception + private void compareSource(final String fileName) throws Exception { File expected = new File(resourceDir + "/" + fileName); File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1455/" + fileName); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -61,7 +61,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1534/" + scenario; + String resourceDir = getResourceFile("tools/jbws1534/").getPath() + scenario; String toolsDir = "tools/jbws1534/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -41,13 +41,13 @@ public final void testGenerate() throws Exception { - String resourceDir = "resources/tools/jbws1536"; + String resourceDir = getResourceFile("tools/jbws1536").getPath(); String toolsDir = "tools/jbws1536"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); - Element expected = DOMUtils.parse(new FileInputStream("resources/tools/jbws1536/webservices.xml")); + Element expected = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1536/webservices.xml").getPath())); Element was = DOMUtils.parse(new FileInputStream("tools/jbws1536/webservices.xml")); assertEquals(expected, was); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -35,7 +35,7 @@ public final void testGenerate() throws Exception { - String resourceDir = "resources/tools/jbws1538"; + String resourceDir = getResourceFile("tools/jbws1538").getPath(); String toolsDir = "tools/jbws1538"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -23,17 +23,15 @@ // $Id$ -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; -import junit.framework.TestCase; - import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; /** * [JBWS-1553] fails to read operations for portType from different namespace @@ -42,13 +40,13 @@ * * @author <a href="mailto:alex.guizar@jboss.com">Alejandro Guizar</a> */ -public class JBWS1553TestCase extends TestCase +public class JBWS1553TestCase extends JBossWSTest { private WSDLDefinitions definitions; protected void setUp() throws Exception { - URL wsdlLocation = new File("resources/tools/jbws1553/atm-service.wsdl").toURL(); + URL wsdlLocation = getResourceURL("tools/jbws1553/atm-service.wsdl"); definitions = WSDLDefinitionsFactory.newInstance().parse(wsdlLocation); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -79,7 +79,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1597/" + scenario; + String resourceDir = getResourceFile("tools/jbws1597/").getPath() + scenario; String toolsDir = "tools/jbws1597/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -49,7 +49,7 @@ */ public void testGenerate() throws Exception { - String resourceDir = "resources/tools/jbws1607"; + String resourceDir = getResourceFile("tools/jbws1607").getPath(); String toolsDir = "tools/jbws1607"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ */ public void testGenerate() throws Exception { - String resourceDir = "resources/tools/jbws1627"; + String resourceDir = getResourceFile("tools/jbws1627").getPath(); String toolsDir = "tools/jbws1627"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -78,7 +78,7 @@ public void testWSDLGeneratorWithPolicies() throws Exception { Class seiClass = StandardJavaTypes.class; - String fixturefile = "resources/tools/jbws1645/StandardJavaTypesServiceJBWS1645.wsdl"; + String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645.wsdl").getPath(); File wsdlDir = new File("./tools/jbws1645"); wsdlDir.mkdirs(); @@ -101,9 +101,9 @@ //manually add policies to the umd ServiceMetaData serviceMetaData = umd.getServices().get(0); EndpointMetaData epMetaData = serviceMetaData.getEndpoints().get(0); - addPolicy(new File("resources/tools/jbws1645/PortPolicy.txt"), PolicyScopeLevel.WSDL_PORT, epMetaData); - addPolicy(new File("resources/tools/jbws1645/PortTypePolicy.txt"), PolicyScopeLevel.WSDL_PORT_TYPE, epMetaData); - addPolicy(new File("resources/tools/jbws1645/BindingPolicy.txt"), PolicyScopeLevel.WSDL_BINDING, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/PortPolicy.txt"), PolicyScopeLevel.WSDL_PORT, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/PortTypePolicy.txt"), PolicyScopeLevel.WSDL_PORT_TYPE, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/BindingPolicy.txt"), PolicyScopeLevel.WSDL_BINDING, epMetaData); //generate the wsdl definitions and write the wsdl file WSDLDefinitions wsdl = jwsdl.generate(seiClass); @@ -129,7 +129,7 @@ public void testWSDLGeneratorWithMultiplePolicies() throws Exception { Class seiClass = StandardJavaTypes.class; - String fixturefile = "resources/tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl"; + String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl").getPath(); File wsdlDir = new File("./tools/jbws1645"); wsdlDir.mkdirs(); @@ -152,12 +152,12 @@ //manually add policies to the umd ServiceMetaData serviceMetaData = umd.getServices().get(0); EndpointMetaData epMetaData = serviceMetaData.getEndpoints().get(0); - addPolicy(new File("resources/tools/jbws1645/PortPolicy.txt"), PolicyScopeLevel.WSDL_PORT, epMetaData); - addPolicy(new File("resources/tools/jbws1645/PortPolicy2.txt"), PolicyScopeLevel.WSDL_PORT, epMetaData); - addPolicy(new File("resources/tools/jbws1645/PortTypePolicy2.txt"), PolicyScopeLevel.WSDL_PORT_TYPE, epMetaData); - addPolicy(new File("resources/tools/jbws1645/PortTypePolicy.txt"), PolicyScopeLevel.WSDL_PORT_TYPE, epMetaData); - addPolicy(new File("resources/tools/jbws1645/BindingPolicy.txt"), PolicyScopeLevel.WSDL_BINDING, epMetaData); - addPolicy(new File("resources/tools/jbws1645/BindingPolicy2.txt"), PolicyScopeLevel.WSDL_BINDING, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/PortPolicy.txt"), PolicyScopeLevel.WSDL_PORT, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/PortPolicy2.txt"), PolicyScopeLevel.WSDL_PORT, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/PortTypePolicy2.txt"), PolicyScopeLevel.WSDL_PORT_TYPE, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/PortTypePolicy.txt"), PolicyScopeLevel.WSDL_PORT_TYPE, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/BindingPolicy.txt"), PolicyScopeLevel.WSDL_BINDING, epMetaData); + addPolicy(getResourceFile("tools/jbws1645/BindingPolicy2.txt"), PolicyScopeLevel.WSDL_BINDING, epMetaData); //generate the wsdl definitions and write the wsdl file WSDLDefinitions wsdl = jwsdl.generate(seiClass); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1691/" + scenario; + String resourceDir = getResourceFile("tools/jbws1691/").getPath() + scenario; String toolsDir = "tools/jbws1691/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -64,7 +64,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1697/" + scenario; + String resourceDir = getResourceFile("tools/jbws1697/").getPath() + scenario; String toolsDir = "tools/jbws1697/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -59,7 +59,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1698/" + scenario; + String resourceDir = getResourceFile("tools/jbws1698/").getPath() + scenario; String toolsDir = "tools/jbws1698/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -51,7 +51,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1723/" + scenario; + String resourceDir = getResourceFile("tools/jbws1723/").getPath() + scenario; String toolsDir = "tools/jbws1723/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -41,7 +41,7 @@ public void testExtensionType() throws Exception { - String resourceDir = "resources/tools/jbws1725"; + String resourceDir = getResourceFile("tools/jbws1725").getPath(); String toolsDir = "tools/jbws1725"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -51,7 +51,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1801/" + scenario; + String resourceDir = getResourceFile("tools/jbws1801/").getPath() + scenario; String toolsDir = "tools/jbws1801/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -47,7 +47,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1873/" + scenario; + String resourceDir = getResourceFile("tools/jbws1873/").getPath() + scenario; String toolsDir = "tools/jbws1873/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -47,7 +47,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws1881/" + scenario; + String resourceDir = getResourceFile("tools/jbws1881/").getPath() + scenario; String toolsDir = "tools/jbws1881/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -39,7 +39,7 @@ { public final void testMultiplePackageNameSpace() throws Exception { - String resourceDir = "resources/tools/jbws2018"; + String resourceDir = getResourceFile("tools/jbws2018").getPath(); String toolsDir = "tools/jbws2018"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -47,7 +47,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws2019/" + scenario; + String resourceDir = getResourceFile("tools/jbws2019/").getPath() + scenario; String toolsDir = "tools/jbws2019/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -75,7 +75,7 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = "resources/tools/jbws429/" + scenario; + String resourceDir = getResourceFile("tools/jbws429/").getPath() + scenario; String toolsDir = "tools/jbws429/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -35,10 +35,9 @@ */ public class JBWS810TestCase extends JBossWSTest { + private String resourceDir = getResourceFile("tools/jbws810").getPath(); + private String toolsDir = "tools/jbws810"; - private static final String resourceDir = "resources/tools/jbws810"; - private static final String toolsDir = "tools/jbws810"; - public void testDocument() throws Exception { runTest("document"); @@ -63,7 +62,7 @@ mappingValidator.validate(testResourceDir + "/jaxrpc-mapping.xml", testToolsDir + "/jaxrpc-mapping.xml"); } - private static void compareSource(final String type, final String fileName) throws Exception + private void compareSource(final String type, final String fileName) throws Exception { File expected = new File(resourceDir + "/" + type + "/" + fileName); File generated = new File(toolsDir + "/" + type + "/org/jboss/test/ws/jbws810/" + fileName); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -44,11 +44,11 @@ public final void testEnumWsdl() throws Exception { - String config = "resources/tools/jbws818/wstools-config.xml"; + String config = getResourceFile("tools/jbws818/wstools-config.xml").getPath(); String[] args= new String[]{"-dest", "tools/jbws818", "-config", config}; new WSTools().generate(args); - Element exp = DOMUtils.parse(new FileInputStream("resources/tools/jbws818/CrossPackageInheritenceService.wsdl")); + Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws818/CrossPackageInheritenceService.wsdl").getPath())); Element was = DOMUtils.parse(new FileInputStream("tools/jbws818/wsdl/CrossPackageInheritenceService.wsdl")); assertEquals(exp, was); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ QName q = new QName(targetNS,"Items", Constants.PREFIX_TNS); jxsd.getSchemaCreator().addPackageNamespaceMapping(Items.class.getPackage().getName(), targetNS); String xs = jxsd.generateForSingleType(q,Items.class).serialize(); - File xsdFile = new File("resources/tools/jbws-204/wscompile/anontypes_new.xsd"); + File xsdFile = getResourceFile("tools/jbws-204/wscompile/anontypes_new.xsd"); checkXMLFiles(xsdFile.toURL(),xs); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -58,7 +58,7 @@ xsmodel.addXSTypeDefinition(xst); StringWriter sw = new StringWriter(); sutils.serialize(xsmodel,sw); - File xsdFile = new File("resources/tools/jbws-204/wscompile/nillable.xsd"); + File xsdFile = getResourceFile("tools/jbws-204/wscompile/nillable.xsd"); checkXMLFiles(xsdFile.toURL(),sw.toString()); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -59,7 +59,7 @@ public void checkServiceEndpointInterface() throws Exception { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - String fixBase = "resources/tools/jbws-206/wscompileArtifacts/" + getBase(); + String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/").getPath() + getBase(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); String seiName = getSEIName() + ".java"; @@ -72,7 +72,7 @@ public void checkServiceInterface() throws Exception { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - String fixBase = "resources/tools/jbws-206/wscompileArtifacts/" + getBase(); + String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/").getPath() + getBase(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); String serviceName = getServiceName(); @@ -85,7 +85,7 @@ public final void checkUserType(String name) throws Exception { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - String fixBase = "resources/tools/jbws-206/wscompileArtifacts/" + getBase(); + String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/").getPath() + getBase(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); // Check User Types @@ -96,7 +96,7 @@ protected final void generate() throws Exception { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - String configloc = "resources/tools/jbws-206/jbosswsConfig/" + getBase() + "/" + getBase() + "wsdl2java.xml"; + String configloc = getResourceFile("tools/jbws-206/jbosswsConfig/" + getBase() + "/" + getBase() + "wsdl2java.xml").getPath(); String[] args = new String[] { "-dest", out_dir, "-config", configloc }; WSTools tools = new WSTools(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -57,9 +57,9 @@ return; } String out_dir = "tools/jbws-211/jbossws/" + getBase(); - String wsdlFix = "resources/tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName(); + String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/").getPath() + getWSDLName(); String configStr = getBase().replaceAll("/", ""); - String configloc = "resources/tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml"; + String configloc = getResourceFile("tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml").getPath(); String[] args = new String[] { "-dest", out_dir, "-config", configloc }; WSTools tools = new WSTools(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -50,7 +50,7 @@ public void testJavaWsdlMappingMetaDataRead() throws Exception { - URL jwmURL = new File("resources/tools/jbws-161/wscompile/simple/mapping/jaxrpc-mapping.xml").toURL(); + URL jwmURL = getResourceURL("tools/jbws-161/wscompile/simple/mapping/jaxrpc-mapping.xml"); JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); JavaWsdlMapping javaWsdlMapping = mappingFactory.parse(jwmURL); @@ -59,7 +59,7 @@ public void testJavaWsdlMappingMetaDataWrite() throws Exception { - URL jwmURL = new File("resources/tools/jbws-161/wscompile/simple/mapping/jaxrpc-mapping.xml").toURL(); + URL jwmURL = getResourceURL("tools/jbws-161/wscompile/simple/mapping/jaxrpc-mapping.xml"); JavaWsdlMapping javaWsdlMapping = constructMappingMetaData(); assertNotNull("MappingMetaData is null?",javaWsdlMapping); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ { public void testWebServicesMetaDataRead() throws Exception { - URL webservicesURL = new File("resources/tools/metadatafixture/webservices.xml").toURL(); + URL webservicesURL = getResourceURL("tools/metadatafixture/webservices.xml"); // Unmarshall webservices.xml WebservicesMetaData webservices = null; InputStream is = webservicesURL.openStream(); @@ -67,7 +67,7 @@ public void testWebServicesMetaDataWrite() throws Exception { - URL webservicesURL = new File("resources/tools/metadatafixture/webservices.xml").toURL(); + URL webservicesURL = getResourceURL("tools/metadatafixture/webservices.xml"); // Unmarshall webservices.xml WebservicesMetaData webservices = constructWSMetaData(); assertNotNull("WebServicesMetaData is null?",webservices); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -21,20 +21,20 @@ */ package org.jboss.test.ws.tools.scripts; -import junit.framework.TestCase; - import java.io.File; import java.io.IOException; +import org.jboss.wsf.test.JBossWSTest; + /** * JBWS-1793: Provide a test case for the tools scripts that reside under JBOSS_HOME/bin * * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ -public class ScriptTestCase extends TestCase +public class ScriptTestCase extends JBossWSTest { - private String TOOLS_CONFIG = "resources/tools/scripts/wstools-config.xml"; + private String TOOLS_CONFIG = getResourceFile("tools/scripts/wstools-config.xml").getPath(); private String JBOSS_HOME; private String JDK_HOME; @@ -46,23 +46,23 @@ super.setUp(); JBOSS_HOME = System.getProperty("jboss.home"); - TEST_EXEC_DIR = System.getProperty("test.execution.dir"); + TEST_EXEC_DIR = new File(".").getPath(); JDK_HOME = System.getProperty("jdk.home"); OS = System.getProperty("os.name").toLowerCase(); } public void testWSToolsFromCommandLine() throws Exception { - if(isWindowsOS()) + if (isWindowsOS()) { fail("This test has not been verified on windows"); } // use absolute path for the output to be re-usable - String absToolsConfig= new File(TOOLS_CONFIG).getAbsolutePath(); + String absToolsConfig = new File(TOOLS_CONFIG).getAbsolutePath(); String absOutput = new File("wstools/java").getAbsolutePath(); - String command = JBOSS_HOME + "/bin/wstools.sh -config "+ TOOLS_CONFIG + " -dest wstools/java"; + String command = JBOSS_HOME + "/bin/wstools.sh -config " + TOOLS_CONFIG + " -dest wstools/java"; Process p = executeCommand(command); // check status code @@ -73,30 +73,25 @@ assertTrue("Service endpoint interface not generated", javaSource.exists()); } - private Process executeCommand(String command) - throws IOException + private Process executeCommand(String command) throws IOException { // be verbose System.out.println("cmd: " + command); System.out.println("test execution dir: " + TEST_EXEC_DIR); - Process p = Runtime.getRuntime().exec( - command, - new String[] {"JBOSS_HOME="+ JBOSS_HOME, "JAVA_HOME="+ JDK_HOME} - ); + Process p = Runtime.getRuntime().exec(command, new String[] { "JBOSS_HOME=" + JBOSS_HOME, "JAVA_HOME=" + JDK_HOME }); return p; } - private void assertStatusCode(Process p, String s) - throws InterruptedException + private void assertStatusCode(Process p, String s) throws InterruptedException { // check status code int status = p.waitFor(); - assertTrue(s +" did exit with status " + status, status==0); + assertTrue(s + " did exit with status " + status, status == 0); } - + private boolean isWindowsOS() { - return ( (OS.indexOf("nt") > -1) || (OS.indexOf("windows") > -1 )); + return ((OS.indexOf("nt") > -1) || (OS.indexOf("windows") > -1)); } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -44,8 +44,8 @@ public void testExactSourceFiles() throws Exception { String fname="PrimitiveTypes.java"; - File file1 = new File("resources/tools/sourcecomp/expected/" + fname); - File file2 = new File("resources/tools/sourcecomp/actual/" + fname); + File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname); + File file2 = new File(getResourceFile("tools/sourcecomp/actual/").getPath() + fname); sc= new JBossSourceComparator(file1,file2); assertTrue("Source Files Match:",sc.validate()); sc.validateImports(); @@ -57,8 +57,8 @@ public void testMissingMethod() { String fname="PrimitiveTypes.java"; - File file1 = new File("resources/tools/sourcecomp/expected/" + fname); - File file2 = new File("resources/tools/sourcecomp/missingmethod/" + fname); + File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname); + File file2 = new File(getResourceFile("tools/sourcecomp/missingmethod/").getPath() + fname); try { sc= new JBossSourceComparator(file1,file2); @@ -83,8 +83,8 @@ public void testMissingParam() { String fname="PrimitiveTypes.java"; - File file1 = new File("resources/tools/sourcecomp/expected/" + fname); - File file2 = new File("resources/tools/sourcecomp/missingparam/" + fname); + File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname); + File file2 = new File(getResourceFile("tools/sourcecomp/missingparam/").getPath() + fname); try { sc= new JBossSourceComparator(file1,file2); @@ -109,8 +109,8 @@ public void testMissingImports() { String fname="PrimitiveTypes.java"; - File file1 = new File("resources/tools/sourcecomp/expected/" + fname); - File file2 = new File("resources/tools/sourcecomp/missingimport/" + fname); + File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname); + File file2 = new File(getResourceFile("tools/sourcecomp/missingimport/").getPath() + fname); try { sc= new JBossSourceComparator(file1,file2); @@ -135,8 +135,8 @@ public void testDifferentMethodOrder() { String fname="PrimitiveTypes.java"; - File file1 = new File("resources/tools/sourcecomp/expected/" + fname); - File file2 = new File("resources/tools/sourcecomp/diffmethodorder/" + fname); + File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname); + File file2 = new File(getResourceFile("tools/sourcecomp/diffmethodorder/").getPath() + fname); try { sc= new JBossSourceComparator(file1,file2); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/validation/WSDL11ValidationTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/validation/WSDL11ValidationTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/validation/WSDL11ValidationTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -23,18 +23,17 @@ import java.io.File; -import junit.framework.TestCase; - import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.exceptions.JBossWSToolsException; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; /** * Testcase to test the WSDL Validator * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Aug 1, 2005 */ -public class WSDL11ValidationTestCase extends TestCase +public class WSDL11ValidationTestCase extends JBossWSTest { /** * Test equality of the same wsdl through the wsdlvalidator @@ -42,58 +41,60 @@ */ public void testSimpleCase() throws Exception { - //File wsdlFile = new File("resources/wsdl11/DocLitSimple.wsdl"); - File wsdlFile = new File("resources/tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl"); + //File wsdlFile = getResourceFile("wsdl11/DocLitSimple.wsdl"); + File wsdlFile = getResourceFile("tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl"); assertTrue(wsdlFile.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); WSDLDefinitions wsdlExp = factory.parse(wsdlFile.toURL()); - + WSDLDefinitions wsdlActual = factory.parse(wsdlFile.toURL()); WSDLValidator validator = new WSDL11Validator(); try { - boolean bool = validator.validate(wsdlExp,wsdlActual); - if(bool == false) - fail("WSDL do not match"); - }catch(JBossWSToolsException e) + boolean bool = validator.validate(wsdlExp, wsdlActual); + if (bool == false) + fail("WSDL do not match"); + } + catch (JBossWSToolsException e) { fail(e.getLocalizedMessage()); } - catch(Exception e) + catch (Exception e) { e.printStackTrace(); - fail("Unknown exception:"+e.getLocalizedMessage()); + fail("Unknown exception:" + e.getLocalizedMessage()); } } - + /** * Test equality of the same wsdl through the wsdlvalidator * @throws Exception */ public void testDocLitCase() throws Exception { - File wsdlFile = new File("resources/common/wsdl11/DocLitSimple.wsdl"); + File wsdlFile = getResourceFile("common/wsdl11/DocLitSimple.wsdl"); assertTrue(wsdlFile.exists()); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); WSDLDefinitions wsdlExp = factory.parse(wsdlFile.toURL()); - + WSDLDefinitions wsdlActual = factory.parse(wsdlFile.toURL()); WSDLValidator validator = new WSDL11Validator(); try { - boolean bool = validator.validate(wsdlExp,wsdlActual); - if(bool == false) - fail("WSDL do not match"); - }catch(JBossWSToolsException e) + boolean bool = validator.validate(wsdlExp, wsdlActual); + if (bool == false) + fail("WSDL do not match"); + } + catch (JBossWSToolsException e) { fail(e.getLocalizedMessage()); } - catch(Exception e) + catch (Exception e) { e.printStackTrace(); - fail("Unknown exception:"+e.getLocalizedMessage()); + fail("Unknown exception:" + e.getLocalizedMessage()); } } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -45,7 +45,7 @@ public void testXMLTypeReturned() { String filename = "StandardJavaTypesService_DOC_11.wsdl"; - File wsdlFile = new File("resources/tools/wsdlfixture/" + filename); + File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename); WSDLTypes types = null; try { @@ -69,7 +69,7 @@ public void testXMLSchemaReturned() { String filename = "StandardJavaTypesService_DOC_11.wsdl"; - File wsdlFile = new File("resources/tools/wsdlfixture/" + filename); + File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename); WSDLTypes types = null; try { Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -46,7 +46,7 @@ public void testXMLTypeReturned() throws MalformedURLException { String filename = "CustomInterface20.xsd"; - File xsdFile = new File("resources/tools/wsdlfixture/" + filename); + File xsdFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename); XSModel xsmodel = parseSchema(xsdFile.toURL()); assertNotNull("XSModel is null?", xsmodel); XSNamedMap xsmap = xsmodel.getComponentsByNamespace(XSConstants.ELEMENT_DECLARATION, "http://org.jboss.ws/types"); @@ -60,7 +60,7 @@ public void testXSDInclude() throws MalformedURLException { String filename = "SchemaMain.xsd"; - File xsdFile = new File("resources/tools/xsd/schemainclude/" + filename); + File xsdFile = new File(getResourceFile("tools/xsd/schemainclude/").getPath() + filename); assertTrue("Does Schema file exist?", xsdFile.exists()); XSModel xsmodel = parseSchema(xsdFile.toURL()); assertNotNull("XSModel is null?", xsmodel); @@ -76,7 +76,7 @@ public void testBadXSDInclude() { String filename = "SchemaBadMain.xsd"; - File xsdFile = new File("resources/tools/xsd/schemainclude/" + filename); + File xsdFile = new File(getResourceFile("tools/xsd/schemainclude/").getPath() + filename); try { XSModel xsmodel = parseSchema(xsdFile.toURL()); @@ -96,11 +96,11 @@ public void testXSDImport() throws MalformedURLException { String filename = "SchemaMain.xsd"; - File xsdFile = new File("resources/tools/xsd/schemaimport/" + filename); + File xsdFile = new File(getResourceFile("tools/xsd/schemaimport/").getPath() + filename); //Create an Hashmap of <namespace,URL> Map schemaMap = new HashMap(); schemaMap.put("http://org.jboss.ws/types", xsdFile.toURL()); - schemaMap.put("http://org.jboss.ws/types2", new File("resources/tools/xsd/schemaimport/SchemaImport.xsd").toURL()); + schemaMap.put("http://org.jboss.ws/types2", getResourceURL("/tools/xsd/schemaimport/SchemaImport.xsd")); XSModel xsmodel = parseSchema(schemaMap); assertNotNull("XSModel is null?", xsmodel); XSNamedMap xsmap = xsmodel.getComponentsByNamespace(XSConstants.TYPE_DEFINITION, "http://org.jboss.ws/types2"); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -90,7 +90,7 @@ { String typeNS = "http://org.jboss.ws/types"; XSLoader xsloader = SchemaUtils.getInstance().getXSLoader(); - XSModel xsmodel = xsloader.loadURI("resources/tools/wsdlfixture/CustomInterface20.xsd"); + XSModel xsmodel = xsloader.loadURI(getResourceFile("tools/wsdlfixture/CustomInterface20.xsd").getPath()); assertNotNull("XSModel is null?", xsmodel); XSNamedMap xsnamedmap = getXSNamedMap(xsmodel, typeNS); @@ -111,8 +111,8 @@ String arrTypeNS = "http://org.jboss/types/arrays/org/jboss/test/ws/tools/jbws_161/custom"; Map map = new HashMap(); - map.put(typeNS,new File("resources/tools/wsdlfixture/customtype/CustomTypeObj.xsd").toURL()); - map.put(arrTypeNS,new File("resources/tools/wsdlfixture/customtype/CustomTypeArrays.xsd").toURL()); + map.put(typeNS,getResourceURL("/tools/wsdlfixture/customtype/CustomTypeObj.xsd")); + map.put(arrTypeNS,getResourceURL("/tools/wsdlfixture/customtype/CustomTypeArrays.xsd")); XSModel xsmodel = new JavaToXSD().parseSchema(map); assertNotNull("XSModel is null?", xsmodel); @@ -137,7 +137,7 @@ assertEquals("HelloObj", name); //Test the case when the schema files are parsed one by one - XSModel newxsmodel = utils.parseSchema("resources/tools/wsdlfixture/customtype/CustomTypeObj.xsd"); + XSModel newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getPath()); assertNotNull("XSModel is null?", newxsmodel); xsnamedmap = getXSNamedMap(newxsmodel, typeNS); assertNotNull("XSNamedMap is null?", xsnamedmap); @@ -146,7 +146,7 @@ assertEquals("HelloObj", xobj.getName()); assertTrue("HelloObj is a complex type?",xobj instanceof XSComplexTypeDefinition); - newxsmodel = utils.parseSchema("resources/tools/wsdlfixture/customtype/CustomTypeArrays.xsd"); + newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getPath()); assertNotNull("XSModel is null?", newxsmodel); xsnamedmap = getXSNamedMap(newxsmodel, arrTypeNS); assertNotNull("XSNamedMap is null?", xsnamedmap); @@ -173,12 +173,12 @@ SchemaUtils utils = SchemaUtils.getInstance(); String typeNS = "http://org.jboss/types"; String arrTypeNS = "http://org.jboss/types/arrays/org/jboss/test/ws/tools/jbws_161/custom"; - String arr[] = {"resources/tools/wsdlfixture/customtype/CustomTypeObj.xsd", - "resources/tools/wsdlfixture/customtype/CustomTypeArrays.xsd"}; + String arr[] = {getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getPath(), + getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getPath()}; XSLoader xsloader = utils.getXSLoader(); Map map = new HashMap(); - map.put(typeNS,new File("resources/tools/wsdlfixture/customtype/CustomTypeObj.xsd").toURL()); - map.put(arrTypeNS,new File("resources/tools/wsdlfixture/customtype/CustomTypeArrays.xsd").toURL()); + map.put(typeNS,getResourceURL("/tools/wsdlfixture/customtype/CustomTypeObj.xsd")); + map.put(arrTypeNS,getResourceURL("/tools/wsdlfixture/customtype/CustomTypeArrays.xsd")); ((XMLSchemaLoader)xsloader).setEntityResolver(new JBossXSEntityResolver(new JBossWSEntityResolver(), map)); //Construct a StringList Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -49,7 +49,7 @@ { String filename = "AnonTypes.xsd"; String packagename = "org.jboss.ws.types"; - String schemaFile = "resources/tools/xsd/anontypes/" + filename; + String schemaFile = getResourceFile("tools/xsd/anontypes/").getPath() + filename; String genPath = "tools/xsd-java-checker/jbossws/anontypes/"; this.mkdirs(genPath); @@ -59,7 +59,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "Items.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/anontypes/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ { String filename = "ComplexType_ElementsOnly.xsd"; String packagename = "org.jboss.ws.types"; - String schemaFile = "resources/tools/xsd/complextypes/ComplexType_ElementsOnly.xsd"; + String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsOnly.xsd").getPath(); this.mkdirs(genPath); File dir = new File(genPath); @@ -56,7 +56,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "USAddress.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/complextypes/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); @@ -65,7 +65,7 @@ //Compare the generated Java type against the one generated by wscompile fname = "Country.java"; - base = "resources/tools/xsd-java-checker"; + base = getResourceFile("tools/xsd-java-checker").getPath(); file2 = new File(genPath + "/org/jboss/ws/types/" + fname); file1 = new File(base + "/wscompile/complextypes/" + fname); sc = new JBossSourceComparator(file1, file2); @@ -82,7 +82,7 @@ { String filename = "ComplexType_ElementsAttrib.xsd"; String packagename = "org.jboss.ws.types"; - String schemaFile = "resources/tools/xsd/complextypes/ComplexType_ElementsAttrib.xsd"; + String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsAttrib.xsd").getPath(); this.mkdirs(genPath); File dir = new File(genPath); @@ -90,7 +90,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "Address.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/complextypes/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); @@ -105,7 +105,7 @@ */ public void testXSComplexType_FromSimpleType() throws Exception { - String filename = "resources/tools/xsd/complextypes/ComplexTypeFromSimpleType.xsd"; + String filename = getResourceFile("tools/xsd/complextypes/ComplexTypeFromSimpleType.xsd").getPath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -114,7 +114,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "GlobalPrice.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/complextypes/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); @@ -129,7 +129,7 @@ */ public void testXSComplexType_EmptyContent() throws Exception { - String filename = "resources/tools/xsd/complextypes/CT_EmptyContent.xsd"; + String filename = getResourceFile("tools/xsd/complextypes/CT_EmptyContent.xsd").getPath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -138,7 +138,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "Price.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/complextypes/emptycontent/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); @@ -152,7 +152,7 @@ */ public void testXSComplexTypeOccurrence() throws Exception { - String filename = "resources/tools/xsd/complextypes/ComplexTypesOccurence.xsd"; + String filename = getResourceFile("tools/xsd/complextypes/ComplexTypesOccurence.xsd").getPath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -161,7 +161,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "President.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/occurrence/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/complextypes/occurrence/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); @@ -176,7 +176,7 @@ */ public void testXSComplexType_Inheritance() throws Exception { - String filename = "resources/tools/xsd/complextypes/CT_ExtensionRestriction.xsd"; + String filename = getResourceFile("tools/xsd/complextypes/CT_ExtensionRestriction.xsd").getPath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -185,7 +185,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "AwardEmployee.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/complextypes/inheritance/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); @@ -211,7 +211,7 @@ /** * wscompile does not support element groups */ - String filename = "resources/tools/xsd/complextypes/CT_SequenceGroups.xsd"; + String filename = getResourceFile("tools/xsd/complextypes/CT_SequenceGroups.xsd").getPath(); //This testcase will pass because wscompile does not support xsd:group String packagename = "org.jboss.ws.types"; @@ -221,7 +221,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "Teacher.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/groups" + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/complextypes/groups/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -51,7 +51,7 @@ * wscompile has a bug. It does not generate accessors for 'byte' * and getBoolean */ - String filename = "resources/tools/xsd/nillabletypes/Nillable.xsd"; + String filename = getResourceFile("tools/xsd/nillabletypes/Nillable.xsd").getPath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); File dir = new File(genPath); @@ -60,7 +60,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "NillableType.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/nillabletypes/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ public void testXSElemAttribReferences() throws Exception { - String filename = "resources/tools/xsd/references/ElemAttribReferences.xsd"; + String filename = getResourceFile("tools/xsd/references/ElemAttribReferences.xsd").getPath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -58,7 +58,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "ElemAttribRef.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/references/" + fname); JBossSourceComparator sc = new JBossSourceComparator(file1, file2); @@ -67,7 +67,7 @@ //Compare the generated Java type against the one generated by wscompile fname = "Address.java"; - base = "resources/tools/xsd-java-checker"; + base = getResourceFile("tools/xsd-java-checker").getPath(); file2 = new File( genPath + "/org/jboss/ws/types/" + fname); file1 = new File(base + "/wscompile/references/" + fname); sc = new JBossSourceComparator(file1, file2); @@ -76,7 +76,7 @@ //Compare the generated Java type against the one generated by wscompile fname = "Employee.java"; - base = "resources/tools/xsd-java-checker"; + base = getResourceFile("tools/xsd-java-checker").getPath(); file2 = new File(genPath + "/org/jboss/ws/types/" + fname); file1 = new File(base + "/wscompile/references/" + fname); sc = new JBossSourceComparator(file1, file2); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -46,7 +46,7 @@ public void testXSDAnnotations() throws MalformedURLException { String filename = "xsdAnnotation.xsd"; - File xsdFile = new File("resources/tools/xsd/annotations/" + filename); + File xsdFile = new File(getResourceFile("tools/xsd/annotations/").getPath() + filename); XSModel xsmodel = parseSchema(xsdFile.toURL()); assertNotNull("XSModel is null?", xsmodel); XSObjectList xsobjlist = xsmodel.getAnnotations(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-04-22 03:57:32 UTC (rev 6602) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-04-22 04:51:23 UTC (rev 6603) @@ -48,7 +48,7 @@ */ public void testXSSimpleTypes() throws Exception { - String filename = "resources/tools/xsd/simpletypes/SimpleType.xsd"; + String filename = getResourceFile("tools/xsd/simpletypes/SimpleType.xsd").getPath(); String packagename = "org.jboss.ws.types"; mkdirs(genPath); @@ -58,7 +58,7 @@ //Compare the generated Java type against the one generated by wscompile String fname = "TypicalPerson.java"; - String base = "resources/tools/xsd-java-checker"; + String base = getResourceFile("tools/xsd-java-checker").getPath(); File file2 = new File(genPath + "/org/jboss/ws/types/" + fname); File file1 = new File(base + "/wscompile/simpletypes/" + fname); @@ -70,7 +70,7 @@ //Compare the generated Java type against the one generated by wscompile fname = "USMidwest.java"; - base = "resources/tools/xsd-java-checker"; + base = getResourceFile("tools/xsd-java-checker").getPath(); file2 = new File(genPath + "/org/jboss/ws/types/" + fname); file1 = new File(base + "/wscompile/simpletypes/" + fname); sc = new JBossSourceComparator(file1, file2);