[jbossws-commits] JBossWS SVN: r10969 - in stack/native/trunk/modules/testsuite/native-tests/src/test: java/org/jboss/test/ws/jaxrpc/wsdlpublish and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-10-21 03:16:52 -0400 (Wed, 21 Oct 2009)
New Revision: 10969

Modified:
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
Log:
[JBWS-2718] fixing tests to be alligned with new publish directory structure

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java	2009-10-20 16:16:25 UTC (rev 10968)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java	2009-10-21 07:16:52 UTC (rev 10969)
@@ -48,7 +48,8 @@
       ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();      
 
       File dataDir = serverConfig.getServerDataDir();
-      File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
+      String s = File.separator;
+      File wsdlDir = new File(dataDir.getAbsolutePath() + s + "wsdl" + s + archive + s + "WEB-INF" + s + "wsdl" + s );
 
       if (wsdlDir.exists() == false)
       {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java	2009-10-20 16:16:25 UTC (rev 10968)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java	2009-10-21 07:16:52 UTC (rev 10969)
@@ -52,11 +52,11 @@
       URL mappingURL = getResourceURL("jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml");
       QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService");
       Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
-      
+
       TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-      
+
       String dir = System.getProperty("wsdl.publish.location");
-      String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/foo/bar/TestService.wsdl").getAbsolutePath());
+      String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/WEB-INF/wsdl/foo/bar/TestService.wsdl").getAbsolutePath());
       assertEquals("{http://org.jboss.test.ws/wsdlpublish}TestEndpoint", resStr);
    }
 }

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml	2009-10-20 16:16:25 UTC (rev 10968)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml	2009-10-21 07:16:52 UTC (rev 10969)
@@ -7,7 +7,7 @@
 
   <service-ref>
     <service-ref-name>service/TestServiceEJB</service-ref-name>
-    <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/TestService.wsdl</wsdl-override>
+    <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/META-INF/wsdl/TestService.wsdl</wsdl-override>
   </service-ref>
 
 </jboss-client>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml	2009-10-20 16:16:25 UTC (rev 10968)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml	2009-10-21 07:16:52 UTC (rev 10969)
@@ -7,7 +7,7 @@
 
   <service-ref>
     <service-ref-name>service/TestServiceJSE</service-ref-name>
-    <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/TestService.wsdl</wsdl-override>
+    <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/WEB-INF/wsdl/TestService.wsdl</wsdl-override>
   </service-ref>
 
 </jboss-client>