December 2010 - jbossws-commits - Jboss List Archives

JBossWS SVN: r13475 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 08:37:11 -0500 (Mon, 13 Dec 2010) New Revision: 13475 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3139] propagate jboss.bind.address JVM property to tests Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl 2010-12-13 13:36:44 UTC (rev 13474) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl 2010-12-13 13:37:11 UTC (rev 13475) @@ -50,7 +50,7 @@ </wsdl:binding> <wsdl:service name="EndpointService"> <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort"> - <soap:address location="http://localhost:8080/jaxws-cxf-bus/EndpointService/Endpoint" /> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-bus/EndpointService/Endpoint" /> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2010-12-13 13:36:44 UTC (rev 13474) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-12-13 13:37:11 UTC (rev 13475) @@ -168,6 +168,10 @@ <value>${jboss.server.instance}</value> </property> <property> + <name>jboss.bind.address</name> + <value>${jboss.bind.address}</value> + </property> + <property> <name>java.naming.provider.url</name> <value>jnp://${jboss.bind.address}:1099</value> </property>

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13474 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 08:36:44 -0500 (Mon, 13 Dec 2010) New Revision: 13474 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: MSFT interop. endpoints are not available - exclude them Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-12-13 13:22:19 UTC (rev 13473) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-12-13 13:36:44 UTC (rev 13474) @@ -45,3 +45,6 @@ # [JBWS-3140] mtom, wsaddressing support in webservices.xml; jboss-metadata-common doesn't support this metadata by in AS501 org/jboss/test/ws/jaxws/jbws3140/** + +# Seems MSFT interop. endpoints are down :( +org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-12-13 13:22:19 UTC (rev 13473) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-12-13 13:36:44 UTC (rev 13474) @@ -45,3 +45,6 @@ # [JBWS-3140] mtom, wsaddressing support in webservices.xml; jboss-metadata-common doesn't support this metadata by in AS510 org/jboss/test/ws/jaxws/jbws3140/** + +# Seems MSFT interop. endpoints are down :( +org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-12-13 13:22:19 UTC (rev 13473) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-12-13 13:36:44 UTC (rev 13474) @@ -21,3 +21,6 @@ # [JBAS-8363] Virtual host issue in JBossWeb org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* + +# Seems MSFT interop. endpoints are down :( +org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-12-13 13:22:19 UTC (rev 13473) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-12-13 13:36:44 UTC (rev 13474) @@ -21,3 +21,6 @@ # [JBAS-8363] Virtual host issue in JBossWeb org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* + +# Seems MSFT interop. endpoints are down :( +org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13473 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1178 and 27 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 08:22:19 -0500 (Mon, 13 Dec 2010) New Revision: 13473 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java framework/trunk/testsuite/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxrpc/samples/secureejb/META-INF/wsdl/OrganizationService.wsdl framework/trunk/testsuite/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl framework/trunk/testsuite/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt framework/trunk/testsuite/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl Log: [JBWS-3139] fixing framework tests to use user provided jboss.bind.address in tests - this property is substituted by maven Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2010-12-13 13:22:19 UTC (rev 13473) @@ -62,8 +62,10 @@ super.init(config); endpoint1 = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, new EndpointBean()); - endpoint1.publish("http://localhost:8081/jaxws-endpoint"); - endpoint2 = Endpoint.publish("http://localhost:8081/jaxws-endpoint2/endpoint/long/path", new EndpointBean()); + String hostName = System.getProperty("jboss.bind.address", "localhost"); + hostName = hostName.indexOf(":") != -1 ? "[" + hostName + "]" : hostName; + endpoint1.publish("http://" + hostName + ":8081/jaxws-endpoint"); + endpoint2 = Endpoint.publish("http://" + hostName + ":8081/jaxws-endpoint2/endpoint/long/path", new EndpointBean()); } @Override Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2010-12-13 13:22:19 UTC (rev 13473) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1178; +import java.net.Inet6Address; import java.net.InetAddress; import java.net.URL; import java.util.Map; @@ -77,7 +78,8 @@ public void testHostAddress() throws Exception { InetAddress inetAddr = InetAddress.getByName(getServerHost()); - URL wsdlURL = new URL("http://" + inetAddr.getHostAddress() + ":8080/jaxws-jbws1178/testpattern?wsdl"); + String hostAddress = inetAddr instanceof Inet6Address ? "[" + inetAddr.getHostAddress() + "]" : inetAddr.getHostAddress(); + URL wsdlURL = new URL("http://" + hostAddress + ":8080/jaxws-jbws1178/testpattern?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); Service service = Service.create(wsdlURL, serviceName); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2010-12-13 13:22:19 UTC (rev 13473) @@ -142,13 +142,14 @@ //We have client and server on the same host here... String host = "localhost".equals(getServerHost()) ? "127.0.0.1" : getServerHost(); + if ("[::1]".equals(host)) host = "0:0:0:0:0:0:0:1"; // IPv6 hack Map<String, List<Record>> localhostRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { host }, new String[] { "java.lang.String" }); Map<String, List<Record>> amazonRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { "72.21.203.1" }, new String[] { "java.lang.String" }); - assertTrue(localhostRecords.size() > 0); - assertTrue(amazonRecords.size() == 0); + assertTrue("No records for " + host, localhostRecords.size() > 0); + assertTrue("There are records for 72.21.203.1", amazonRecords.size() == 0); } @SuppressWarnings("unchecked") @@ -169,6 +170,7 @@ LinkedList<String> l = new LinkedList<String>(); l.add("localhost"); l.add("127.0.0.1"); + l.add("[::1]"); HostFilter hostFilter = new HostFilter(l,false); //destination RecordFilter[] filters = new RecordFilter[] {operationFilter, hostFilter}; Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TrivialService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-docstyle-bare?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-docstyle-bare?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TrivialService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-docstyle-wrapped?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-docstyle-wrapped?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/ExceptionService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-exception/ExceptionBean?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-exception/ExceptionBean?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-handler?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-handler?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-holder?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-holder?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceEJB</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-jsr109ejb-doc?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109ejb-doc?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceEJB</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -8,7 +8,7 @@ <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root> <webservice-description> <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>http://localhost:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-publish-location> + <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-publish-location> </webservice-description> </webservices> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceJSE</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-jsr109pojo-doc?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109pojo-doc?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceJSE</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -6,7 +6,7 @@ <webservice-description> <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>http://localhost:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-publish-location> + <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-publish-location> </webservice-description> </jboss-web> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/MessageService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-message?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-message?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/XOPTestService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-mtom?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-mtom?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-oneway?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-oneway?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TrivialService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-rpcstyle?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-rpcstyle?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/secureejb/META-INF/wsdl/OrganizationService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/secureejb/META-INF/wsdl/OrganizationService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/secureejb/META-INF/wsdl/OrganizationService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -27,13 +27,13 @@ </binding> <service name="OrganizationService"> <port name="BasicSecuredPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="http://localhost:8080/jaxrpc-samples-ejb/BasicSecured"/> + <soap:address location="http://@jboss.bind.address@:8080/jaxrpc-samples-ejb/BasicSecured"/> </port> <port name="RoleSecuredPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="http://localhost:8080/jaxrpc-samples-ejb/RoleSecured"/> + <soap:address location="http://@jboss.bind.address@:8080/jaxrpc-samples-ejb/RoleSecured"/> </port> <port name="ConfidentialPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="https://localhost:8443/jaxrpc-samples-ejb/ConfidentialSecured"/> + <soap:address location="https://@jboss.bind.address@:8443/jaxrpc-samples-ejb/ConfidentialSecured"/> </port> </service> </definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -27,7 +27,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://localhost:8080/jaxrpc-samples-serviceref'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-samples-serviceref'/> </port> </service> </definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml 2010-12-13 13:22:19 UTC (rev 13473) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/AttachmentService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-swa?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-swa?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -31,7 +31,7 @@ </binding> <service name="MarshallTestService"> <port name="MarshallTestPort2" binding="tns:NewSchemaTestSoapBinding"> - <soap:address location="http://localhost:8080/W2JDLMarshallTest/jaxws/NewSchemaTest" /> + <soap:address location="http://@jboss.bind.address@:8080/W2JDLMarshallTest/jaxws/NewSchemaTest" /> </port> </service> </definitions> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -31,7 +31,7 @@ </binding> <service name="ParameterModeTestService"> <port name="ParameterModeTestPort" binding="tns:ParameterModeTestBinding"> - <soap:address location="http://localhost:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" /> + <soap:address location="http://@jboss.bind.address@:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" /> </port> </service> </definitions> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -28,7 +28,7 @@ </binding> <service name="ParameterModeTestService"> <port name="ParameterModeTestPort" binding="tns:ParameterModeTestBinding"> - <soap:address location="http://localhost:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" /> + <soap:address location="http://@jboss.bind.address@:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" /> </port> </service> </definitions> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -25,7 +25,7 @@ </binding> <service name="Service"> <port binding="tns:HelloIfaceBinding" name="HelloImplPort"> - <soap:address location="http://localhost:8080/foo/bar"/> + <soap:address location="http://@jboss.bind.address@:8080/foo/bar"/> </port> </service> </definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt 2010-12-13 13:22:19 UTC (rev 13473) @@ -5,3 +5,4 @@ test.classes.directory test.resources.directory test.archive.directory +jboss.bind.address Modified: framework/trunk/testsuite/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2010-12-13 13:10:57 UTC (rev 13472) +++ framework/trunk/testsuite/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2010-12-13 13:22:19 UTC (rev 13473) @@ -48,7 +48,7 @@ <wsdl:service name="SaajService"> <wsdl:port name="SaajServicePort" binding="tns:SaajServiceSoapBinding"> - <soap:address location="http://localhost:8080/SaajService"/> + <soap:address location="http://@jboss.bind.address@:8080/SaajService"/> </wsdl:port> </wsdl:service>

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13472 - in common/trunk/src/main/java/org/jboss/wsf: test and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 08:10:57 -0500 (Mon, 13 Dec 2010) New Revision: 13472 Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-3139] IPv6 addresses have to be surrounded with '[' & ']' in URLs - see RFC2732 Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-12-13 13:10:10 UTC (rev 13471) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-12-13 13:10:57 UTC (rev 13472) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.common.management; +import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Set; @@ -97,9 +98,17 @@ log.debug("Using local host: " + localHost.getHostName()); host = localHost.getHostName(); } - this.webServiceHost = "127.0.0.1".equals(host) ? "localhost" : host; // TCK workaround + this.webServiceHost = toIPv6URLFormat("127.0.0.1".equals(host) ? "localhost" : host); // TCK workaround } + private String toIPv6URLFormat(final String host) throws UnknownHostException + { + final boolean isIPv6Address = !UNDEFINED_HOSTNAME.equals(host) && InetAddress.getByName(host) instanceof Inet6Address; + final boolean isIPv6Formatted = isIPv6Address && host.startsWith("["); + + return isIPv6Address && !isIPv6Formatted ? "[" + host + "]" : host; + } + public void setWebServicePort(int port) { this.webServicePort = port; Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2010-12-13 13:10:10 UTC (rev 13471) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2010-12-13 13:10:57 UTC (rev 13472) @@ -22,8 +22,11 @@ package org.jboss.wsf.test; import java.io.File; +import java.net.Inet6Address; +import java.net.InetAddress; import java.net.MalformedURLException; import java.net.URL; +import java.net.UnknownHostException; import java.util.Hashtable; import javax.management.MBeanServerConnection; @@ -180,8 +183,23 @@ */ public static String getServerHost() { - return System.getProperty(SYSPROP_JBOSS_BIND_ADDRESS, "localhost"); + final String host = System.getProperty(SYSPROP_JBOSS_BIND_ADDRESS, "localhost"); + return toIPv6URLFormat(host); } + + private static String toIPv6URLFormat(final String host) + { + try + { + final boolean isIPv6Address = InetAddress.getByName(host) instanceof Inet6Address; + final boolean isIPv6Formatted = isIPv6Address && host.startsWith("["); + return isIPv6Address && !isIPv6Formatted ? "[" + host + "]" : host; + } + catch (final UnknownHostException e) + { + throw new RuntimeException(e); + } + } @SuppressWarnings("unchecked") public static MBeanServerConnection getServer()

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13471 - common/trunk/src/main/java/org/jboss/wsf/common/invocation.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 08:10:10 -0500 (Mon, 13 Dec 2010) New Revision: 13471 Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java Log: [JBWS-3177] previous fix was wrong - this is the proper one Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java 2010-12-13 13:06:35 UTC (rev 13470) +++ common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java 2010-12-13 13:10:10 UTC (rev 13471) @@ -22,6 +22,8 @@ package org.jboss.wsf.common.invocation; import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; import javax.naming.Context; import javax.naming.InitialContext; @@ -42,7 +44,7 @@ private static final String POJO_JNDI_PREFIX = "java:comp/env/"; - private boolean initialized; + private List<Long> initializedEndpoints = new LinkedList<Long>(); /** * Constructor. @@ -92,11 +94,12 @@ } } - if (!this.initialized) + final long targetBeanId = System.identityHashCode(targetBean); + if (!this.initializedEndpoints.contains(targetBeanId)) { // notify subclasses this.onEndpointInstantiated(endpoint, invocation); - this.initialized = true; + this.initializedEndpoints.add(targetBeanId); } return targetBean;

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13470 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/core/client and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2010-12-13 08:06:35 -0500 (Mon, 13 Dec 2010) New Revision: 13470 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/JBPAPP5486TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/jboss-web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/web.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java Log: [JBPAPP-5486] Timeout value gets inserted into URLs. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2010-12-13 12:55:12 UTC (rev 13469) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2010-12-13 13:06:35 UTC (rev 13470) @@ -142,6 +142,17 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxws-jbpapp5486.war" webxml="${tests.output.dir}/resources/jaxws/jbpapp5486/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbpapp5486/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbpapp5486/*TestCase.class" /> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbpapp5486/WEB-INF"> + <include name="jboss-web.xml" /> + </webinf> + </war> +  <jar destfile="${tests.output.dir}/libs/jaxws-jbpapp5576.jar"> <metainf dir="${tests.output.dir}/resources/jaxws/jbpapp5576/META-INF"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2010-12-13 12:55:12 UTC (rev 13469) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2010-12-13 13:06:35 UTC (rev 13470) @@ -153,7 +153,7 @@ if (callProps.containsKey(StubExt.PROPERTY_CLIENT_TIMEOUT)) { timeout = callProps.get(StubExt.PROPERTY_CLIENT_TIMEOUT); - targetAddress = addURLParameter(targetAddress, "timeout", timeout.toString()); + clientConfig.put("timeout", timeout.toString()); } } Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/Endpoint.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/Endpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/Endpoint.java 2010-12-13 13:06:35 UTC (rev 13470) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jaxws.jbpapp5486; + +import javax.jws.WebService; + +/** + * Test Endpoint. + * + * @author darran.lofthouse(a)jboss.com + * @since 13th December 2010 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbpap5486") +public interface Endpoint +{ + + public String verifyNoTimeoutParameter(final String message); + + public String doSleep(final String message, final long timeout); + +} Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/Endpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/EndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/EndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/EndpointImpl.java 2010-12-13 13:06:35 UTC (rev 13470) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jaxws.jbpapp5486; + +import java.util.Map; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.servlet.http.HttpServletRequest; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; + +/** + * Test Endpoint implementation. + * + * @author darran.lofthouse(a)jboss.com + * @since 13th December 2010 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbpapp5486", endpointInterface = "org.jboss.test.ws.jaxws.jbpapp5486.Endpoint") +public class EndpointImpl implements Endpoint +{ + + @Resource + private WebServiceContext context; + + public String verifyNoTimeoutParameter(final String message) + { + if (getTimeout() != null) + { + throw new IllegalStateException("timeout parameter recieved."); + } + + return message; + } + + public String doSleep(final String message, final long timeout) + { + try + { + Thread.sleep(timeout); + } + catch (InterruptedException e) + { + throw new RuntimeException("We were interrupted!!", e); + } + + return message; + } + + private String getTimeout() + { + HttpServletRequest request = (HttpServletRequest)context.getMessageContext().get(MessageContext.SERVLET_REQUEST); + String timeout = request.getParameter("timeout"); + + return timeout; + } + + + + + +} Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/EndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/JBPAPP5486TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/JBPAPP5486TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/JBPAPP5486TestCase.java 2010-12-13 13:06:35 UTC (rev 13470) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jaxws.jbpapp5486; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; + +import junit.framework.Test; + +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.WSTimeoutException; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBPAPP-5486] Timeout value gets inserted into URLs + * + * @author darran.lofthouse(a)jboss.com + * @since 13th December 2010 + * @see https://jira.jboss.org/browse/JBPAPP-5486 + */ +public class JBPAPP5486TestCase extends JBossWSTest +{ + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBPAPP5486TestCase.class, "jaxws-jbpapp5486.war"); + } + + public void testNoTimeout() throws Exception + { + Service service = getService(); + Endpoint port = service.getPort(Endpoint.class); + + String message = "Hello 1"; + String response = port.verifyNoTimeoutParameter(message); + assertEquals("Response Message", message, response); + } + + public void testTimeout() throws Exception + { + Service service = getService(); + Endpoint port = service.getPort(Endpoint.class); + + ((BindingProvider)port).getRequestContext().put(StubExt.PROPERTY_CLIENT_TIMEOUT, "10000"); + + String message = "Hello 2"; + String response = port.verifyNoTimeoutParameter(message); + assertEquals("Response Message", message, response); + } + + public void testTimeoutWorks() throws Exception + { + Service service = getService(); + Endpoint port = service.getPort(Endpoint.class); + + ((BindingProvider)port).getRequestContext().put(StubExt.PROPERTY_CLIENT_TIMEOUT, "500"); + + String message = "Hello 3"; + try + { + port.doSleep(message, 1000); + fail("Expected WS exception not thrown."); + } + catch (WebServiceException ignored) + { + assertEquals("Expected Cause", WSTimeoutException.class.getName(), ignored.getCause().getClass().getName()); + } + + } + + Service getService() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbpapp5486?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbpapp5486", "EndpointImplService"); + + Service service = Service.create(wsdlURL, serviceName); + + return service; + } + +} Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbpapp5486/JBPAPP5486TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/jboss-web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/jboss-web.xml 2010-12-13 13:06:35 UTC (rev 13470) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbpapp5486</context-root> +</jboss-web> \ No newline at end of file Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/web.xml 2010-12-13 13:06:35 UTC (rev 13470) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbpapp5486.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbpapp5486/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13469 - in common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf: test and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 07:55:12 -0500 (Mon, 13 Dec 2010) New Revision: 13469 Modified: common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-3139] IPv6 addresses have to be surrounded with '[' & ']' in URLs - see RFC2732 Modified: common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java =================================================================== --- common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-12-13 12:53:04 UTC (rev 13468) +++ common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-12-13 12:55:12 UTC (rev 13469) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.common.management; +import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Set; @@ -97,9 +98,17 @@ log.debug("Using local host: " + localHost.getHostName()); host = localHost.getHostName(); } - this.webServiceHost = "127.0.0.1".equals(host) ? "localhost" : host; // TCK workaround + this.webServiceHost = toIPv6URLFormat("127.0.0.1".equals(host) ? "localhost" : host); // TCK workaround } + private String toIPv6URLFormat(final String host) throws UnknownHostException + { + final boolean isIPv6Address = !UNDEFINED_HOSTNAME.equals(host) && InetAddress.getByName(host) instanceof Inet6Address; + final boolean isIPv6Formatted = isIPv6Address && host.startsWith("["); + + return isIPv6Address && !isIPv6Formatted ? "[" + host + "]" : host; + } + public void setWebServicePort(int port) { this.webServicePort = port; Modified: common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2010-12-13 12:53:04 UTC (rev 13468) +++ common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2010-12-13 12:55:12 UTC (rev 13469) @@ -22,8 +22,11 @@ package org.jboss.wsf.test; import java.io.File; +import java.net.Inet6Address; +import java.net.InetAddress; import java.net.MalformedURLException; import java.net.URL; +import java.net.UnknownHostException; import java.util.Hashtable; import javax.management.MBeanServerConnection; @@ -180,8 +183,23 @@ */ public static String getServerHost() { - return System.getProperty(SYSPROP_JBOSS_BIND_ADDRESS, "localhost"); + final String host = System.getProperty(SYSPROP_JBOSS_BIND_ADDRESS, "localhost"); + return toIPv6URLFormat(host); } + + private static String toIPv6URLFormat(final String host) + { + try + { + final boolean isIPv6Address = InetAddress.getByName(host) instanceof Inet6Address; + final boolean isIPv6Formatted = isIPv6Address && host.startsWith("["); + return isIPv6Address && !isIPv6Formatted ? "[" + host + "]" : host; + } + catch (final UnknownHostException e) + { + throw new RuntimeException(e); + } + } @SuppressWarnings("unchecked") public static MBeanServerConnection getServer()

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13468 - common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/invocation.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 07:53:04 -0500 (Mon, 13 Dec 2010) New Revision: 13468 Modified: common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java Log: [JBWS-3177] previous fix was wrong - this is the proper one Modified: common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java =================================================================== --- common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java 2010-12-13 12:46:22 UTC (rev 13467) +++ common/branches/jbossws-common-1.4.1/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java 2010-12-13 12:53:04 UTC (rev 13468) @@ -22,6 +22,8 @@ package org.jboss.wsf.common.invocation; import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; import javax.naming.Context; import javax.naming.InitialContext; @@ -42,7 +44,7 @@ private static final String POJO_JNDI_PREFIX = "java:comp/env/"; - private boolean initialized; + private List<Long> initializedEndpoints = new LinkedList<Long>(); /** * Constructor. @@ -92,11 +94,12 @@ } } - if (!this.initialized) + final long targetBeanId = System.identityHashCode(targetBean); + if (!this.initializedEndpoints.contains(targetBeanId)) { // notify subclasses this.onEndpointInstantiated(endpoint, invocation); - this.initialized = true; + this.initializedEndpoints.add(targetBeanId); } return targetBean;

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13467 - in framework/branches/jbossws-framework-3.4.1/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1178 and 27 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 07:46:22 -0500 (Mon, 13 Dec 2010) New Revision: 13467 Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/secureejb/META-INF/wsdl/OrganizationService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl Log: [JBWS-3139] fixing framework tests to use user provided jboss.bind.address in tests - this property is substituted by maven Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2010-12-13 12:46:22 UTC (rev 13467) @@ -62,8 +62,10 @@ super.init(config); endpoint1 = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, new EndpointBean()); - endpoint1.publish("http://localhost:8081/jaxws-endpoint"); - endpoint2 = Endpoint.publish("http://localhost:8081/jaxws-endpoint2/endpoint/long/path", new EndpointBean()); + String hostName = System.getProperty("jboss.bind.address", "localhost"); + hostName = hostName.indexOf(":") != -1 ? "[" + hostName + "]" : hostName; + endpoint1.publish("http://" + hostName + ":8081/jaxws-endpoint"); + endpoint2 = Endpoint.publish("http://" + hostName + ":8081/jaxws-endpoint2/endpoint/long/path", new EndpointBean()); } @Override Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2010-12-13 12:46:22 UTC (rev 13467) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1178; +import java.net.Inet6Address; import java.net.InetAddress; import java.net.URL; import java.util.Map; @@ -77,7 +78,8 @@ public void testHostAddress() throws Exception { InetAddress inetAddr = InetAddress.getByName(getServerHost()); - URL wsdlURL = new URL("http://" + inetAddr.getHostAddress() + ":8080/jaxws-jbws1178/testpattern?wsdl"); + String hostAddress = inetAddr instanceof Inet6Address ? "[" + inetAddr.getHostAddress() + "]" : inetAddr.getHostAddress(); + URL wsdlURL = new URL("http://" + hostAddress + ":8080/jaxws-jbws1178/testpattern?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); Service service = Service.create(wsdlURL, serviceName); Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2010-12-13 12:46:22 UTC (rev 13467) @@ -142,13 +142,14 @@ //We have client and server on the same host here... String host = "localhost".equals(getServerHost()) ? "127.0.0.1" : getServerHost(); + if ("[::1]".equals(host)) host = "0:0:0:0:0:0:0:1"; // IPv6 hack Map<String, List<Record>> localhostRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { host }, new String[] { "java.lang.String" }); Map<String, List<Record>> amazonRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { "72.21.203.1" }, new String[] { "java.lang.String" }); - assertTrue(localhostRecords.size() > 0); - assertTrue(amazonRecords.size() == 0); + assertTrue("No records for " + host, localhostRecords.size() > 0); + assertTrue("There are records for 72.21.203.1", amazonRecords.size() == 0); } @SuppressWarnings("unchecked") @@ -169,6 +170,7 @@ LinkedList<String> l = new LinkedList<String>(); l.add("localhost"); l.add("127.0.0.1"); + l.add("[::1]"); HostFilter hostFilter = new HostFilter(l,false); //destination RecordFilter[] filters = new RecordFilter[] {operationFilter, hostFilter}; Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/docstyle/bare/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TrivialService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-docstyle-bare?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-docstyle-bare?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/docstyle/wrapped/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TrivialService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-docstyle-wrapped?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-docstyle-wrapped?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/exception/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/ExceptionService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-exception/ExceptionBean?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-exception/ExceptionBean?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/handler/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-handler?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-handler?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/holder/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-holder?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-holder?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceEJB</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-jsr109ejb-doc?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109ejb-doc?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceEJB</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -8,7 +8,7 @@ <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root> <webservice-description> <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>http://localhost:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-publish-location> + <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-publish-location> </webservice-description> </webservices> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceJSE</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-jsr109pojo-doc?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109pojo-doc?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestServiceJSE</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -6,7 +6,7 @@ <webservice-description> <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>http://localhost:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-publish-location> + <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-publish-location> </webservice-description> </jboss-web> \ No newline at end of file Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/message/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/MessageService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-message?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-message?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/mtom/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/XOPTestService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-mtom?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-mtom?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/oneway/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-oneway?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-oneway?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/rpcstyle/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TrivialService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-rpcstyle?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-rpcstyle?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/secureejb/META-INF/wsdl/OrganizationService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/secureejb/META-INF/wsdl/OrganizationService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/secureejb/META-INF/wsdl/OrganizationService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -27,13 +27,13 @@ </binding> <service name="OrganizationService"> <port name="BasicSecuredPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="http://localhost:8080/jaxrpc-samples-ejb/BasicSecured"/> + <soap:address location="http://@jboss.bind.address@:8080/jaxrpc-samples-ejb/BasicSecured"/> </port> <port name="RoleSecuredPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="http://localhost:8080/jaxrpc-samples-ejb/RoleSecured"/> + <soap:address location="http://@jboss.bind.address@:8080/jaxrpc-samples-ejb/RoleSecured"/> </port> <port name="ConfidentialPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="https://localhost:8443/jaxrpc-samples-ejb/ConfidentialSecured"/> + <soap:address location="https://@jboss.bind.address@:8443/jaxrpc-samples-ejb/ConfidentialSecured"/> </port> </service> </definitions> \ No newline at end of file Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -27,7 +27,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://localhost:8080/jaxrpc-samples-serviceref'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-samples-serviceref'/> </port> </service> </definitions> \ No newline at end of file Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxrpc/samples/swa/META-INF/jboss-client.xml 2010-12-13 12:46:22 UTC (rev 13467) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/AttachmentService</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-samples-swa?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-swa?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -31,7 +31,7 @@ </binding> <service name="MarshallTestService"> <port name="MarshallTestPort2" binding="tns:NewSchemaTestSoapBinding"> - <soap:address location="http://localhost:8080/W2JDLMarshallTest/jaxws/NewSchemaTest" /> + <soap:address location="http://@jboss.bind.address@:8080/W2JDLMarshallTest/jaxws/NewSchemaTest" /> </port> </service> </definitions> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -31,7 +31,7 @@ </binding> <service name="ParameterModeTestService"> <port name="ParameterModeTestPort" binding="tns:ParameterModeTestBinding"> - <soap:address location="http://localhost:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" /> + <soap:address location="http://@jboss.bind.address@:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" /> </port> </service> </definitions> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -28,7 +28,7 @@ </binding> <service name="ParameterModeTestService"> <port name="ParameterModeTestPort" binding="tns:ParameterModeTestBinding"> - <soap:address location="http://localhost:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" /> + <soap:address location="http://@jboss.bind.address@:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" /> </port> </service> </definitions> Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -25,7 +25,7 @@ </binding> <service name="Service"> <port binding="tns:HelloIfaceBinding" name="HelloImplPort"> - <soap:address location="http://localhost:8080/foo/bar"/> + <soap:address location="http://@jboss.bind.address@:8080/foo/bar"/> </port> </service> </definitions> \ No newline at end of file Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt 2010-12-13 12:46:22 UTC (rev 13467) @@ -5,3 +5,4 @@ test.classes.directory test.resources.directory test.archive.directory +jboss.bind.address Modified: framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl =================================================================== --- framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2010-12-13 12:43:24 UTC (rev 13466) +++ framework/branches/jbossws-framework-3.4.1/testsuite/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2010-12-13 12:46:22 UTC (rev 13467) @@ -48,7 +48,7 @@ <wsdl:service name="SaajService"> <wsdl:port name="SaajServicePort" binding="tns:SaajServiceSoapBinding"> - <soap:address location="http://localhost:8080/SaajService"/> + <soap:address location="http://@jboss.bind.address@:8080/SaajService"/> </wsdl:port> </wsdl:service>

13 years, 5 months

1
0
0 / 0

JBossWS SVN: r13466 - stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/tools/wsdl.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-12-13 07:43:24 -0500 (Mon, 13 Dec 2010) New Revision: 13466 Modified: stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java Log: [JBWS-3139] workaround wsdl4j 1.6.2 IPv6 issue Modified: stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2010-12-13 12:39:30 UTC (rev 13465) +++ stack/native/branches/jbossws-native-3.4.1/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2010-12-13 12:43:24 UTC (rev 13466) @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; import javax.wsdl.xml.WSDLLocator; @@ -97,7 +98,26 @@ // An external URL if (resource.startsWith("http://") || resource.startsWith("https://")) { - wsdlImport = resource; + // [JBWS-3139] there's a bug in wsdl4j 1.6.2 where imported schemas are containing invalid IPv6 host name values :( + // The URL value of root WSDL is not malformed, so we're reusing it for schemas URL construction. + if (resource.indexOf(parentURL.getFile()) != -1) + { + URI uri = null; + try { + uri = new URI(resource); + } + catch (Exception e) + { + throw new IllegalArgumentException("Cannot resolve imported resource: " + resource); + } + final String path = uri.getPath(); + final String query = uri.getQuery() != null ? "?" + uri.getQuery() : ""; + wsdlImport = parentURL.getProtocol() + "://" + parentURL.getHost() + ":" + parentURL.getPort() + path + query; + } + else + { + wsdlImport = resource; + } } // Absolute path

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits December 2010