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

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Fri May 9 17:11:22 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-05-09 17:11:22 -0400 (Fri, 09 May 2008)
New Revision: 6996

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/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.xml
   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/WEB-INF/jboss-web.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml
   stack/native/trunk/modules/testsuite/pom.xml
Log:
Fif wsdl-publish-location

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	2008-05-09 20:59:29 UTC (rev 6995)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java	2008-05-09 21:11:22 UTC (rev 6996)
@@ -55,7 +55,8 @@
       
       TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
       
-      String resStr = port.echoSimple(new File("wsdl-publish/some-wsdl-location/foo/bar/TestService.wsdl").getAbsolutePath());
+      String dir = System.getProperty("wsdl.publish.location");
+      String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/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	2008-05-09 20:59:29 UTC (rev 6995)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml	2008-05-09 21:11:22 UTC (rev 6996)
@@ -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/TestService.wsdl</wsdl-override>
   </service-ref>
 
 </jboss-client>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml	2008-05-09 20:59:29 UTC (rev 6995)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml	2008-05-09 21:11:22 UTC (rev 6996)
@@ -8,7 +8,7 @@
     <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root>
     <webservice-description>
       <webservice-description-name>TestService</webservice-description-name>
-      <wsdl-publish-location>file:@wsdl-publish-location@/jsr109ejb</wsdl-publish-location>
+      <wsdl-publish-location>file:@wsdl.publish.location@/jsr109ejb</wsdl-publish-location>
     </webservice-description>
   </webservices>
   

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	2008-05-09 20:59:29 UTC (rev 6995)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml	2008-05-09 21:11:22 UTC (rev 6996)
@@ -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/TestService.wsdl</wsdl-override>
   </service-ref>
 
 </jboss-client>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml	2008-05-09 20:59:29 UTC (rev 6995)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml	2008-05-09 21:11:22 UTC (rev 6996)
@@ -6,7 +6,7 @@
   
   <webservice-description>
     <webservice-description-name>TestService</webservice-description-name>
-    <wsdl-publish-location>file:@wsdl-publish-location@/jsr109pojo</wsdl-publish-location>
+    <wsdl-publish-location>file:@wsdl.publish.location@/jsr109pojo</wsdl-publish-location>
   </webservice-description>
   
 </jboss-web>
\ No newline at end of file

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml	2008-05-09 20:59:29 UTC (rev 6995)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml	2008-05-09 21:11:22 UTC (rev 6996)
@@ -4,6 +4,6 @@
 <jboss-web>
   <webservice-description>
     <webservice-description-name>TestService</webservice-description-name>
-    <wsdl-publish-location>file:@wsdl-publish-location@/some-wsdl-location</wsdl-publish-location>
+    <wsdl-publish-location>file:@wsdl.publish.location@/some-wsdl-location</wsdl-publish-location>
   </webservice-description>
 </jboss-web>

Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml	2008-05-09 20:59:29 UTC (rev 6995)
+++ stack/native/trunk/modules/testsuite/pom.xml	2008-05-09 21:11:22 UTC (rev 6996)
@@ -20,6 +20,7 @@
     <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
     <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
     <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
+    <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
   </properties>
   
   <!-- Modules -->
@@ -190,6 +191,10 @@
               <name>test.resources.directory</name>
               <value>${test.resources.directory}</value>
             </property>
+            <property>
+              <name>wsdl.publish.location</name>
+              <value>${wsdl.publish.location}</value>
+            </property>
           </systemProperties>
         </configuration>
       </plugin>




More information about the jbossws-commits mailing list