[jbossws-commits] JBossWS SVN: r6626 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel and 37 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Apr 23 04:31:03 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-23 04:31:03 -0400 (Wed, 23 Apr 2008)
New Revision: 6626
Modified:
stack/native/trunk/.classpath
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
stack/native/trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
stack/native/trunk/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml
stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml
Log:
Fix test regression due to changed test output dirs
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/.classpath 2008-04-23 08:31:03 UTC (rev 6626)
@@ -38,7 +38,7 @@
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
<classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/>
<classpathentry kind="lib" path="thirdparty/jettison.jar" sourcepath="thirdparty/jettison-src.jar"/>
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -66,7 +66,7 @@
String processFileName = processFiles[i];
// check file exists before dispatching to server
- File processFile = new File(processFileName);
+ File processFile = getArchiveFile(processFileName);
if (!processFile.exists())
throw new FileNotFoundException(processFileName);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -44,7 +44,7 @@
public static Test suite()
{
JBossWSTestSetup wsTestSetup = new JBossWSTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar");
- return new JbpmBpelTestSetup(wsTestSetup, new String[] { "libs/jaxrpc-samples-wsbpel-hello-process.zip" });
+ return new JbpmBpelTestSetup(wsTestSetup, new String[] { "jaxrpc-samples-wsbpel-hello-process.zip" });
}
protected void setUp() throws Exception
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -64,7 +64,7 @@
// Setup the classpath - do not modify this lightheartedly.
// Maybe you should extend the Class-Path in the MANIFEST instead.
- StringBuffer cp = new StringBuffer("./classes");
+ StringBuffer cp = new StringBuffer("./test-classes");
cp.append(":" + jbc + "/jbossws-client.jar");
if (isTargetJBoss50())
{
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -99,7 +99,7 @@
private WSDLDefinitions getWSDLDefinitions(Class seiClass, String wsdlFileName) throws Exception
{
- File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + wsdlFileName);
+ File wsdlFile = getResourceFile("tools/wsdlfixture/" + wsdlFileName);
assertTrue(wsdlFile.exists());
WSDLDefinitions wsdlDefinitions = getWSDLDefinitions(wsdlFile);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -93,7 +93,7 @@
//Match the Service File
String fname = "HelloWsService.java";
- File file1 = new File(getResourceFile("tools/jbws-160/wscompile/simple/service/").getPath() + fname);
+ File file1 = getResourceFile("tools/jbws-160/wscompile/simple/service/" + fname);
File file2 = new File("tools/jbws-160/jbossws/simple/service/org/jboss/types/" + fname);
try
@@ -107,7 +107,7 @@
//Match the SEI
fname = "HelloWs.java";
- file1 = new File(getResourceFile("tools/jbws-160/wscompile/simple/sei/").getPath() + fname);
+ file1 = getResourceFile("tools/jbws-160/wscompile/simple/sei/" + fname);
file2 = new File("tools/jbws-160/jbossws/simple/sei/org/jboss/types/" + fname);
try
@@ -158,7 +158,7 @@
//Match the Service File
String fname = "HelloCustomService.java";
- File file1 = new File(getResourceFile("tools/jbws-160/wscompile/custom/service/").getPath() + fname);
+ File file1 = getResourceFile("tools/jbws-160/wscompile/custom/service/" + fname);
File file2 = new File("tools/jbws-160/jbossws/custom/service/org/jboss/types/" + fname);
try
@@ -172,7 +172,7 @@
//Match the SEI
fname = "HelloCustomRemote.java";
- file1 = new File(getResourceFile("tools/jbws-160/wscompile/custom/sei/").getPath() + fname);
+ file1 = getResourceFile("tools/jbws-160/wscompile/custom/sei/" + fname);
file2 = new File("tools/jbws-160/jbossws/custom/sei/org/jboss/types/" + fname);
/*try
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -60,7 +60,7 @@
generateSEI(wsdlDefinitions);
//Now validate the SEI
String fname="HoldersServiceInterface.java";
- File file1 = new File(getResourceFile("tools/holders/java/org/jboss/test/").getPath() + fname);
+ File file1 = getResourceFile("tools/holders/java/org/jboss/test/"+ fname);
File file2 = new File("tools/org/jboss/test/" + fname);
try
@@ -134,7 +134,7 @@
private WSDLDefinitions getWSDLDefinitions(String wsdlFileName) throws Exception
{
- File wsdlFile = new File(getResourceFile("tools/holders/wsdl/").getPath() + wsdlFileName);
+ File wsdlFile = getResourceFile("tools/holders/wsdl/" + wsdlFileName);
assertTrue("WSDL File exists?",wsdlFile.exists());
WSDLDefinitionsFactory wsdlFactory = WSDLDefinitionsFactory.newInstance();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -76,7 +76,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1184/scenario_").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1184/scenario_" + scenario).getPath();
String toolsDir = "tools/jbws1184/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -129,7 +129,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1259/scenario_").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1259/scenario_" + scenario).getPath();
String toolsDir = "tools/jbws1259/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -871,7 +871,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1260/scenario_").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1260/scenario_" + scenario).getPath();
String toolsDir = "tools/jbws1260/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -47,7 +47,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1278/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1278/" + scenario).getPath();
String toolsDir = "tools/jbws1278/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -122,7 +122,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1450/scenario_").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1450/scenario_" + scenario).getPath();
String toolsDir = "tools/jbws1450/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -61,7 +61,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1534/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1534/" + scenario).getPath();
String toolsDir = "tools/jbws1534/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -79,7 +79,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1597/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1597/" + scenario).getPath();
String toolsDir = "tools/jbws1597/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -48,7 +48,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1691/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1691/" + scenario).getPath();
String toolsDir = "tools/jbws1691/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -64,7 +64,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1697/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1697/" + scenario).getPath();
String toolsDir = "tools/jbws1697/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -59,7 +59,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1698/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1698/" + scenario).getPath();
String toolsDir = "tools/jbws1698/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -51,7 +51,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1723/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1723/" + scenario).getPath();
String toolsDir = "tools/jbws1723/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -51,7 +51,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1801/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1801/" + scenario).getPath();
String toolsDir = "tools/jbws1801/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -47,7 +47,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1873/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1873/" + scenario).getPath();
String toolsDir = "tools/jbws1873/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1881/JBWS1881TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -47,7 +47,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws1881/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws1881/" + scenario).getPath();
String toolsDir = "tools/jbws1881/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -47,7 +47,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws2019/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws2019/" + scenario).getPath();
String toolsDir = "tools/jbws2019/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -75,7 +75,7 @@
protected void generateScenario(final String scenario) throws Exception
{
- String resourceDir = getResourceFile("tools/jbws429/").getPath() + scenario;
+ String resourceDir = getResourceFile("tools/jbws429/" + scenario).getPath();
String toolsDir = "tools/jbws429/" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -59,7 +59,7 @@
public void checkServiceEndpointInterface() throws Exception
{
String out_dir = "tools/jbws-206/jbossws/" + getBase();
- String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/").getPath() + getBase();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
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/").getPath() + getBase();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
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/").getPath() + getBase();
+ String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath();
String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase();
// Check User Types
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -57,7 +57,7 @@
return;
}
String out_dir = "tools/jbws-211/jbossws/" + getBase();
- String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/").getPath() + getWSDLName();
+ String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName()).getPath();
String configStr = getBase().replaceAll("/", "");
String configloc = getResourceFile("tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml").getPath();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -44,8 +44,8 @@
public void testExactSourceFiles() throws Exception
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/actual/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/actual/" + fname);
sc= new JBossSourceComparator(file1,file2);
assertTrue("Source Files Match:",sc.validate());
sc.validateImports();
@@ -57,8 +57,8 @@
public void testMissingMethod()
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/missingmethod/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/missingmethod/" + fname);
try
{
sc= new JBossSourceComparator(file1,file2);
@@ -83,8 +83,8 @@
public void testMissingParam()
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/missingparam/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/missingparam/" + fname);
try
{
sc= new JBossSourceComparator(file1,file2);
@@ -109,8 +109,8 @@
public void testMissingImports()
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/missingimport/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/missingimport/" + fname);
try
{
sc= new JBossSourceComparator(file1,file2);
@@ -135,8 +135,8 @@
public void testDifferentMethodOrder()
{
String fname="PrimitiveTypes.java";
- File file1 = new File(getResourceFile("tools/sourcecomp/expected/").getPath() + fname);
- File file2 = new File(getResourceFile("tools/sourcecomp/diffmethodorder/").getPath() + fname);
+ File file1 = getResourceFile("tools/sourcecomp/expected/" + fname);
+ File file2 = getResourceFile("tools/sourcecomp/diffmethodorder/" + fname);
try
{
sc= new JBossSourceComparator(file1,file2);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -45,7 +45,7 @@
public void testXMLTypeReturned()
{
String filename = "StandardJavaTypesService_DOC_11.wsdl";
- File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename);
+ File wsdlFile = getResourceFile("tools/wsdlfixture/" + filename);
WSDLTypes types = null;
try
{
@@ -69,7 +69,7 @@
public void testXMLSchemaReturned()
{
String filename = "StandardJavaTypesService_DOC_11.wsdl";
- File wsdlFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename);
+ File wsdlFile = getResourceFile("tools/wsdlfixture/" + filename);
WSDLTypes types = null;
try
{
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xmlschema/XMLSchemaTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -46,7 +46,7 @@
public void testXMLTypeReturned() throws MalformedURLException
{
String filename = "CustomInterface20.xsd";
- File xsdFile = new File(getResourceFile("tools/wsdlfixture/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/wsdlfixture/" + filename);
XSModel xsmodel = parseSchema(xsdFile.toURL());
assertNotNull("XSModel is null?", xsmodel);
XSNamedMap xsmap = xsmodel.getComponentsByNamespace(XSConstants.ELEMENT_DECLARATION, "http://org.jboss.ws/types");
@@ -60,7 +60,7 @@
public void testXSDInclude() throws MalformedURLException
{
String filename = "SchemaMain.xsd";
- File xsdFile = new File(getResourceFile("tools/xsd/schemainclude/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/xsd/schemainclude/" + filename);
assertTrue("Does Schema file exist?", xsdFile.exists());
XSModel xsmodel = parseSchema(xsdFile.toURL());
assertNotNull("XSModel is null?", xsmodel);
@@ -76,7 +76,7 @@
public void testBadXSDInclude()
{
String filename = "SchemaBadMain.xsd";
- File xsdFile = new File(getResourceFile("tools/xsd/schemainclude/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/xsd/schemainclude/" + filename);
try
{
XSModel xsmodel = parseSchema(xsdFile.toURL());
@@ -96,7 +96,7 @@
public void testXSDImport() throws MalformedURLException
{
String filename = "SchemaMain.xsd";
- File xsdFile = new File(getResourceFile("tools/xsd/schemaimport/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/xsd/schemaimport/" + filename);
//Create an Hashmap of <namespace,URL>
Map schemaMap = new HashMap();
schemaMap.put("http://org.jboss.ws/types", xsdFile.toURL());
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -49,7 +49,7 @@
{
String filename = "AnonTypes.xsd";
String packagename = "org.jboss.ws.types";
- String schemaFile = getResourceFile("tools/xsd/anontypes/").getPath() + filename;
+ String schemaFile = getResourceFile("tools/xsd/anontypes/" + filename).getPath();
String genPath = "tools/xsd-java-checker/jbossws/anontypes/";
this.mkdirs(genPath);
@@ -59,9 +59,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "Items.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/anontypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/anontypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -69,7 +68,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "ItemsItem.java";
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/anontypes/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/anontypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -56,18 +56,16 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "USAddress.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Mismatch", sc.validate());
sc.validateImports();
//Compare the generated Java type against the one generated by wscompile
fname = "Country.java";
- base = getResourceFile("tools/xsd-java-checker").getPath();
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/complextypes/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Mismatch", sc.validate());
sc.validateImports();
@@ -90,9 +88,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "Address.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -114,9 +111,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "GlobalPrice.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -138,9 +134,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "Price.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/emptycontent/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/emptycontent/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -161,9 +156,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "President.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/occurrence/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/occurrence/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/occurrence/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -185,9 +179,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "AwardEmployee.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/inheritance/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/inheritance/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -195,7 +188,7 @@
//Compare the generated Java type against the one generated by wscompile
fname = "Employee.java";
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/complextypes/inheritance/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/inheritance/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
@@ -221,9 +214,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "Teacher.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/groups" + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/complextypes/groups/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/complextypes/groups/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -60,9 +60,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "NillableType.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/nillabletypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/nillabletypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -58,27 +58,24 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "ElemAttribRef.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/references/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match::ElemAttribRef.java::", sc.validate());
sc.validateImports();
//Compare the generated Java type against the one generated by wscompile
fname = "Address.java";
- base = getResourceFile("tools/xsd-java-checker").getPath();
file2 = new File( genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/references/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match::Address.java::", sc.validate());
sc.validateImports();
//Compare the generated Java type against the one generated by wscompile
fname = "Employee.java";
- base = getResourceFile("tools/xsd-java-checker").getPath();
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/references/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/references/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:Employee.java::", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SchemaAnnotationsTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -46,7 +46,7 @@
public void testXSDAnnotations() throws MalformedURLException
{
String filename = "xsdAnnotation.xsd";
- File xsdFile = new File(getResourceFile("tools/xsd/annotations/").getPath() + filename);
+ File xsdFile = getResourceFile("tools/xsd/annotations/" + filename);
XSModel xsmodel = parseSchema(xsdFile.toURL());
assertNotNull("XSModel is null?", xsmodel);
XSObjectList xsobjlist = xsmodel.getAnnotations();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-04-23 08:31:03 UTC (rev 6626)
@@ -58,9 +58,8 @@
//Compare the generated Java type against the one generated by wscompile
String fname = "TypicalPerson.java";
- String base = getResourceFile("tools/xsd-java-checker").getPath();
File file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- File file1 = new File(base + "/wscompile/simpletypes/" + fname);
+ File file1 = getResourceFile("tools/xsd-java-checker/wscompile/simpletypes/" + fname);
JBossSourceComparator sc = new JBossSourceComparator(file1, file2);
@@ -70,9 +69,8 @@
//Compare the generated Java type against the one generated by wscompile
fname = "USMidwest.java";
- base = getResourceFile("tools/xsd-java-checker").getPath();
file2 = new File(genPath + "/org/jboss/ws/types/" + fname);
- file1 = new File(base + "/wscompile/simpletypes/" + fname);
+ file1 = getResourceFile("tools/xsd-java-checker/wscompile/simpletypes/" + fname);
sc = new JBossSourceComparator(file1, file2);
assertTrue("Source Files Match:", sc.validate());
sc.validateImports();
Modified: stack/native/trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <key-store-password>{EXT}@java.home@/bin/java -cp @tests.output.dir@/classes org.jboss.test.ws.jaxrpc.samples.wssecurity.PasswordUtil @tests.output.dir@/resources/jaxrpc/samples/wssecurity/keystore.password</key-store-password>
+ <key-store-password>{EXT}@java.home@/bin/java -cp @tests.output.dir@/test-classes org.jboss.test.ws.jaxrpc.samples.wssecurity.PasswordUtil @tests.output.dir@/test-resources/jaxrpc/samples/wssecurity/keystore.password</key-store-password>
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/resources/jaxrpc/samples/wssecurity/keystore.password</trust-store-password>
+ <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/test-resources/jaxrpc/samples/wssecurity/keystore.password</trust-store-password>
<config>
<sign type="x509v3" alias="wsse"/>
<encrypt type="x509v3" alias="wsse"/>
Modified: stack/native/trunk/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <key-store-password>{EXT}@java.home@/bin/java -cp @tests.output.dir@/classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil @tests.output.dir@/resources/jaxrpc/wsse/keystore.password</key-store-password>
+ <key-store-password>{EXT}@java.home@/bin/java -cp @tests.output.dir@/test-classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil @tests.output.dir@/test-resources/jaxrpc/wsse/keystore.password</key-store-password>
<trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/resources/jaxrpc/wsse/keystore.password</trust-store-password>
+ <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/test-resources/jaxrpc/wsse/keystore.password</trust-store-password>
<config>
<sign type="x509v3" alias="wsse"/>
<encrypt type="x509v3" alias="wsse"/>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.attachment" namespace="http://org.jboss.ws/attachment"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.inoutparameters" namespace="http://org.jboss.ws/holder"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.oneway" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.outparameters" namespace="http://org.jboss.ws/holder"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.usertypes" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.wsdlimport" namespace="http://jboss.org/wsdlimport"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/>
</configuration>
Modified: stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2008-04-23 07:39:57 UTC (rev 6625)
+++ stack/native/trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2008-04-23 08:31:03 UTC (rev 6626)
@@ -5,5 +5,5 @@
<global>
<package-namespace package="org.jboss.test.webservice.wsdlimportwithusertypes" namespace="http://org.jboss.ws"/>
</global>
- <wsdl-java location="resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/>
+ <wsdl-java location="test-resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/>
</configuration>
More information about the jbossws-commits
mailing list