[jboss-cvs] JBossAS SVN: r109833 - in branches/JBoss-AS-6.0.x-ipv6/testsuite: src/resources/webservice/admindevel/META-INF and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 10 15:23:59 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-12-10 15:23:58 -0500 (Fri, 10 Dec 2010)
New Revision: 109833
Modified:
branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/sections/webservice.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbws309/wstools-config.xml
Log:
Fix up static generation of webservice wsdl override URLs and soap:address location URLs (JBAS-8540)
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/sections/webservice.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/sections/webservice.xml 2010-12-10 19:37:25 UTC (rev 109832)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/sections/webservice.xml 2010-12-10 20:23:58 UTC (rev 109833)
@@ -11,7 +11,8 @@
<include name="**/*.xml"/>
</fileset>
<filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
+ <!-- JBAS-8540 -->
+ <filter token="jbosstest.host.nameforurl" value="${node0.url}"/>
</filterset>
</copy>
<!-- Copy binary files -->
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml 2010-12-10 19:37:25 UTC (rev 109832)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/admindevel/META-INF/jboss-client.xml 2010-12-10 20:23:58 UTC (rev 109833)
@@ -9,7 +9,8 @@
<service-ref>
<service-ref-name>service/HelloService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/admindevel?wsdl</wsdl-override>
+ <!-- JBAS-8540 -->
+ <wsdl-override>http://@jbosstest.host.nameforurl@:8080/admindevel?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl 2010-12-10 19:37:25 UTC (rev 109832)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/endpoint/WEB-INF/wsdl/TestService.wsdl 2010-12-10 20:23:58 UTC (rev 109833)
@@ -29,7 +29,7 @@
</binding>
<service name="EndpointService">
<port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
- <soap:address location="http://@jbosstest.host.name@:8080/jaxws-endpoint"/>
+ <soap:address location="http://@jbosstest.host.nameforurl@:8080/jaxws-endpoint"/>
</port>
</service>
</definitions>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml 2010-12-10 19:37:25 UTC (rev 109832)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbas5614/META-INF/jboss-client.xml 2010-12-10 20:23:58 UTC (rev 109833)
@@ -8,7 +8,7 @@
<service-ref>
<service-ref-name>service/HelloWorldService</service-ref-name>
<!--config-name>Standard WSSecurity Client</config-name-->
- <wsdl-override>http://@jbosstest.host.name@:8080/webservice-jbas5614?wsdl</wsdl-override>
+ <wsdl-override>http://@jbosstest.host.nameforurl@:8080/webservice-jbas5614?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl 2010-12-10 19:37:25 UTC (rev 109832)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbws309/META-INF/wsdl/OrganizationService.wsdl 2010-12-10 20:23:58 UTC (rev 109833)
@@ -27,10 +27,10 @@
</binding>
<service name="OrganizationService">
<port name="BasicSecuredPort" binding="tns:OrganizationBinding">
- <soap:address location="http://@jbosstest.host.name@:8080/ws4ee-jbws309/BasicSecured"/>
+ <soap:address location="http://@jbosstest.host.nameforurl@:8080/ws4ee-jbws309/BasicSecured"/>
</port>
<port name="RoleSecuredPort" binding="tns:OrganizationBinding">
- <soap:address location="http://@jbosstest.host.name@:8080/ws4ee-jbws309/RoleSecured"/>
+ <soap:address location="http://@jbosstest.host.nameforurl@:8080/ws4ee-jbws309/RoleSecured"/>
</port>
</service>
</definitions>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbws309/wstools-config.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbws309/wstools-config.xml 2010-12-10 19:37:25 UTC (rev 109832)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/webservice/jbws309/wstools-config.xml 2010-12-10 20:23:58 UTC (rev 109833)
@@ -36,10 +36,10 @@
<service name="OrganizationService">
<port name="BasicSecuredPort" binding="tns:OrganizationBinding">
- <soap:address location="http://@jbosstest.host.name@:8080/ws4ee-jbws309/BasicSecured"/>
+ <soap:address location="http://@jbosstest.host.nameforurl@:8080/ws4ee-jbws309/BasicSecured"/>
</port>
<port name="RoleSecuredPort" binding="tns:OrganizationBinding">
- <soap:address location="http://@jbosstest.host.name@:8080/ws4ee-jbws309/RoleSecured"/>
+ <soap:address location="http://@jbosstest.host.nameforurl@:8080/ws4ee-jbws309/RoleSecured"/>
</port>
</service>
More information about the jboss-cvs-commits
mailing list