JBossWS SVN: r6951 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 16:08:21 -0400 (Wed, 07 May 2008)
New Revision: 6951
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
Log:
Fix jbws1259 tests
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-05-07 20:08:21 UTC (rev 6951)
@@ -129,13 +129,14 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = createResourceFile("tools/jbws1259/scenario_" + scenario).getAbsolutePath();
- String toolsDir = resourceDir; //"tools/jbws1259/scenario_" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ File resourceDir= createResourceFile("tools/jbws1259/scenario_" + scenario);
+ resourceDir.mkdirs();
+
+ String toolsDir = resourceDir.getAbsolutePath();
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = createResourceFile(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ String[] expectedFiles = resourceDir.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
return name.endsWith(".java");
@@ -156,7 +157,7 @@
}
}
- File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1259");
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1259");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
16 years, 7 months
- 1
- 0
JBossWS SVN: r6950 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools: assertions and 42 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 16:04:18 -0400 (Wed, 07 May 2008)
New Revision: 6950
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
Log:
Moving on with tools tests fixes
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -55,7 +55,7 @@
public void testPrimitiveTypes() throws Exception
{
Class seiClass = PrimitiveTypes.class;
- String fixturefile = getResourceFile("tools/wsdlfixture/PrimitiveTypesService_RPC_11.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/wsdlfixture/PrimitiveTypesService_RPC_11.wsdl").getAbsolutePath();
doWSDLTest(seiClass, fixturefile);
}
@@ -63,7 +63,7 @@
public void testStandardJavaTypes() throws Exception
{
Class seiClass = StandardJavaTypes.class;
- String fixturefile = getResourceFile("tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl").getAbsolutePath();
doWSDLTest(seiClass, fixturefile);
}
@@ -71,7 +71,7 @@
public void testCustomTypes() throws Exception
{
Class seiClass = CustomInterface.class;
- String fixturefile = getResourceFile("tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl").getAbsolutePath();
doWSDLTest(seiClass, fixturefile);
}
@@ -79,7 +79,7 @@
public void testExceptionTypes() throws Exception
{
Class seiClass = ServiceException.class;
- String fixturefile = getResourceFile("tools/wsdlfixture/ServiceExceptionService_RPC_11.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/wsdlfixture/ServiceExceptionService_RPC_11.wsdl").getAbsolutePath();
doWSDLTest(seiClass, fixturefile);
}
@@ -87,7 +87,7 @@
public void testComplexTypes() throws Exception
{
Class seiClass = ComplexTypes.class;
- String fixturefile = getResourceFile("tools/wsdlfixture/ComplexTypesService_RPC_11.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/wsdlfixture/ComplexTypesService_RPC_11.wsdl").getAbsolutePath();
doWSDLTest(seiClass, fixturefile);
}
@@ -95,8 +95,8 @@
public void testArrayTypes() throws Exception
{
Class seiClass = ArrayInterface.class;
- // String fixturefile = getResourceFile("tools/wsdlfixture/ArrayInterfaceService_RPC_11.wsdl").getPath();
- String fixturefile = getResourceFile("tools/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl").getPath();
+ // String fixturefile = getResourceFile("tools/wsdlfixture/ArrayInterfaceService_RPC_11.wsdl").getAbsolutePath();
+ String fixturefile = getResourceFile("tools/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl").getAbsolutePath();
doWSDLTest(seiClass, fixturefile);
}
@@ -104,7 +104,7 @@
public void testPrimitiveArrayTypes() throws Exception
{
Class seiClass = PrimitiveArrayTypes.class;
- String fixturefile = getResourceFile("tools/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl").getAbsolutePath();
doWSDLTest(seiClass, fixturefile);
}
@@ -112,7 +112,7 @@
public void testInterfaceInheritence() throws Exception
{
Class seiClass = InheritenceChildInterface.class;
- String fixturefile = getResourceFile("tools/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl").getAbsolutePath();
doWSDLTest(seiClass, fixturefile);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -62,7 +62,7 @@
private void doWSDLTest(String wsdlname)
{
// System property passed through the ant build script
- String wsdldir = System.getProperty("wsdl.dir", getResourceFile("tools").getPath());
+ String wsdldir = System.getProperty("wsdl.dir", getResourceFile("tools").getAbsolutePath());
File wsdlFile = createResourceFile(wsdldir + "/wsdl20assertions/" + wsdlname);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -187,7 +187,7 @@
}*/
//Compare mapping files
- String fix = getResourceFile("tools/jbws-160/wscompile/custom/mapping/jaxrpc-mapping.xml").getPath();
+ String fix = getResourceFile("tools/jbws-160/wscompile/custom/mapping/jaxrpc-mapping.xml").getAbsolutePath();
String gen = "tools/jbws-160/jbossws/custom/mapping/jaxrpc-mapping.xml";
JaxrpcMappingValidator mv = new JaxrpcMappingValidator();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -42,7 +42,7 @@
{
public void testJavaToWSDL() throws Exception
{
- String j2wConfigFile = getResourceFile("tools/config/java2wsdl.xml").getPath();
+ String j2wConfigFile = getResourceFile("tools/config/java2wsdl.xml").getAbsolutePath();
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 = getResourceFile("tools/config/wsdl2java.xml").getPath();
+ String w2jConfigFile = getResourceFile("tools/config/wsdl2java.xml").getAbsolutePath();
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", getResourceFile("tools/config/invalidConfig.xml").getPath() };
+ String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/invalidConfig.xml").getAbsolutePath() };
WSTools tools = new WSTools();
try
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -61,7 +61,7 @@
new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET);
fw.close();
- String fixturefile = getResourceFile("tools/doc-lit/trivial/wsdl/SampleService.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/doc-lit/trivial/wsdl/SampleService.wsdl").getAbsolutePath();
//Validate the generated WSDL
File wsdlfix = createResourceFile(fixturefile);
Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -37,10 +37,10 @@
{
public final void testEnumWsdl() throws Exception
{
- String config = getResourceFile("tools/enums/wstools-config.xml").getPath();
+ String config = getResourceFile("tools/enums/wstools-config.xml").getAbsolutePath();
new WSTools().generate(new String[] {"-dest", "tools/enums", "-config", config});
- Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService15.wsdl").getPath()));
+ Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService15.wsdl").getAbsolutePath()));
Element was = DOMUtils.parse(new FileInputStream("tools/enums/wsdl/EnumService.wsdl"));
assertEquals(exp, was);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -93,7 +93,7 @@
//First check if the wsdl files are well formed
try
{
- String fixturefile = getResourceFile("tools/holders/wsdl/HolderService.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/holders/wsdl/HolderService.wsdl").getAbsolutePath();
File wsdlfix = createResourceFile(fixturefile);
Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
File wsdlFile = createResourceFile(wsdlPath);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -38,8 +38,9 @@
public void testAnonymousType() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1079").getPath();
- String toolsDir = "tools/jbws1079";
+ File resourceFile = createResourceFile("tools/jbws1079");
+ String resourceDir = resourceFile.getAbsolutePath();
+ String toolsDir = resourceDir;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -54,8 +55,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -36,8 +36,8 @@
public final void testNoNamespaceElement() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1080").getPath();
- String toolsDir = "tools/jbws1080";
+ String resourceDir = createResourceFile("tools/jbws1080").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1080";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
try
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -37,8 +37,8 @@
{
public final void testHyphenatedElement() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1170").getPath();
- String toolsDir = "tools/jbws1170";
+ String resourceDir = createResourceFile("tools/jbws1170").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1170";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -76,8 +76,9 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1184/scenario_" + scenario).getPath();
- String toolsDir = "tools/jbws1184/scenario_" + scenario;
+ File resourceFile = createResourceFile("tools/jbws1184/scenario_" + scenario);
+ String resourceDir = resourceFile.getAbsolutePath();
+ String toolsDir = resourceDir;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -90,8 +91,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -39,8 +39,8 @@
{
public final void testMultiplePackageNameSpace() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1217").getPath();
- String toolsDir = "tools/jbws1217";
+ String resourceDir = createResourceFile("tools/jbws1217").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1217";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -54,8 +54,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -35,8 +35,8 @@
public final void testGenerate() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1231").getPath();
- String toolsDir = "tools/jbws1231";
+ String resourceDir = createResourceFile("tools/jbws1231").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1231";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -38,8 +38,8 @@
{
public final void testPortTypePort() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1253").getPath();
- String toolsDir = "tools/jbws1253";
+ String resourceDir = createResourceFile("tools/jbws1253").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1253";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -129,8 +129,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1259/scenario_" + scenario).getPath();
- String toolsDir = "tools/jbws1259/scenario_" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1259/scenario_" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1259/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -176,8 +176,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -47,8 +47,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1278/" + scenario).getPath();
- String toolsDir = "tools/jbws1278/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1278/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -93,8 +93,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -37,8 +37,8 @@
public void testGenerate() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1428").getPath();
- String toolsDir = "tools/jbws1428";
+ String resourceDir = createResourceFile("tools/jbws1428").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1428";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -35,8 +35,8 @@
*/
public class JBWS1441TestCase extends JBossWSTest
{
- private String resourceDir = getResourceFile("tools/jbws1441").getPath();
- private String toolsDir = "tools/jbws1441";
+ private String resourceDir = createResourceFile("tools/jbws1441").getAbsolutePath();
+ private String toolsDir = resourceDir;
public void testGenerate() throws Exception
{
@@ -54,8 +54,8 @@
private void compareSource(final String fileName) throws Exception
{
- File expected = createResourceFile(resourceDir + "/" + fileName);
- File generated = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName);
+ File expected = new File(resourceDir + "/" + fileName);
+ File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -122,8 +122,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1450/scenario_" + scenario).getPath();
- String toolsDir = "tools/jbws1450/scenario_" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1450/scenario_" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -155,8 +155,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -47,8 +47,8 @@
*/
public void testGenerate() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1453").getPath();
- String toolsDir = "tools/jbws1453";
+ String resourceDir = createResourceFile("tools/jbws1453").getAbsolutePath();
+ String toolsDir = resourceDir;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -95,8 +95,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -36,8 +36,8 @@
public class JBWS1455TestCase extends JBossWSTest
{
- private String resourceDir = getResourceFile("tools/jbws1455").getPath();
- private String toolsDir = "tools/jbws1455";
+ private String resourceDir = createResourceFile("tools/jbws1455").getAbsolutePath();
+ private String toolsDir = resourceDir; //"tools/jbws1455";
public void testGenerate() throws Exception
{
@@ -53,8 +53,8 @@
private void compareSource(final String fileName) throws Exception
{
- File expected = createResourceFile(resourceDir + "/" + fileName);
- File generated = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1455/" + fileName);
+ File expected = new File(resourceDir + "/" + fileName);
+ File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1455/" + fileName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -61,8 +61,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1534/" + scenario).getPath();
- String toolsDir = "tools/jbws1534/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1534/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1534/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -108,8 +108,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -41,13 +41,13 @@
public final void testGenerate() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1536").getPath();
- String toolsDir = "tools/jbws1536";
+ String resourceDir = createResourceFile("tools/jbws1536").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1536";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- Element expected = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1536/webservices.xml").getPath()));
+ Element expected = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1536/webservices.xml").getAbsolutePath()));
Element was = DOMUtils.parse(new FileInputStream("tools/jbws1536/webservices.xml"));
assertEquals(expected, was);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -35,8 +35,8 @@
public final void testGenerate() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1538").getPath();
- String toolsDir = "tools/jbws1538";
+ String resourceDir = createResourceFile("tools/jbws1538").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1538";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -79,8 +79,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1597/" + scenario).getPath();
- String toolsDir = "tools/jbws1597/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1597/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1597/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -125,8 +125,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -49,8 +49,8 @@
*/
public void testGenerate() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1607").getPath();
- String toolsDir = "tools/jbws1607";
+ String resourceDir = createResourceFile("tools/jbws1607").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1607";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -97,8 +97,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -48,8 +48,8 @@
*/
public void testGenerate() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1627").getPath();
- String toolsDir = "tools/jbws1627";
+ String resourceDir = createResourceFile("tools/jbws1627").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1627";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
@@ -96,8 +96,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -78,7 +78,7 @@
public void testWSDLGeneratorWithPolicies() throws Exception
{
Class seiClass = StandardJavaTypes.class;
- String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645.wsdl").getAbsolutePath();
File wsdlDir = createResourceFile("./tools/jbws1645");
wsdlDir.mkdirs();
@@ -129,7 +129,7 @@
public void testWSDLGeneratorWithMultiplePolicies() throws Exception
{
Class seiClass = StandardJavaTypes.class;
- String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl").getPath();
+ String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl").getAbsolutePath();
File wsdlDir = createResourceFile("./tools/jbws1645");
wsdlDir.mkdirs();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -48,8 +48,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1691/" + scenario).getPath();
- String toolsDir = "tools/jbws1691/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1691/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1691/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -94,8 +94,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -64,8 +64,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1697/" + scenario).getPath();
- String toolsDir = "tools/jbws1697/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1697/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1697/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -110,8 +110,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -59,8 +59,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1698/" + scenario).getPath();
- String toolsDir = "tools/jbws1698/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1698/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1698/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -105,8 +105,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -51,8 +51,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1723/" + scenario).getPath();
- String toolsDir = "tools/jbws1723/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1723/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1723/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -97,8 +97,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -41,9 +41,11 @@
public void testExtensionType() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1725").getPath();
- String toolsDir = "tools/jbws1725";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ File resourceDir = createResourceFile("tools/jbws1725");
+ resourceDir.mkdirs();
+
+ String toolsDir = resourceDir.getAbsolutePath();
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" };
new WSTools().generate(args);
compareSource(resourceDir + "/PasswordType.java", toolsDir + "/org/jboss/test/ws/jbws1725/PasswordType.java");
@@ -51,8 +53,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -51,8 +51,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1801/" + scenario).getPath();
- String toolsDir = "tools/jbws1801/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1801/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1801/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -97,8 +97,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -47,8 +47,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1873/" + scenario).getPath();
- String toolsDir = "tools/jbws1873/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws1873/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws1873/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -93,8 +93,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -36,8 +36,8 @@
{
public final void testMultiplePackageNameSpace() throws Exception
{
- String resourceDir = getResourceFile("tools/jbws2018").getPath();
- String toolsDir = "tools/jbws2018";
+ String resourceDir = createResourceFile("tools/jbws2018").getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws2018";
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -47,8 +47,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws2019/" + scenario).getPath();
- String toolsDir = "tools/jbws2019/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws2019/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws2019/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -93,8 +93,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -75,8 +75,8 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws429/" + scenario).getPath();
- String toolsDir = "tools/jbws429/" + scenario;
+ String resourceDir = createResourceFile("tools/jbws429/" + scenario).getAbsolutePath();
+ String toolsDir = resourceDir; //"tools/jbws429/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
File resourceDirFile = createResourceFile(resourceDir);
@@ -121,8 +121,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -35,8 +35,8 @@
*/
public class JBWS810TestCase extends JBossWSTest
{
- private String resourceDir = getResourceFile("tools/jbws810").getPath();
- private String toolsDir = "tools/jbws810";
+ private String resourceDir = createResourceFile("tools/jbws810").getAbsolutePath();
+ private String toolsDir = resourceDir; //"tools/jbws810";
public void testDocument() throws Exception
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -44,11 +44,11 @@
public final void testEnumWsdl() throws Exception
{
- String config = getResourceFile("tools/jbws818/wstools-config.xml").getPath();
+ String config = getResourceFile("tools/jbws818/wstools-config.xml").getAbsolutePath();
String[] args= new String[]{"-dest", "tools/jbws818", "-config", config};
new WSTools().generate(args);
- Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws818/CrossPackageInheritenceService.wsdl").getPath()));
+ Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws818/CrossPackageInheritenceService.wsdl").getAbsolutePath()));
Element was = DOMUtils.parse(new FileInputStream("tools/jbws818/wsdl/CrossPackageInheritenceService.wsdl"));
assertEquals(exp, was);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -59,7 +59,7 @@
public void checkServiceEndpointInterface() throws Exception
{
String out_dir = "tools/jbws-206/jbossws/" + getBase();
- String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath();
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 = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath();
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 = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath();
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 = getResourceFile("tools/jbws-206/jbosswsConfig/" + getBase() + "/" + getBase() + "wsdl2java.xml").getPath();
+ String configloc = getResourceFile("tools/jbws-206/jbosswsConfig/" + getBase() + "/" + getBase() + "wsdl2java.xml").getAbsolutePath();
String[] args = new String[] { "-dest", out_dir, "-config", configloc };
WSTools tools = new WSTools();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -55,9 +55,9 @@
return;
}
String out_dir = "tools/jbws-211/jbossws/" + getBase();
- String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName()).getPath();
+ String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName()).getAbsolutePath();
String configStr = getBase().replaceAll("/", "");
- String configloc = getResourceFile("tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml").getPath();
+ String configloc = getResourceFile("tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml").getAbsolutePath();
String[] args = new String[] { "-dest", out_dir, "-config", configloc };
WSTools tools = new WSTools();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -90,7 +90,7 @@
{
String typeNS = "http://org.jboss.ws/types";
XSLoader xsloader = SchemaUtils.getInstance().getXSLoader();
- XSModel xsmodel = xsloader.loadURI(getResourceFile("tools/wsdlfixture/CustomInterface20.xsd").getPath());
+ XSModel xsmodel = xsloader.loadURI(getResourceFile("tools/wsdlfixture/CustomInterface20.xsd").getAbsolutePath());
assertNotNull("XSModel is null?", xsmodel);
XSNamedMap xsnamedmap = getXSNamedMap(xsmodel, typeNS);
@@ -137,7 +137,7 @@
assertEquals("HelloObj", name);
//Test the case when the schema files are parsed one by one
- XSModel newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getPath());
+ XSModel newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getAbsolutePath());
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(getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getPath());
+ newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getAbsolutePath());
assertNotNull("XSModel is null?", newxsmodel);
xsnamedmap = getXSNamedMap(newxsmodel, arrTypeNS);
assertNotNull("XSNamedMap is null?", xsnamedmap);
@@ -173,8 +173,8 @@
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[] = {getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getPath(),
- getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getPath()};
+ String arr[] = {getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getAbsolutePath(),
+ getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getAbsolutePath()};
XSLoader xsloader = utils.getXSLoader();
Map map = new HashMap();
map.put(typeNS,getResourceURL("/tools/wsdlfixture/customtype/CustomTypeObj.xsd"));
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -49,7 +49,7 @@
{
String filename = "AnonTypes.xsd";
String packagename = "org.jboss.ws.types";
- String schemaFile = getResourceFile("tools/xsd/anontypes/" + filename).getPath();
+ String schemaFile = getResourceFile("tools/xsd/anontypes/" + filename).getAbsolutePath();
String genPath = "tools/xsd-java-checker/jbossws/anontypes/";
this.mkdirs(genPath);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -48,7 +48,7 @@
{
String filename = "ComplexType_ElementsOnly.xsd";
String packagename = "org.jboss.ws.types";
- String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsOnly.xsd").getPath();
+ String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsOnly.xsd").getAbsolutePath();
this.mkdirs(genPath);
File dir = createResourceFile(genPath);
@@ -80,7 +80,7 @@
{
String filename = "ComplexType_ElementsAttrib.xsd";
String packagename = "org.jboss.ws.types";
- String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsAttrib.xsd").getPath();
+ String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsAttrib.xsd").getAbsolutePath();
this.mkdirs(genPath);
File dir = createResourceFile(genPath);
@@ -102,7 +102,7 @@
*/
public void testXSComplexType_FromSimpleType() throws Exception
{
- String filename = getResourceFile("tools/xsd/complextypes/ComplexTypeFromSimpleType.xsd").getPath();
+ String filename = getResourceFile("tools/xsd/complextypes/ComplexTypeFromSimpleType.xsd").getAbsolutePath();
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
@@ -125,7 +125,7 @@
*/
public void testXSComplexType_EmptyContent() throws Exception
{
- String filename = getResourceFile("tools/xsd/complextypes/CT_EmptyContent.xsd").getPath();
+ String filename = getResourceFile("tools/xsd/complextypes/CT_EmptyContent.xsd").getAbsolutePath();
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
@@ -147,7 +147,7 @@
*/
public void testXSComplexTypeOccurrence() throws Exception
{
- String filename = getResourceFile("tools/xsd/complextypes/ComplexTypesOccurence.xsd").getPath();
+ String filename = getResourceFile("tools/xsd/complextypes/ComplexTypesOccurence.xsd").getAbsolutePath();
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
@@ -170,7 +170,7 @@
*/
public void testXSComplexType_Inheritance() throws Exception
{
- String filename = getResourceFile("tools/xsd/complextypes/CT_ExtensionRestriction.xsd").getPath();
+ String filename = getResourceFile("tools/xsd/complextypes/CT_ExtensionRestriction.xsd").getAbsolutePath();
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
@@ -204,7 +204,7 @@
/**
* wscompile does not support element groups
*/
- String filename = getResourceFile("tools/xsd/complextypes/CT_SequenceGroups.xsd").getPath();
+ String filename = getResourceFile("tools/xsd/complextypes/CT_SequenceGroups.xsd").getAbsolutePath();
//This testcase will pass because wscompile does not support xsd:group
String packagename = "org.jboss.ws.types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -51,7 +51,7 @@
* wscompile has a bug. It does not generate accessors for 'byte'
* and getBoolean
*/
- String filename = getResourceFile("tools/xsd/nillabletypes/Nillable.xsd").getPath();
+ String filename = getResourceFile("tools/xsd/nillabletypes/Nillable.xsd").getAbsolutePath();
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
File dir = createResourceFile(genPath);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -48,7 +48,7 @@
public void testXSElemAttribReferences() throws Exception
{
- String filename = getResourceFile("tools/xsd/references/ElemAttribReferences.xsd").getPath();
+ String filename = getResourceFile("tools/xsd/references/ElemAttribReferences.xsd").getAbsolutePath();
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950)
@@ -48,7 +48,7 @@
*/
public void testXSSimpleTypes() throws Exception
{
- String filename = getResourceFile("tools/xsd/simpletypes/SimpleType.xsd").getPath();
+ String filename = getResourceFile("tools/xsd/simpletypes/SimpleType.xsd").getAbsolutePath();
String packagename = "org.jboss.ws.types";
mkdirs(genPath);
16 years, 7 months
- 1
- 0
JBossWS SVN: r6949 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 15:50:34 -0400 (Wed, 07 May 2008)
New Revision: 6949
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java
Log:
Fix jbws_211 tests
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java 2008-05-07 19:47:09 UTC (rev 6948)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java 2008-05-07 19:50:34 UTC (rev 6949)
@@ -224,9 +224,9 @@
protected boolean semanticallyValidateWSDL(String expPath, String genpath) throws Exception
{
boolean bool = true;
- File wsdlfix = createResourceFile(expPath);
+ File wsdlfix = new File(expPath);
Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
- File wsdlFile = createResourceFile(genpath);
+ File wsdlFile = new File(genpath);
assertTrue("Generated WSDL File exists", wsdlFile.exists());
Element was = DOMUtils.parse(wsdlFile.toURL().openStream());
//assertEquals(exp,was);
16 years, 7 months
- 1
- 0
JBossWS SVN: r6948 - in stack/native/trunk/modules/testsuite/native-tests/src/test: resources/tools/jbws1881/doclit and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 15:47:09 -0400 (Wed, 07 May 2008)
New Revision: 6948
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1881/doclit/wstools-config.xml
Log:
Fix resource loading
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-05-07 19:46:48 UTC (rev 6947)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-05-07 19:47:09 UTC (rev 6948)
@@ -47,12 +47,13 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1881/" + scenario).getPath();
- String toolsDir = "tools/jbws1881/" + scenario;
+ File resourceDir = createResourceFile("tools/jbws1881/" + scenario);
+ resourceDir.mkdirs();
+ String toolsDir = resourceDir.getAbsolutePath();
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = createResourceFile(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+
+ String[] expectedFiles = resourceDir.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
return name.endsWith(".java");
@@ -73,7 +74,7 @@
}
}
- File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1881");
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1881");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -93,8 +94,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = createResourceFile(expectedName);
- File generated = createResourceFile(generatedName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1881/doclit/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2008-05-07 19:46:48 UTC (rev 6947)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2008-05-07 19:47:09 UTC (rev 6948)
@@ -1,4 +1,4 @@
-<configuration>
+<configuration>
<wsdl-java location="${test.resources.directory}/tools/jbws1881/doclit/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6947 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 15:46:48 -0400 (Wed, 07 May 2008)
New Revision: 6947
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
Filter testresources.directory token
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-07 19:31:12 UTC (rev 6946)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-07 19:46:48 UTC (rev 6947)
@@ -17,6 +17,7 @@
<!-- Properties -->
<properties>
<surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args>
+ <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
</properties>
<!-- Modules -->
16 years, 7 months
- 1
- 0
JBossWS SVN: r6946 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/common/jbossxb/array and 143 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 15:31:12 -0400 (Wed, 07 May 2008)
New Revision: 6946
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
Modified:
stack/native/trunk/modules/testsuite/native-tests/pom.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/wsdl2javaglobal.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1170/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1217/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1253/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_A/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_B/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_C/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_D/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AA/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AH/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_G/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_H/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_I/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_J/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_K/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_L/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_T/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_U/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_V/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_W/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_X/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Y/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Z/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1278/doclit/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1441/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1453/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1455/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1534/bare/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1534/wrapped/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1536/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1607/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1627/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1698/error/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1698/fault/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1725/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1801/doclit/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1881/doclit/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2019/doclit/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/doclit_inout/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/rpclit_inout/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/rpclit_out/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws810/document/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws810/rpc/wstools-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/scripts/wstools-config.xml
Log:
Fix test resource lookup
Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -30,7 +30,7 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <execution>
+ <!--execution>
<id>wsconsume</id>
<phase>generate-sources</phase>
<goals>
@@ -74,7 +74,7 @@
<ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
</tasks>
</configuration>
- </execution>
+ </execution-->
<execution>
<id>build-jars</id>
<phase>test-compile</phase>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -27,7 +27,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -39,7 +39,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Apr-2005
*/
-public class BigDecimalArrayMarshallerTestCase extends WSToolsTest
+public class BigDecimalArrayMarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -27,7 +27,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -39,7 +39,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Apr-2005
*/
-public class BigDecimalArrayUnmarshallerTestCase extends WSToolsTest
+public class BigDecimalArrayUnmarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayMarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -41,7 +41,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Apr-2005
*/
-public class CalendarArrayMarshallerTestCase extends WSToolsTest
+public class CalendarArrayMarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -41,7 +41,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Apr-2005
*/
-public class CalendarArrayUnmarshallerTestCase extends WSToolsTest
+public class CalendarArrayUnmarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayMarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -26,7 +26,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -38,7 +38,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Apr-2005
*/
-public class QNameArrayMarshallerTestCase extends WSToolsTest
+public class QNameArrayMarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -26,7 +26,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -38,7 +38,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Apr-2005
*/
-public class QNameArrayUnmarshallerTestCase extends WSToolsTest
+public class QNameArrayUnmarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -42,7 +42,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Oct-2004
*/
-public class ComplexTypeMarshallerTestCase extends WSToolsTest
+public class ComplexTypeMarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -42,7 +42,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Oct-2004
*/
-public class ComplexTypeUnmarshallerTestCase extends WSToolsTest
+public class ComplexTypeUnmarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -42,7 +42,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Oct-2004
*/
-public class DocumentStyleMarshallerTestCase extends WSToolsTest
+public class DocumentStyleMarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/jaxrpc/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -28,7 +28,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -40,7 +40,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Oct-2004
*/
-public class DocumentStyleUnmarshallerTestCase extends WSToolsTest
+public class DocumentStyleUnmarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/jaxrpc/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshallerImpl;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.MarshalException;
@@ -43,7 +43,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Apr-2005
*/
-public class SimpleUserTypeMarshallerTestCase extends WSToolsTest
+public class SimpleUserTypeMarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -26,7 +26,7 @@
import javax.xml.namespace.QName;
import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshallerImpl;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -39,7 +39,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 29-Apr-2005
*/
-public class SimpleUserTypeUnmarshallerTestCase extends WSToolsTest
+public class SimpleUserTypeUnmarshallerTestCase extends WSToolsBase
{
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/types";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLWithAnonTypesTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -31,7 +31,7 @@
import org.apache.xerces.xs.XSParticle;
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
@@ -44,7 +44,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Aug 31, 2005
*/
-public class WSDLWithAnonTypesTestCase extends WSToolsTest
+public class WSDLWithAnonTypesTestCase extends WSToolsBase
{
String wsdlfile = getResourceFile("jaxrpc/anonymous/WEB-INF/wsdl/TestService.wsdl").getPath();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -23,6 +23,7 @@
import java.io.File;
import java.io.Writer;
+import java.io.FileWriter;
import org.jboss.test.ws.common.jbossxb.complex.ComplexTypes;
import org.jboss.test.ws.tools.sei.ArrayInterface;
@@ -117,7 +118,7 @@
private void doWSDLTest(Class seiClass, String fixturefile) throws Exception
{
- File wsdlDir = new File("./tools/wsdl-out");
+ File wsdlDir = createResourceFile("./tools/wsdl-out");
wsdlDir.mkdirs();
String sname = WSDLUtils.getInstance().getJustClassName(seiClass) + "Service";
@@ -142,7 +143,7 @@
assertEquals(exp, was);
/*
- File wsdlFile = new File(config.getWsdlOutFile());
+ File wsdlFile = createResourceFile(config.getWsdlOutFile());
WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdl = wsdlFactory.parse(wsdlFile.toURL());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -37,7 +37,7 @@
* @author anil.saldhana(a)jboss.org
* @since 22-Jan-2005
*/
-public class SchemaGeneratorTestCase extends WSToolsTest
+public class SchemaGeneratorTestCase extends WSToolsBase
{
private static final String SCHEMA_NAMESPACES =
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -43,7 +43,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 14-Oct-2004
*/
-public class WSDL11ToJavaTestCase extends WSToolsTest
+public class WSDL11ToJavaTestCase extends WSToolsBase
{
/** Test a SEI that contains JAXRPC primitive types */
public void testPrimitiveTypes() throws Exception
@@ -83,9 +83,9 @@
private void writeWSDL(WSDLDefinitions wsdl, String fname) throws Exception
{
- File wsdlDir = new File("./tools/wsdl-out");
+ File wsdlDir = createResourceFile("./tools/wsdl-out");
wsdlDir.mkdirs();
- FileWriter writer = new FileWriter(new File(wsdlDir + "/" + fname));
+ FileWriter writer = new FileWriter(wsdlDir + "/" + fname);
new WSDLWriter(wsdl).write(writer);
writer.close();
}
@@ -124,7 +124,7 @@
try
{
wsdljava.setTypeMapping(new LiteralTypeMapping());
- wsdljava.generateSEI(wsdl, new File(seidir));
+ wsdljava.generateSEI(wsdl, createResourceFile(seidir));
}
catch (Exception e)
{
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java (from rev 6940, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -0,0 +1,256 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.encoding.TypeMapping;
+
+import org.apache.xerces.xs.XSModel;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.WSDL11Validator;
+import org.jboss.test.ws.tools.validation.WSDLValidator;
+import org.jboss.ws.Constants;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
+import org.jboss.ws.tools.JavaToWSDL;
+import org.jboss.ws.tools.JavaToXSD;
+import org.jboss.ws.tools.WSToolsConstants;
+import org.jboss.ws.tools.client.ServiceCreator;
+import org.jboss.ws.tools.exceptions.JBossWSToolsException;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.JavaUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Base class for the Tools Tests
+ * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
+ * @since Sep 5, 2005
+ */
+public class WSToolsBase extends JBossWSTest
+{
+ protected static final String SCHEMA_NAMESPACES = "xmlns='http://www.w3.org/2001/XMLSchema' " + "xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' "
+ + "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'";
+
+ protected String OUT_DIR = "tools/";
+
+ private TypeMapping typeMapping = null;
+
+ public Class loadClass(String cname) throws ClassNotFoundException
+ {
+ return JavaUtils.loadJavaType(cname);
+ }
+
+ public void mkdirs(String path)
+ {
+ createResourceFile(path).mkdirs();
+ }
+
+ /** Get the Schema as a String */
+ public String generateSchema(QName xmlType, Class javaType) throws Exception
+ {
+ String nsuri = xmlType.getNamespaceURI();
+ JavaToXSD javaToXSD = new JavaToXSD();
+ JBossXSModel xsmodel = javaToXSD.generateForSingleType(xmlType, javaType);
+ return xsmodel.serialize();
+ }
+
+ /** Get the Schema as a String */
+ public String generateSchema(QName xmlType, Class javaType, Map packageNamespace) throws Exception
+ {
+ String nsuri = xmlType.getNamespaceURI();
+ JavaToXSD javaToXSD = new JavaToXSD();
+ javaToXSD.setPackageNamespaceMap(packageNamespace);
+ JBossXSModel xsmodel = javaToXSD.generateForSingleType(xmlType, javaType);
+ return xsmodel.serialize();
+ }
+
+ /** Get the Schema as an XSModel */
+ public XSModel generateSchemaXSModel(QName xmlType, Class javaType) throws Exception
+ {
+ String nsuri = xmlType.getNamespaceURI();
+ JavaToXSD javaToXSD = new JavaToXSD();
+ return javaToXSD.generateForSingleType(xmlType, javaType);
+ }
+
+ /** Parse a schema */
+ public XSModel parseSchema(URL url)
+ {
+ JavaToXSD javaToXSD = new JavaToXSD();
+ return javaToXSD.parseSchema(url);
+ }
+
+ /**
+ * Parse a set of schema files given a map of namespace versus schema locations
+ *
+ * @param schemaLocationsMap
+ * @return
+ */
+ public XSModel parseSchema(Map schemaLocationsMap)
+ {
+ JavaToXSD javaToXSD = new JavaToXSD();
+ return javaToXSD.parseSchema(schemaLocationsMap);
+ }
+
+ /**
+ * Validate that two interfaces are identical
+ * Check for imports is done as an extra step
+ * @throws Exception
+ */
+ public void assertExactSourceFiles(File file1, File file2) throws Exception
+ {
+
+ JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
+ assertTrue("Source Files Match:", sc.validate());
+ sc.validateImports();
+ }
+
+ protected WSDLDefinitions getWSDLDefinitions(File wsdlFile) throws MalformedURLException
+ {
+ WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = wsdlFactory.parse(wsdlFile.toURL());
+ return wsdlDefinitions;
+ }
+
+ protected WSDLDefinitions generateWSDL(Class seiClass, String serviceName, String wsdlPath, String targetNamespace, String typeNamespace, Style style, Map featureMap)
+ throws IOException
+ {
+ JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL11);
+ jwsdl.setServiceName(serviceName);
+ jwsdl.setTargetNamespace(targetNamespace);
+ jwsdl.setTypeNamespace(typeNamespace);
+ jwsdl.setStyle(style);
+ //Add the features
+ Iterator keys = featureMap.keySet().iterator();
+ while (keys.hasNext())
+ {
+ String key = (String)keys.next();
+ Boolean value = (Boolean)featureMap.get(key);
+ jwsdl.addFeature(key, value.booleanValue());
+ }
+ WSDLDefinitions wsdl = jwsdl.generate(seiClass);
+ typeMapping = jwsdl.getTypeMapping();
+ return wsdl;
+ }
+
+ protected Map getBasicFeatures()
+ {
+ Map fmap = new HashMap();
+ fmap.put(WSToolsConstants.WSTOOLS_FEATURE_RESTRICT_TO_TARGET_NS, new Boolean(true));
+ return fmap;
+ }
+
+ protected TypeMapping getLastGeneratedTypeMapping()
+ {
+ return typeMapping;
+ }
+
+ // protected void generateMappingFile(String packageName, WSDLDefinitions wsdl, TypeMapping typeMapping, String serviceName, String fileLoc, Class seiClass,
+ // String typeNamespace) throws IOException
+ // {
+ // MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping());
+ // mgf.setPackageName(packageName);
+ // mgf.setServiceName(serviceName);
+ // if (seiClass != null)
+ // mgf.setServiceEndpointInterface(seiClass);
+ // if (typeNamespace != null && typeNamespace.length() > 0)
+ // mgf.setTypeNamespace(typeNamespace);
+ // JavaWsdlMapping jwm = mgf.generate();
+ // FileWriter fw = new FileWriter(fileLoc);
+ // fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true));
+ // fw.close();
+ // }
+
+ protected void generateServiceFile(String packageName, WSDLDefinitions wsdl, String location) throws IOException
+ {
+ ServiceCreator sc = new ServiceCreator();
+ sc.setPackageName(packageName);
+ sc.setDirLocation(createResourceFile(location));
+ sc.setWsdl(wsdl);
+ sc.createServiceDescriptor();
+ }
+
+ protected void validateXML(String fixtureFile, String genFile) throws Exception
+ {
+ File wsdlfix = createResourceFile(fixtureFile);
+ Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
+ File wsdlFile = createResourceFile(genFile);
+ assertNotNull("Generated WSDL File exists?", wsdlFile);
+ Element was = DOMUtils.parse(wsdlFile.toURL().openStream());
+ assertEquals(exp, was);
+ }
+
+ protected void appendWSDLNamespaceToSchema(Element schemaEl) throws IOException
+ {
+ schemaEl.setAttribute("xmlns:wsdl", Constants.NS_WSDL11);
+ }
+
+ protected void removeSoapEncNamespaceFromSchema(Element schemaEl) throws IOException
+ {
+ //Remove the soap-enc namespace
+ schemaEl.removeAttribute("xmlns:soap11-enc");
+ }
+
+ protected boolean semanticallyValidateWSDL(String expPath, String genpath) throws Exception
+ {
+ boolean bool = true;
+ File wsdlfix = createResourceFile(expPath);
+ Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
+ File wsdlFile = createResourceFile(genpath);
+ assertTrue("Generated WSDL File exists", wsdlFile.exists());
+ Element was = DOMUtils.parse(wsdlFile.toURL().openStream());
+ //assertEquals(exp,was);
+ //Now that we have figured out that the wsdl files are well formed,
+ //lets do the semantic wsdl validation
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlExp = factory.parse(wsdlfix.toURL());
+
+ WSDLDefinitions wsdlActual = factory.parse(wsdlFile.toURL());
+ WSDLValidator validator = new WSDL11Validator();
+ try
+ {
+ bool = validator.validate(wsdlExp, wsdlActual);
+ if (bool == false)
+ fail("WSDL do not match");
+ }
+ catch (JBossWSToolsException e)
+ {
+ fail(e.getLocalizedMessage());
+ }
+ catch (Exception e)
+ {
+ fail("Unknown exception:" + e.getLocalizedMessage());
+ }
+ return bool;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,255 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.TypeMapping;
-
-import org.apache.xerces.xs.XSModel;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.WSDL11Validator;
-import org.jboss.test.ws.tools.validation.WSDLValidator;
-import org.jboss.ws.Constants;
-import org.jboss.ws.core.soap.Style;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
-import org.jboss.ws.tools.JavaToWSDL;
-import org.jboss.ws.tools.JavaToXSD;
-import org.jboss.ws.tools.WSToolsConstants;
-import org.jboss.ws.tools.client.ServiceCreator;
-import org.jboss.ws.tools.exceptions.JBossWSToolsException;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.JavaUtils;
-import org.w3c.dom.Element;
-
-/**
- * Base class for the Tools Tests
- * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
- * @since Sep 5, 2005
- */
-public class WSToolsTest extends JBossWSTest
-{
- protected static final String SCHEMA_NAMESPACES = "xmlns='http://www.w3.org/2001/XMLSchema' " + "xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' "
- + "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'";
-
- protected String OUT_DIR = "tools/";
-
- private TypeMapping typeMapping = null;
-
- public Class loadClass(String cname) throws ClassNotFoundException
- {
- return JavaUtils.loadJavaType(cname);
- }
-
- public void mkdirs(String path)
- {
- new File(path).mkdirs();
- }
-
- /** Get the Schema as a String */
- public String generateSchema(QName xmlType, Class javaType) throws Exception
- {
- String nsuri = xmlType.getNamespaceURI();
- JavaToXSD javaToXSD = new JavaToXSD();
- JBossXSModel xsmodel = javaToXSD.generateForSingleType(xmlType, javaType);
- return xsmodel.serialize();
- }
-
- /** Get the Schema as a String */
- public String generateSchema(QName xmlType, Class javaType, Map packageNamespace) throws Exception
- {
- String nsuri = xmlType.getNamespaceURI();
- JavaToXSD javaToXSD = new JavaToXSD();
- javaToXSD.setPackageNamespaceMap(packageNamespace);
- JBossXSModel xsmodel = javaToXSD.generateForSingleType(xmlType, javaType);
- return xsmodel.serialize();
- }
-
- /** Get the Schema as an XSModel */
- public XSModel generateSchemaXSModel(QName xmlType, Class javaType) throws Exception
- {
- String nsuri = xmlType.getNamespaceURI();
- JavaToXSD javaToXSD = new JavaToXSD();
- return javaToXSD.generateForSingleType(xmlType, javaType);
- }
-
- /** Parse a schema */
- public XSModel parseSchema(URL url)
- {
- JavaToXSD javaToXSD = new JavaToXSD();
- return javaToXSD.parseSchema(url);
- }
-
- /**
- * Parse a set of schema files given a map of namespace versus schema locations
- *
- * @param schemaLocationsMap
- * @return
- */
- public XSModel parseSchema(Map schemaLocationsMap)
- {
- JavaToXSD javaToXSD = new JavaToXSD();
- return javaToXSD.parseSchema(schemaLocationsMap);
- }
-
- /**
- * Validate that two interfaces are identical
- * Check for imports is done as an extra step
- * @throws Exception
- */
- public void assertExactSourceFiles(File file1, File file2) throws Exception
- {
-
- JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
- assertTrue("Source Files Match:", sc.validate());
- sc.validateImports();
- }
-
- protected WSDLDefinitions getWSDLDefinitions(File wsdlFile) throws MalformedURLException
- {
- WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = wsdlFactory.parse(wsdlFile.toURL());
- return wsdlDefinitions;
- }
-
- protected WSDLDefinitions generateWSDL(Class seiClass, String serviceName, String wsdlPath, String targetNamespace, String typeNamespace, Style style, Map featureMap)
- throws IOException
- {
- JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL11);
- jwsdl.setServiceName(serviceName);
- jwsdl.setTargetNamespace(targetNamespace);
- jwsdl.setTypeNamespace(typeNamespace);
- jwsdl.setStyle(style);
- //Add the features
- Iterator keys = featureMap.keySet().iterator();
- while (keys.hasNext())
- {
- String key = (String)keys.next();
- Boolean value = (Boolean)featureMap.get(key);
- jwsdl.addFeature(key, value.booleanValue());
- }
- WSDLDefinitions wsdl = jwsdl.generate(seiClass);
- typeMapping = jwsdl.getTypeMapping();
- return wsdl;
- }
-
- protected Map getBasicFeatures()
- {
- Map fmap = new HashMap();
- fmap.put(WSToolsConstants.WSTOOLS_FEATURE_RESTRICT_TO_TARGET_NS, new Boolean(true));
- return fmap;
- }
-
- protected TypeMapping getLastGeneratedTypeMapping()
- {
- return typeMapping;
- }
-
- // protected void generateMappingFile(String packageName, WSDLDefinitions wsdl, TypeMapping typeMapping, String serviceName, String fileLoc, Class seiClass,
- // String typeNamespace) throws IOException
- // {
- // MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping());
- // mgf.setPackageName(packageName);
- // mgf.setServiceName(serviceName);
- // if (seiClass != null)
- // mgf.setServiceEndpointInterface(seiClass);
- // if (typeNamespace != null && typeNamespace.length() > 0)
- // mgf.setTypeNamespace(typeNamespace);
- // JavaWsdlMapping jwm = mgf.generate();
- // FileWriter fw = new FileWriter(fileLoc);
- // fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true));
- // fw.close();
- // }
-
- protected void generateServiceFile(String packageName, WSDLDefinitions wsdl, String location) throws IOException
- {
- ServiceCreator sc = new ServiceCreator();
- sc.setPackageName(packageName);
- sc.setDirLocation(new File(location));
- sc.setWsdl(wsdl);
- sc.createServiceDescriptor();
- }
-
- protected void validateXML(String fixtureFile, String genFile) throws Exception
- {
- File wsdlfix = new File(fixtureFile);
- Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
- File wsdlFile = new File(genFile);
- assertNotNull("Generated WSDL File exists?", wsdlFile);
- Element was = DOMUtils.parse(wsdlFile.toURL().openStream());
- assertEquals(exp, was);
- }
-
- protected void appendWSDLNamespaceToSchema(Element schemaEl) throws IOException
- {
- schemaEl.setAttribute("xmlns:wsdl", Constants.NS_WSDL11);
- }
-
- protected void removeSoapEncNamespaceFromSchema(Element schemaEl) throws IOException
- {
- //Remove the soap-enc namespace
- schemaEl.removeAttribute("xmlns:soap11-enc");
- }
-
- protected boolean semanticallyValidateWSDL(String expPath, String genpath) throws Exception
- {
- boolean bool = true;
- File wsdlfix = new File(expPath);
- Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
- File wsdlFile = new File(genpath);
- assertTrue("Generated WSDL File exists", wsdlFile.exists());
- Element was = DOMUtils.parse(wsdlFile.toURL().openStream());
- //assertEquals(exp,was);
- //Now that we have figured out that the wsdl files are well formed,
- //lets do the semantic wsdl validation
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlExp = factory.parse(wsdlfix.toURL());
-
- WSDLDefinitions wsdlActual = factory.parse(wsdlFile.toURL());
- WSDLValidator validator = new WSDL11Validator();
- try
- {
- bool = validator.validate(wsdlExp, wsdlActual);
- if (bool == false)
- fail("WSDL do not match");
- }
- catch (JBossWSToolsException e)
- {
- fail(e.getLocalizedMessage());
- }
- catch (Exception e)
- {
- fail("Unknown exception:" + e.getLocalizedMessage());
- }
- return bool;
- }
-}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.tools.assertions;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.sei.SomeException;
import org.jboss.test.ws.tools.sei.assertions.AssertMethodParamExtendRemote;
import org.jboss.test.ws.tools.sei.assertions.AssertRemoteExceptions;
@@ -38,7 +38,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Feb 3, 2005
*/
-public class Jaxrpc20AssertionsTestCase extends WSToolsTest
+public class Jaxrpc20AssertionsTestCase extends WSToolsBase
{
public void testIsInterface() throws Exception
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -64,7 +64,7 @@
// System property passed through the ant build script
String wsdldir = System.getProperty("wsdl.dir", getResourceFile("tools").getPath());
- File wsdlFile = new File(wsdldir + "/wsdl20assertions/" + wsdlname);
+ File wsdlFile = createResourceFile(wsdldir + "/wsdl20assertions/" + wsdlname);
WSDLToJavaIntf wsdljava = new WSDLToJava();
try
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -25,7 +25,7 @@
import java.io.FileWriter;
import java.net.URL;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
@@ -36,6 +36,7 @@
import org.jboss.ws.tools.mapping.MappingFileGenerator;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.DOMWriter;
+import org.jboss.wsf.test.JBossWSTestHelper;
import org.w3c.dom.Element;
/**
@@ -43,7 +44,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Jun 22, 2005
*/
-public class ClientSideArtifactsTestCase extends WSToolsTest
+public class ClientSideArtifactsTestCase extends WSToolsBase
{
//Set up the test
protected void setUp()
@@ -58,10 +59,11 @@
public void mkdirs(String path)
{
- File file = new File(path);
+ File resDir = createResourceFile(JBossWSTestHelper.getTestResourcesDir());
+ File file = createResourceFile( resDir.getAbsolutePath() + File.separator + path);
if (file.exists() == false)
file.mkdirs();
- }
+ }
/** Test a simple SEI that uses primitives */
public void testSimpleCase() throws Exception
@@ -70,14 +72,14 @@
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"));
+ wsdlJava.generateSEI(wsdl, createResourceFile("tools/jbws-160/jbossws/simple/sei"));
//Create the Service File
//Generate the Service Interface
ServiceCreator sc = new ServiceCreator();
sc.setPackageName("org.jboss.types");
//sc.setServiceName("HelloWsService");
- sc.setDirLocation(new File("tools/jbws-160/jbossws/simple/service"));
+ sc.setDirLocation(createResourceFile("tools/jbws-160/jbossws/simple/service"));
sc.setWsdl(wsdl);
//sc.setPortName( "HelloWs" );
sc.createServiceDescriptor();
@@ -87,14 +89,14 @@
mgf.setPackageName("org.jboss.types");
mgf.setServiceName("HelloWsService");
JavaWsdlMapping jwm = mgf.generate();
- FileWriter fw = new FileWriter("tools/jbws-160/jbossws/simple/mapping" + "/" + "jaxrpc-mapping.xml");
+ FileWriter fw = new FileWriter( createResourceFile("tools/jbws-160/jbossws/simple/mapping" + "/" + "jaxrpc-mapping.xml"));
fw.write(jwm.serialize());
fw.close();
//Match the Service File
String fname = "HelloWsService.java";
File file1 = getResourceFile("tools/jbws-160/wscompile/simple/service/" + fname);
- File file2 = new File("tools/jbws-160/jbossws/simple/service/org/jboss/types/" + fname);
+ File file2 = createResourceFile("tools/jbws-160/jbossws/simple/service/org/jboss/types/" + fname);
try
{
@@ -108,7 +110,7 @@
//Match the SEI
fname = "HelloWs.java";
file1 = getResourceFile("tools/jbws-160/wscompile/simple/sei/" + fname);
- file2 = new File("tools/jbws-160/jbossws/simple/sei/org/jboss/types/" + fname);
+ file2 = createResourceFile("tools/jbws-160/jbossws/simple/sei/org/jboss/types/" + fname);
try
{
@@ -121,7 +123,7 @@
//Compare mapping files
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");
+ File genFile = createResourceFile("tools/jbws-160/jbossws/simple/mapping/jaxrpc-mapping.xml");
compareXMLFiles(expFile.toURL(), genFile.toURL());
}
@@ -134,14 +136,14 @@
wsdlJava.setTypeMapping(new LiteralTypeMapping());
WSDLDefinitions wsdl = wsdlJava.convertWSDL2Java(wsdlFile.toURL());
wsdlJava.setTypeMapping(new LiteralTypeMapping());
- wsdlJava.generateSEI(wsdl, new File("tools/jbws-160/jbossws/custom/sei"));
+ wsdlJava.generateSEI(wsdl, createResourceFile("tools/jbws-160/jbossws/custom/sei"));
//Create the Service File
//Generate the Service Interface
ServiceCreator sc = new ServiceCreator();
sc.setPackageName("org.jboss.types");
//sc.setServiceName("HelloCustomService");
- sc.setDirLocation(new File("tools/jbws-160/jbossws/custom/service"));
+ sc.setDirLocation(createResourceFile("tools/jbws-160/jbossws/custom/service"));
sc.setWsdl(wsdl);
//sc.setPortName( "HelloCustomRemote" );
sc.createServiceDescriptor();
@@ -152,14 +154,14 @@
mgf.setServiceName("HelloCustomService");
// mgf.generate();
JavaWsdlMapping jwm = mgf.generate();
- FileWriter fw = new FileWriter("tools/jbws-160/jbossws/custom/mapping" + "/" + "jaxrpc-mapping.xml");
+ FileWriter fw = new FileWriter( createResourceFile("tools/jbws-160/jbossws/custom/mapping" + "/" + "jaxrpc-mapping.xml"));
fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true));
fw.close();
//Match the Service File
String fname = "HelloCustomService.java";
File file1 = getResourceFile("tools/jbws-160/wscompile/custom/service/" + fname);
- File file2 = new File("tools/jbws-160/jbossws/custom/service/org/jboss/types/" + fname);
+ File file2 = createResourceFile("tools/jbws-160/jbossws/custom/service/org/jboss/types/" + fname);
try
{
@@ -173,7 +175,7 @@
//Match the SEI
fname = "HelloCustomRemote.java";
file1 = getResourceFile("tools/jbws-160/wscompile/custom/sei/" + fname);
- file2 = new File("tools/jbws-160/jbossws/custom/sei/org/jboss/types/" + fname);
+ file2 = createResourceFile("tools/jbws-160/jbossws/custom/sei/org/jboss/types/" + fname);
/*try
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -28,7 +28,7 @@
import java.io.FileReader;
import java.io.IOException;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
@@ -44,7 +44,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since Aug 29, 2005
*/
-public class GlobalConfigTestCase extends WSToolsTest
+public class GlobalConfigTestCase extends WSToolsBase
{
public void testJavaToWSDL() throws IOException
@@ -53,7 +53,7 @@
WSTools tools = new WSTools();
tools.generate(args);
- WSDLDefinitions wsdl = getWSDLDefinitions(new File("tools/globalconfig/wsdl/MarshallService.wsdl"));
+ WSDLDefinitions wsdl = getWSDLDefinitions(createResourceFile("tools/globalconfig/wsdl/MarshallService.wsdl"));
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
assertNotNull(xsmodel.getNamespaceItem("http://jboss.org/types"));
}
@@ -63,7 +63,7 @@
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");
+ File file = createResourceFile("tools/globalconfig/org/jboss/test/ws/StandardJavaTypes.java");
assertTrue(file.exists());
checkGeneratedClass(file);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -24,7 +24,7 @@
import java.io.File;
import java.io.Writer;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
@@ -41,7 +41,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Aug 3, 2005
*/
-public class ToolsDocLitTestCase extends WSToolsTest
+public class ToolsDocLitTestCase extends WSToolsBase
{
public void testTrivialCase() throws Exception
{
@@ -57,15 +57,15 @@
jwsdl.addFeature(WSToolsConstants.WSTOOLS_FEATURE_RESTRICT_TO_TARGET_NS, true);
WSDLDefinitions wsdl = jwsdl.generate(seiClass);
- Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlPath), Constants.DEFAULT_XML_CHARSET);
+ Writer fw = IOUtils.getCharsetFileWriter(createResourceFile(wsdlPath), Constants.DEFAULT_XML_CHARSET);
new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET);
fw.close();
String fixturefile = getResourceFile("tools/doc-lit/trivial/wsdl/SampleService.wsdl").getPath();
//Validate the generated WSDL
- File wsdlfix = new File(fixturefile);
+ File wsdlfix = createResourceFile(fixturefile);
Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
- File wsdlFile = new File(wsdlPath);
+ File wsdlFile = createResourceFile(wsdlPath);
assertNotNull("Generated WSDL File exists?", wsdlFile);
Element was = DOMUtils.parse(wsdlFile.toURL().openStream());
//assertEquals(exp, was);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -25,7 +25,7 @@
import java.io.Writer;
import org.jboss.test.ws.common.jbossxb.holders.HoldersServiceInterface;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.WSDL11Validator;
import org.jboss.test.ws.tools.validation.WSDLValidator;
@@ -51,7 +51,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Aug 2, 2005
*/
-public class StandardHoldersTestCase extends WSToolsTest
+public class StandardHoldersTestCase extends WSToolsBase
{
public void testStandardHoldersWsdlToJava() throws Exception
{
@@ -61,7 +61,7 @@
//Now validate the SEI
String fname="HoldersServiceInterface.java";
File file1 = getResourceFile("tools/holders/java/org/jboss/test/"+ fname);
- File file2 = new File("tools/org/jboss/test/" + fname);
+ File file2 = createResourceFile("tools/org/jboss/test/" + fname);
try
{
@@ -85,7 +85,7 @@
//Generate the wsdl
String wsdlDir = "tools/";
String wsdlPath = wsdlDir+ "/HolderService.wsdl";
- Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlPath), Constants.DEFAULT_XML_CHARSET);
+ Writer fw = IOUtils.getCharsetFileWriter(createResourceFile(wsdlPath), Constants.DEFAULT_XML_CHARSET);
new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET);
fw.close();
@@ -94,9 +94,9 @@
try
{
String fixturefile = getResourceFile("tools/holders/wsdl/HolderService.wsdl").getPath();
- File wsdlfix = new File(fixturefile);
+ File wsdlfix = createResourceFile(fixturefile);
Element exp = DOMUtils.parse(wsdlfix.toURL().openStream());
- File wsdlFile = new File(wsdlPath);
+ File wsdlFile = createResourceFile(wsdlPath);
assertNotNull("Generated WSDL File exists?", wsdlFile);
Element was = DOMUtils.parse(wsdlFile.toURL().openStream());
assertEquals(exp,was);
@@ -151,7 +151,7 @@
try
{
wsdljava.setTypeMapping(new LiteralTypeMapping());
- wsdljava.generateSEI(wsdl, new File(seidir));
+ wsdljava.generateSEI(wsdl, createResourceFile(seidir));
}
catch (Exception e)
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -43,7 +43,7 @@
public void testBasic() throws Exception
{
WSContractProvider gen = getGenerator();
- File outputDir = new File("tools/jaxws/wscontractprovider/basic/out");
+ File outputDir = createResourceFile("tools/jaxws/wscontractprovider/basic/out");
gen.setOutputDirectory(outputDir);
gen.provide(DocWrappedServiceImpl.class);
@@ -61,7 +61,7 @@
private void checkWrapperSource(File outputDir, boolean shouldExist)
{
File file1 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPO.java");
- File file2 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPOResponse.java");
+ File file2 = createResourceFile(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPOResponse.java");
assertEquals(shouldExist, file1.exists());
assertEquals(shouldExist, file2.exists());
}
@@ -85,7 +85,7 @@
public void testSource() throws Exception
{
WSContractProvider gen = getGenerator();
- File outputDir = new File("tools/jaxws/wscontractprovider/source/out");
+ File outputDir = createResourceFile("tools/jaxws/wscontractprovider/source/out");
gen.setOutputDirectory(outputDir);
gen.setGenerateSource(true);
gen.provide(DocWrappedServiceImpl.class);
@@ -97,8 +97,8 @@
public void testSourceDir() throws Exception
{
WSContractProvider gen = getGenerator();
- File outputDir = new File("tools/jaxws/wscontractprovider/sourcedir/out");
- File sourceDir = new File("tools/jaxws/wscontractprovider/sourcedir/source");
+ File outputDir = createResourceFile("tools/jaxws/wscontractprovider/sourcedir/out");
+ File sourceDir = createResourceFile("tools/jaxws/wscontractprovider/sourcedir/source");
gen.setOutputDirectory(outputDir);
gen.setSourceDirectory(sourceDir);
@@ -113,7 +113,7 @@
public void testWsdl() throws Exception
{
WSContractProvider gen = getGenerator();
- File outputDir = new File("tools/jaxws/wscontractprovider/wsdl/out");
+ File outputDir = createResourceFile("tools/jaxws/wscontractprovider/wsdl/out");
gen.setOutputDirectory(outputDir);
gen.setGenerateWsdl(true);
gen.provide(DocWrappedServiceImpl.class);
@@ -123,7 +123,7 @@
// There should be no source code
checkWrapperSource(outputDir, false);
- File wsdlFile = new File(outputDir, "DocWrappedService.wsdl");
+ File wsdlFile = createResourceFile(outputDir, "DocWrappedService.wsdl");
WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance();
wsdlFactory.parse(wsdlFile.toURL());
}
@@ -131,8 +131,8 @@
public void testResourceDir() throws Exception
{
WSContractProvider gen = getGenerator();
- File outputDir = new File("tools/jaxws/wscontractprovider/resourcedir/out");
- File wsdlDir = new File("tools/jaxws/wscontractprovider/resourcedir/wsdl");
+ File outputDir = createResourceFile("tools/jaxws/wscontractprovider/resourcedir/out");
+ File wsdlDir = createResourceFile("tools/jaxws/wscontractprovider/resourcedir/wsdl");
gen.setOutputDirectory(outputDir);
gen.setResourceDirectory(wsdlDir);
gen.setGenerateWsdl(true);
@@ -144,10 +144,10 @@
checkWrapperSource(outputDir, false);
String wsdlName = "DocWrappedService.wsdl";
- File wsdlFile = new File(outputDir, wsdlName);
+ File wsdlFile = createResourceFile(outputDir, wsdlName);
assertFalse(wsdlFile.exists());
- wsdlFile = new File(wsdlDir, wsdlName);
+ wsdlFile = createResourceFile(wsdlDir, wsdlName);
WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance();
wsdlFactory.parse(wsdlFile.toURL());
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -54,8 +54,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -42,7 +42,7 @@
public void testWebServicesAppend() throws Exception
{
// create output dir
- new File("tools/jbws1090").mkdirs();
+ createResourceFile("tools/jbws1090").mkdirs();
// copy webservices.xml fixture to output folder
FileInputStream src = new FileInputStream(getResourceFile("tools/metadatafixture/webservices.xml").getPath());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -90,8 +90,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -54,8 +54,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.tools.jbws1231;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
@@ -30,7 +30,7 @@
* @author darran.lofthouse(a)jboss.com
* @since 13 Jan 2007
*/
-public class JBWS1231TestCase extends WSToolsTest
+public class JBWS1231TestCase extends WSToolsBase
{
public final void testGenerate() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -46,15 +46,15 @@
JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
mappingValidator.validate(resourceDir + "/myporttype-mapping.xml", toolsDir + "/myporttype-mapping.xml");
- File expSEI = new File(resourceDir + "/My.java");
- File wasSEI = new File(toolsDir + "/org/jboss/test/ws/jbws1253/My.java");
+ File expSEI = createResourceFile(resourceDir + "/My.java");
+ File wasSEI = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1253/My.java");
JBossSourceComparator sc = new JBossSourceComparator(expSEI, wasSEI);
sc.validate();
sc.validateImports();
- File expService = new File(resourceDir + "/TestSEIService.java");
- File wasService = new File(toolsDir + "/org/jboss/test/ws/jbws1253/TestSEIService.java");
+ File expService = createResourceFile(resourceDir + "/TestSEIService.java");
+ File wasService = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1253/TestSEIService.java");
sc = new JBossSourceComparator(expService, wasService);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -134,7 +134,7 @@
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -156,7 +156,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1259");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1259");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -176,8 +176,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -871,13 +871,14 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1260/scenario_" + scenario).getPath();
- String toolsDir = "tools/jbws1260/scenario_" + scenario;
+ File resourceDir = createResourceFile("tools/jbws1260/scenario_" + scenario);
+ resourceDir.mkdirs();
+ String toolsDir = resourceDir.getAbsolutePath();
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+
+ String[] expectedFiles = resourceDir.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
return name.endsWith(".java");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -51,7 +51,7 @@
String toolsDir = "tools/jbws1278/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -73,7 +73,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1278");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1278");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -93,8 +93,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.tools.jbws1428;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
@@ -32,7 +32,7 @@
* @author darran.lofthouse(a)jboss.com
* @since 14 Dec 2006
*/
-public class JBWS1428TestCase extends WSToolsTest
+public class JBWS1428TestCase extends WSToolsBase
{
public void testGenerate() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -54,8 +54,8 @@
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);
+ File expected = createResourceFile(resourceDir + "/" + fileName);
+ File generated = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -127,7 +127,7 @@
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -155,8 +155,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -52,7 +52,7 @@
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -74,7 +74,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1453");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1453");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -95,8 +95,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -53,8 +53,8 @@
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);
+ File expected = createResourceFile(resourceDir + "/" + fileName);
+ File generated = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1455/" + fileName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -66,7 +66,7 @@
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -88,7 +88,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1534");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1534");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -108,8 +108,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.tools.jbws1538;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
@@ -30,7 +30,7 @@
* @author darran.lofthouse(a)jboss.com
* @since 28 Feb 2007
*/
-public class JBWS1538TestCase extends WSToolsTest
+public class JBWS1538TestCase extends WSToolsBase
{
public final void testGenerate() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -83,7 +83,7 @@
String toolsDir = "tools/jbws1597/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -105,7 +105,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1597");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -125,8 +125,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -54,7 +54,7 @@
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -76,7 +76,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1607");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -97,8 +97,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -53,7 +53,7 @@
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -75,7 +75,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1627");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -96,8 +96,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -80,7 +80,7 @@
Class seiClass = StandardJavaTypes.class;
String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645.wsdl").getPath();
- File wsdlDir = new File("./tools/jbws1645");
+ File wsdlDir = createResourceFile("./tools/jbws1645");
wsdlDir.mkdirs();
String sname = WSDLUtils.getJustClassName(seiClass) + "Service";
@@ -131,7 +131,7 @@
Class seiClass = StandardJavaTypes.class;
String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl").getPath();
- File wsdlDir = new File("./tools/jbws1645");
+ File wsdlDir = createResourceFile("./tools/jbws1645");
wsdlDir.mkdirs();
String sname = WSDLUtils.getJustClassName(seiClass) + "Service-Multiple";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -24,7 +24,7 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
@@ -38,7 +38,7 @@
* @author darran.lofthouse(a)jboss.com
* @since Jun 7, 2007
*/
-public class JBWS1691TestCase extends WSToolsTest
+public class JBWS1691TestCase extends WSToolsBase
{
public void testGenerateLowerCase() throws Exception
@@ -52,7 +52,7 @@
String toolsDir = "tools/jbws1691/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -74,7 +74,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1691");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -94,8 +94,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -24,7 +24,7 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
@@ -37,7 +37,7 @@
* @author darran.lofthouse(a)jboss.com
* @since Jun 6, 2007
*/
-public class JBWS1697TestCase extends WSToolsTest
+public class JBWS1697TestCase extends WSToolsBase
{
/**
@@ -68,7 +68,7 @@
String toolsDir = "tools/jbws1697/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -90,7 +90,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1697");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -110,8 +110,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -24,7 +24,7 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
@@ -38,7 +38,7 @@
* @author darran.lofthouse(a)jboss.com
* @since Jun 6, 2007
*/
-public class JBWS1698TestCase extends WSToolsTest
+public class JBWS1698TestCase extends WSToolsBase
{
/**
@@ -63,7 +63,7 @@
String toolsDir = "tools/jbws1698/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -85,7 +85,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1698");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1698");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -105,8 +105,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -55,7 +55,7 @@
String toolsDir = "tools/jbws1723/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -77,7 +77,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1723");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -97,8 +97,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -51,8 +51,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -55,7 +55,7 @@
String toolsDir = "tools/jbws1801/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -77,7 +77,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1801");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -97,8 +97,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -51,7 +51,7 @@
String toolsDir = "tools/jbws1873/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -73,7 +73,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1873");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -93,8 +93,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -51,7 +51,7 @@
String toolsDir = "tools/jbws1881/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -73,7 +73,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1881");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1881");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -93,8 +93,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -21,12 +21,9 @@
*/
package org.jboss.test.ws.tools.jbws2018;
-import java.io.File;
-
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.test.JBossWSTest;
/**
* JBWS-2018 - Test the support of multiple namespace to multiple
@@ -35,7 +32,7 @@
* @author mageshbk(a)jboss.com
* @since 10 March 2008
*/
-public class JBWS2018TestCase extends WSToolsTest
+public class JBWS2018TestCase extends WSToolsBase
{
public final void testMultiplePackageNameSpace() throws Exception
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -51,7 +51,7 @@
String toolsDir = "tools/jbws2019/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -73,7 +73,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2019");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws2019");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -93,8 +93,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -24,7 +24,7 @@
import java.io.File;
import java.io.FilenameFilter;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
import org.jboss.ws.tools.WSTools;
@@ -37,7 +37,7 @@
* @author darran.lofthouse(a)jboss.com
* @since 11 Apr 2007
*/
-public class JBWS429TestCase extends WSToolsTest
+public class JBWS429TestCase extends WSToolsBase
{
/**
@@ -79,7 +79,7 @@
String toolsDir = "tools/jbws429/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
+ File resourceDirFile = createResourceFile(resourceDir);
String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
public boolean accept(File dir, String name)
{
@@ -101,7 +101,7 @@
}
}
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws429");
+ File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws429");
String[] generatedFiles = packageDir.list();
for (int i = 0; i < generatedFiles.length; i++)
{
@@ -121,8 +121,8 @@
private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(expectedName);
- File generated = new File(generatedName);
+ File expected = createResourceFile(expectedName);
+ File generated = createResourceFile(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -64,8 +64,8 @@
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);
+ File expected = createResourceFile(resourceDir + "/" + type + "/" + fileName);
+ File generated = createResourceFile(toolsDir + "/" + type + "/org/jboss/test/ws/jbws810/" + fileName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardArraysTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -27,7 +27,7 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.Constants;
import org.jboss.ws.tools.JavaToXSD;
import org.jboss.wsf.common.DOMUtils;
@@ -39,7 +39,7 @@
* @since Jul 19, 2005
*/
-public class StandardArraysTestCase extends WSToolsTest
+public class StandardArraysTestCase extends WSToolsBase
{
private JavaToXSD jxsd = null;
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_204/StandardDoubleArraysTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -27,7 +27,7 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.Constants;
import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Element;
@@ -37,7 +37,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Aug 31, 2005
*/
-public class StandardDoubleArraysTestCase extends WSToolsTest
+public class StandardDoubleArraysTestCase extends WSToolsBase
{
private String WSCOMPILE_SCHEMA = "xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://www.w3.org/2001/XMLSchema'";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -23,7 +23,7 @@
import java.io.File;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.tools.WSTools;
/**
@@ -32,7 +32,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Sep 25, 2005
*/
-public abstract class JBWS206Test extends WSToolsTest
+public abstract class JBWS206Test extends WSToolsBase
{
public abstract String getBase();
@@ -65,8 +65,8 @@
String seiName = getSEIName() + ".java";
String sei = fixBase + "/sei/" + seiName;
// Check the sei
- // assertExactSourceFiles(new File(sei), new File(out_dir + "/client/" + packageDir + "/" + seiName ));
- assertExactSourceFiles(new File(sei), new File(out_dir + "/" + packageDir + "/" + seiName));
+ // assertExactSourceFiles(createResourceFile(sei), createResourceFile(out_dir + "/client/" + packageDir + "/" + seiName ));
+ assertExactSourceFiles(createResourceFile(sei), createResourceFile(out_dir + "/" + packageDir + "/" + seiName));
}
public void checkServiceInterface() throws Exception
@@ -78,8 +78,8 @@
String serviceName = getServiceName();
// Check the Service File
- assertExactSourceFiles(new File(fixBase + "/service/" + serviceName + ".java"), new File(out_dir + "/" + packageDir + "/" + serviceName + ".java"));
- //new File(out_dir + "/client/" + packageDir + "/" + serviceName + ".java" ));
+ assertExactSourceFiles(createResourceFile(fixBase + "/service/" + serviceName + ".java"), createResourceFile(out_dir + "/" + packageDir + "/" + serviceName + ".java"));
+ //createResourceFile(out_dir + "/client/" + packageDir + "/" + serviceName + ".java" ));
}
public final void checkUserType(String name) throws Exception
@@ -89,8 +89,8 @@
String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase();
// Check User Types
- assertExactSourceFiles(new File(fixBase + "/usertypes/" + name), new File(out_dir + "/" + packageDir + "/" + name));
- //new File(out_dir + "/client/" + packageDir + "/" + name ));
+ assertExactSourceFiles(createResourceFile(fixBase + "/usertypes/" + name), createResourceFile(out_dir + "/" + packageDir + "/" + name));
+ //createResourceFile(out_dir + "/client/" + packageDir + "/" + name ));
}
protected final void generate() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -21,9 +21,7 @@
*/
package org.jboss.test.ws.tools.jbws_211.tests;
-import java.io.File;
-
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.ws.tools.WSTools;
/**
@@ -32,7 +30,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Sep 24, 2005
*/
-public abstract class JBWS211Test extends WSToolsTest
+public abstract class JBWS211Test extends WSToolsBase
{
protected abstract String getBase();
@@ -46,7 +44,7 @@
protected void setUp()
{
String out_dir = "tools/jbws-211/jbossws/" + getBase();
- new File(out_dir + "/wsdl").mkdirs();
+ createResourceFile(out_dir + "/wsdl").mkdirs();
}
public final void testJava2WSDL() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -46,7 +46,7 @@
super.setUp();
JBOSS_HOME = System.getProperty("jboss.home");
- TEST_EXEC_DIR = new File(".").getPath();
+ TEST_EXEC_DIR = createResourceFile(".").getPath();
JDK_HOME = System.getProperty("jdk.home");
OS = System.getProperty("os.name").toLowerCase();
}
@@ -59,8 +59,8 @@
}
// use absolute path for the output to be re-usable
- String absToolsConfig = new File(TOOLS_CONFIG).getAbsolutePath();
- String absOutput = new File("wstools/java").getAbsolutePath();
+ String absToolsConfig = createResourceFile(TOOLS_CONFIG).getAbsolutePath();
+ String absOutput = createResourceFile("wstools/java").getAbsolutePath();
String command = JBOSS_HOME + "/bin/wstools.sh -config " + TOOLS_CONFIG + " -dest wstools/java";
Process p = executeCommand(command);
@@ -68,7 +68,7 @@
// check status code
assertStatusCode(p, "wstools");
- File javaSource = new File("wstools/java/org/jboss/test/ws/jbws810/PhoneBookService.java");
+ File javaSource = createResourceFile("wstools/java/org/jboss/test/ws/jbws810/PhoneBookService.java");
assertTrue("Service endpoint interface not generated", javaSource.exists());
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -41,6 +41,7 @@
import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping;
import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
+import org.jboss.wsf.test.JBossWSTest;
/**
* Validates a JAXRPC Mapping File against another
@@ -62,8 +63,8 @@
public boolean validate(String mappingFile1, String mappingFile2) throws Exception
{
JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance();
- JavaWsdlMapping javaWsdlMapping1 = mappingFactory.parse(new File(mappingFile1).toURL());
- JavaWsdlMapping javaWsdlMapping2 = mappingFactory.parse(new File(mappingFile2).toURL());
+ JavaWsdlMapping javaWsdlMapping1 = mappingFactory.parse( new File(mappingFile1).toURL());
+ JavaWsdlMapping javaWsdlMapping2 = mappingFactory.parse( new File(mappingFile2).toURL());
return validate(javaWsdlMapping1, javaWsdlMapping2);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -30,13 +30,13 @@
import org.apache.xerces.xs.XSModel;
import org.apache.xerces.xs.XSNamedMap;
import org.apache.xerces.xs.XSObject;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
/** All the XML schema related test cases
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Mar 17, 2005
*/
-public class XMLSchemaTestCase extends WSToolsTest
+public class XMLSchemaTestCase extends WSToolsBase
{
/**
* Given a set of xml schemas, check if the xmltype
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -77,7 +77,7 @@
public void createDir(String path)
{
- File file = new File(path);
+ File file = createResourceFile(path);
if (file.exists() == false)
file.mkdirs();
}
@@ -229,7 +229,7 @@
ct.setParticle(xsp);
xsmodel.addXSComplexTypeDefinition(ct); //Always add global complex types to global types
//Lets write the schema into a file
- File xsdOutFile = new File("tools/wsdlwritedir/HelloObj.xsd");
+ File xsdOutFile = createResourceFile("tools/wsdlwritedir/HelloObj.xsd");
xsdOutFile.delete();
xsmodel.writeTo(new FileOutputStream(xsdOutFile));
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -23,7 +23,7 @@
import java.io.File;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.tools.XSDToJava;
@@ -36,7 +36,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Mar 10, 2005
*/
-public class AnonymousTypesTestCase extends WSToolsTest
+public class AnonymousTypesTestCase extends WSToolsBase
{
protected String genPath = "tools/xsd-java-checker/jbossws/anontypes";
@@ -53,13 +53,13 @@
String genPath = "tools/xsd-java-checker/jbossws/anontypes/";
this.mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
xsdJava.setTypeMapping(new LiteralTypeMapping());
xsdJava.generateJavaSource(schemaFile, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "Items.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/anontypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
@@ -67,7 +67,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "ItemsItem.java";
- file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
file1 = getResourceFile("tools/xsd-java-checker/wscompile/anontypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -23,7 +23,7 @@
import java.io.File;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.tools.XSDToJava;
@@ -36,7 +36,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Mar 10, 2005
*/
-public class ComplexTypesTestCase extends WSToolsTest
+public class ComplexTypesTestCase extends WSToolsBase
{
protected String genPath = "tools/xsd-java-checker/jbossws/complextypes";
@@ -51,12 +51,12 @@
String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsOnly.xsd").getPath();
this.mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
generateJavaSource(schemaFile, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "USAddress.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Mismatch", sc.validate());
@@ -64,7 +64,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "Country.java";
- file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Mismatch", sc.validate());
@@ -83,12 +83,12 @@
String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsAttrib.xsd").getPath();
this.mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
generateJavaSource(schemaFile, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "Address.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
@@ -106,12 +106,12 @@
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
generateJavaSource(filename, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "GlobalPrice.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
@@ -129,12 +129,12 @@
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
generateJavaSource(filename, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "Price.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/emptycontent/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
@@ -151,12 +151,12 @@
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
- File dir = new File(genPath + "/occurrence");
+ File dir = createResourceFile(genPath + "/occurrence");
generateJavaSource(filename, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "President.java";
- File file2 = new File(genPath + "/occurrence/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/occurrence/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/occurrence/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
@@ -174,12 +174,12 @@
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
generateJavaSource(filename, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "AwardEmployee.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/inheritance/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
@@ -187,7 +187,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "Employee.java";
- file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/inheritance/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
@@ -209,12 +209,12 @@
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath + "/groups");
- File dir = new File(genPath + "/groups");
+ File dir = createResourceFile(genPath + "/groups");
generateJavaSource(filename, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "Teacher.java";
- File file2 = new File(genPath + "/groups" + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/groups" + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/groups/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -23,7 +23,7 @@
import java.io.File;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.tools.XSDToJava;
@@ -35,7 +35,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Mar 10, 2005
*/
-public class NillableTypesTestCase extends WSToolsTest
+public class NillableTypesTestCase extends WSToolsBase
{
protected String genPath = "tools/xsd-java-checker/jbossws/nillabletypes";
@@ -54,13 +54,13 @@
String filename = getResourceFile("tools/xsd/nillabletypes/Nillable.xsd").getPath();
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
xsdJava.setTypeMapping(new LiteralTypeMapping());
xsdJava.generateJavaSource(filename, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "NillableType.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/nillabletypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -23,7 +23,7 @@
import java.io.File;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.tools.XSDToJava;
@@ -36,7 +36,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Mar 10, 2005
*/
-public class ReferencesTestCase extends WSToolsTest
+public class ReferencesTestCase extends WSToolsBase
{
protected String genPath = "tools/xsd-java-checker/jbossws/references";
@@ -52,13 +52,13 @@
String packagename = "org.jboss.ws.types";
this.mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
xsdJava.setTypeMapping(new LiteralTypeMapping());
xsdJava.generateJavaSource(filename, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "ElemAttribRef.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match::ElemAttribRef.java::", sc.validate());
@@ -66,7 +66,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "Address.java";
- file2 = new File( genPath + "/org/jboss/ws/types/" + fname);
+ file2 = createResourceFile( genPath + "/org/jboss/ws/types/" + fname);
file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match::Address.java::", sc.validate());
@@ -74,7 +74,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "Employee.java";
- file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:Employee.java::", sc.validate());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -30,14 +30,14 @@
import org.apache.xerces.xs.XSModel;
import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
/**
* Tests handling of schema annotations by JBossWS Tools
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Aug 17, 2005
*/
-public class SchemaAnnotationsTestCase extends WSToolsTest
+public class SchemaAnnotationsTestCase extends WSToolsBase
{
/**
* Check XSD Annotation
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-05-07 19:31:12 UTC (rev 6946)
@@ -23,7 +23,7 @@
import java.io.File;
-import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.WSToolsBase;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
import org.jboss.ws.tools.XSDToJava;
@@ -36,7 +36,7 @@
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
* @since Mar 10, 2005
*/
-public class SimpleTypesTestCase extends WSToolsTest
+public class SimpleTypesTestCase extends WSToolsBase
{
protected String genPath = "tools/xsd-java-checker/jbossws/simpletypes";
@@ -52,13 +52,13 @@
String packagename = "org.jboss.ws.types";
mkdirs(genPath);
- File dir = new File(genPath);
+ File dir = createResourceFile(genPath);
xsdJava.setTypeMapping(new LiteralTypeMapping());
xsdJava.generateJavaSource(filename, dir, packagename, true);
//Compare the generated Java type against the one generated by wscompile
String fname = "TypicalPerson.java";
- File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ File file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
File file1 = getResourceFile("tools/xsd-java-checker/wscompile/simpletypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
@@ -69,7 +69,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "USMidwest.java";
- file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
+ file2 = createResourceFile(genPath + "/org/jboss/ws/types/" + fname);
file1 = getResourceFile("tools/xsd-java-checker/wscompile/simpletypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/wsdl2javaglobal.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/wsdl2javaglobal.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/wsdl2javaglobal.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.ws" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="test-resources/tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.attachment" namespace="http://org.jboss.ws/attachment"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.inoutparameters" namespace="http://org.jboss.ws/holder"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.oneway" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.outparameters" namespace="http://org.jboss.ws/holder"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.usertypes" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.wsdlimport" namespace="http://jboss.org/wsdlimport"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.wsdlimportwithusertypes" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/>
+ <wsdl-java location="${test.resources.directory}/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1079/Anonymous.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1079/Anonymous.wsdl" parameter-style="bare">
<mapping file="anonymous-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1170/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1170/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1170/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1170/HyphenatedElementName.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1170/HyphenatedElementName.wsdl" parameter-style="bare">
<mapping file="wrapper-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1184/scenario_A/TestEndpoint.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1184/scenario_B/TestEndpoint.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1217/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1217/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1217/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -4,7 +4,7 @@
<package-namespace package="org.jboss.test.ws.jbws1217.base" namespace="http://com.other.base"/>
<package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws.jbws1217"/>
</global>
- <wsdl-java location="test-resources/tools/jbws1217/MultiplePackageNamespace.wsdl">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1217/MultiplePackageNamespace.wsdl">
<mapping file="jaxrpc-mapping.xml" />
</wsdl-java>
</configuration>
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1253/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1253/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1253/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1253/MyPortTypeService.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1253/MyPortTypeService.wsdl" parameter-style="bare">
<mapping file="myporttype-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_A/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_A/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_A/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1259/scenario_A/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1259/scenario_A/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_B/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_B/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_B/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1259/scenario_B/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1259/scenario_B/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_C/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_C/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_C/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1259/scenario_C/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1259/scenario_C/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_D/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_D/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1259/scenario_D/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1259/scenario_D/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1259/scenario_D/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_A/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_A/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_A/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AA/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AA/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AA/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_AA/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_AA/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_AB/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_AB/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_AC/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_AC/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_AD/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_AD/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_AE/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_AE/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_AF/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_AF/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AG/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_AG/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_AG/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AH/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AH/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AH/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_AH/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_AH/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_B/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_B/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_B/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_C/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_C/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_C/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_D/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_D/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_D/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_E/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_E/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_E/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_F/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_F/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_G/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_G/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_G/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_G/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_G/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_H/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_H/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_H/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_H/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_H/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_I/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_I/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_I/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_I/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_I/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_J/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_J/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_J/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_J/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_J/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_K/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_K/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_K/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_K/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_K/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_L/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_L/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_L/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_L/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_L/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_M/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_M/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_M/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_N/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_N/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_N/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_O/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_O/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_O/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_P/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_P/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_P/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Q/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_Q/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_Q/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_R/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_R/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_R/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_S/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_S/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_S/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_T/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_T/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_T/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_T/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_T/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_U/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_U/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_U/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_U/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_U/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_V/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_V/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_V/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_V/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_V/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_W/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_W/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_W/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_W/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_W/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_X/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_X/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_X/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_X/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_X/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Y/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Y/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Y/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_Y/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_Y/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Z/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Z/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_Z/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1260/scenario_Z/Wrapped.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1260/scenario_Z/Wrapped.wsdl" parameter-style="wrapped">
<mapping file="wrapped-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1278/doclit/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1278/doclit/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1278/doclit/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1278/doclit/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1278/doclit/PhoneBook.wsdl"
parameter-style="bare"
serializable-types="true">
<mapping file="jaxrpc-mapping.xml"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1441/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1441/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1441/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1441/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1441/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1450/scenario_A/TestEndpoint.wsdl" parameter-style="wrapped">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1450/scenario_B/TestEndpoint.wsdl" parameter-style="wrapped">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1450/scenario_C/TestEndpoint.wsdl" parameter-style="wrapped">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1450/scenario_D/TestEndpoint.wsdl" parameter-style="wrapped">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1453/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1453/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1453/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1453/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1453/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1455/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1455/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1455/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1455/TestEndpoint.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1455/TestEndpoint.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1534/bare/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1534/bare/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1534/bare/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1534/bare/TestEndpoint.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1534/bare/TestEndpoint.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1534/wrapped/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1534/wrapped/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1534/wrapped/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1534/wrapped/TestEndpoint.wsdl" parameter-style="wrapped">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1534/wrapped/TestEndpoint.wsdl" parameter-style="wrapped">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1536/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1536/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1536/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <wsdl-java location="test-resources/tools/jbws1536/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1536/PhoneBook.wsdl" parameter-style="bare">
<webservices ejb-link="PhoneBook" />
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1597/doclit_in/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1597/doclit_in/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1597/doclit_inout/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1597/doclit_out/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1597/doclit_out/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1597/rpclit_in/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1597/rpclit_inout/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1597/rpclit_out/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1607/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1607/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1607/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1607/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1607/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1627/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1627/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1627/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1698/error/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1698/error/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1698/error/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1698/error/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1698/error/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1698/fault/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1698/fault/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1698/fault/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1698/fault/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1698/fault/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1723/doclit_in/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1723/doclit_in/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1723/rpclit_in/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1725/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1725/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1725/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <wsdl-java location="test-resources/tools/jbws1725/Extension.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws1725/Extension.wsdl" parameter-style="bare">
<mapping file="extended-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1801/doclit/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1801/doclit/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1801/doclit/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1801/doclit/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1873/doclit/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1873/doclit/PhoneBook.wsdl"
parameter-style="wrapped">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1881/doclit/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1881/doclit/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws1881/doclit/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws1881/doclit/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2019/doclit/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2019/doclit/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2019/doclit/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws2019/doclit/PhoneBook.wsdl"
+ <wsdl-java location="${test.resources.directory}/tools/jbws2019/doclit/PhoneBook.wsdl"
parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/doclit_inout/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/doclit_inout/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/doclit_inout/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws429/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws429/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/rpclit_inout/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws429/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/rpclit_out/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/rpclit_out/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws429/rpclit_out/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws429/rpclit_out/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws429/rpclit_out/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws810/document/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws810/document/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws810/document/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws810/document/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws810/document/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws810/rpc/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws810/rpc/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws810/rpc/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/jbws810/rpc/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/jbws810/rpc/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/scripts/wstools-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/scripts/wstools-config.xml 2008-05-07 16:16:10 UTC (rev 6945)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/scripts/wstools-config.xml 2008-05-07 19:31:12 UTC (rev 6946)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="test-resources/tools/scripts/PhoneBook.wsdl" parameter-style="bare">
+ <wsdl-java location="${test.resources.directory}/tools/scripts/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6945 - stack/metro/trunk/modules/testsuite/metro-tests.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-07 12:16:10 -0400 (Wed, 07 May 2008)
New Revision: 6945
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/pom.xml
Log:
Add dependency on metro-client
Modified: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-07 16:13:36 UTC (rev 6944)
+++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-07 16:16:10 UTC (rev 6945)
@@ -13,6 +13,15 @@
<version>3.0.2-SNAPSHOT</version>
</parent>
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.metro</groupId>
+ <artifactId>jbossws-metro-client</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
<!-- Plugins -->
<build>
<plugins>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6944 - framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-07 12:13:36 -0400 (Wed, 07 May 2008)
New Revision: 6944
Modified:
framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
Log:
fix encoding issue
Modified: framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2008-05-07 16:04:12 UTC (rev 6943)
+++ framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2008-05-07 16:13:36 UTC (rev 6944)
@@ -1,9 +1,7 @@
<!--
-This wsdl is only used for client artifact generation
+ This wsdl is only used for client artifact generation
-wsconsume -k -s output/wsconsume src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
-
-$Id$
+ wsconsume -k -s output/wsconsume src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
-->
<definitions name="RegistrationService" targetNamespace="http://complex.jaxws.ws.test.jboss.org/" xmlns:tns="http://complex.jaxws.ws.test.jboss.org/" xmlns:ns1="http://types.complex.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://extra.complex.jaxws.ws.test.jboss.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
<import namespace="http://types.complex.jaxws.ws.test.jboss.org/" location="Registration_PortType.wsdl"/>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6943 - framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-07 12:04:12 -0400 (Wed, 07 May 2008)
New Revision: 6943
Modified:
framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
Log:
fix encoding issue
Modified: framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2008-05-07 15:49:26 UTC (rev 6942)
+++ framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2008-05-07 16:04:12 UTC (rev 6943)
@@ -12,4 +12,4 @@
<soap:address location="http://@jboss.bind.address@:8080/jaxws-complex/RegistrationService"/>
</port>
</service>
-</definitions>
+</definitions>
\ No newline at end of file
16 years, 7 months
- 1
- 0
JBossWS SVN: r6942 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 11:49:26 -0400 (Wed, 07 May 2008)
New Revision: 6942
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
Log:
Added createResourceFile()
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-05-07 15:10:31 UTC (rev 6941)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-05-07 15:49:26 UTC (rev 6942)
@@ -136,6 +136,19 @@
return delegate.getResourceFile(resource);
}
+ public static File createResourceFile(String filename)
+ {
+ File resDir = new File(JBossWSTestHelper.getTestResourcesDir());
+ File file = new File( resDir.getAbsolutePath() + File.separator + filename);
+ return file;
+ }
+
+ public static File createResourceFile(File parent, String filename)
+ {
+ File file = new File( parent, filename);
+ return file;
+ }
+
public URL getResourceURL(String resource) throws MalformedURLException
{
return delegate.getResourceFile(resource).toURL();
16 years, 7 months
- 1
- 0