[jbossws-commits] JBossWS SVN: r15970 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Mar 16 06:23:21 EDT 2012
Author: ropalka
Date: 2012-03-16 06:23:19 -0400 (Fri, 16 Mar 2012)
New Revision: 15970
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java
Log:
[JBPAPP-8441] Merged revisions 15965 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15965 | ropalka | 2012-03-15 14:21:15 +0100 (Thu, 15 Mar 2012) | 1 line
[JBWS-3458] fixing tests to be IPv6 compatible
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15896,15900-15920,15936
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15896,15900-15920,15936,15965
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2012-03-16 10:03:58 UTC (rev 15969)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2012-03-16 10:23:19 UTC (rev 15970)
@@ -58,7 +58,12 @@
try
{
ClientHelper helper = (ClientHelper) Class.forName(helperClassName).newInstance();
- helper.setTargetEndpoint("http://" + System.getProperty("jboss.bind.address", "localhost") + ":8080" + path);
+ String hostName = System.getProperty("jboss.bind.address", "localhost");
+ if (hostName.startsWith(":"))
+ {
+ hostName = "[" + hostName + "]";
+ }
+ helper.setTargetEndpoint("http://" + hostName + ":8080" + path);
List<String> failedTests = new LinkedList<String>();
List<String> errorTests = new LinkedList<String>();
Method[] methods = helper.getClass().getMethods();
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-16 10:03:58 UTC (rev 15969)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-16 10:23:19 UTC (rev 15970)
@@ -65,7 +65,7 @@
<wsdl:service name="HelloWorldService">
<soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName>
<soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>remote://localhost:4447</soapjms:jndiURL>
+ <soapjms:jndiURL>remote://@jboss.bind.address@:4447</soapjms:jndiURL>
<wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
<soap:address location="jms:queue:testQueue"/>
</wsdl:port>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-16 10:03:58 UTC (rev 15969)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-16 10:23:19 UTC (rev 15970)
@@ -65,12 +65,12 @@
<wsdl:service name="HelloWorldService">
<soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName>
<soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>remote://localhost:4447</soapjms:jndiURL>
+ <soapjms:jndiURL>remote://@jboss.bind.address@:4447</soapjms:jndiURL>
<wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
<soap:address location="jms:queue:testQueue"/>
</wsdl:port>
<wsdl:port binding="tns:HttpHelloWorldServiceSoapBinding" name="HttpHelloWorldImplPort">
- <soap:address location="http://localhost:8080/jaxws-cxf-jms-http-deployment"/>
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-jms-http-deployment"/>
</wsdl:port>
</wsdl:service>
<wsdl:service name="HelloWorldServiceLocal">
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java 2012-03-16 10:03:58 UTC (rev 15969)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java 2012-03-16 10:23:19 UTC (rev 15970)
@@ -24,8 +24,6 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.xml.ws.Endpoint;
/**
@@ -38,7 +36,12 @@
@Override
public void init(ServletConfig config) throws ServletException
{
- String serviceURL = "http://localhost:18080/HelloWorldService";
+ String hostName = System.getProperty("jboss.bind.address", "localhost");
+ if (hostName.startsWith(":"))
+ {
+ hostName = "[" + hostName + "]";
+ }
+ String serviceURL = "http://" + hostName + ":18080/HelloWorldService";
_endpoint = Endpoint.publish(serviceURL, new HelloWorldImpl(Thread.currentThread().getContextClassLoader()));
}
@@ -47,5 +50,4 @@
{
_endpoint.stop();
}
-
}
\ No newline at end of file
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2012-03-16 10:03:58 UTC (rev 15969)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2012-03-16 10:23:19 UTC (rev 15970)
@@ -121,7 +121,7 @@
assertTrue(e.getCause() instanceof SocketTimeoutException);
}
- policy.setDecoupledEndpoint("http://localhost:18181/jaxws-samples-wsa/decoupled-endpoint");
+ policy.setDecoupledEndpoint("http://" + getServerHost() + ":18181/jaxws-samples-wsa/decoupled-endpoint");
String response = proxy.sayHello("Sleepy"); //this takes at least 30 secs... but now the client doesn't time out
assertEquals("Hello Sleepy!", response);
}
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2012-03-16 10:03:58 UTC (rev 15969)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2012-03-16 10:23:19 UTC (rev 15970)
@@ -58,7 +58,12 @@
try
{
ClientHelper helper = (ClientHelper) Class.forName(helperClassName).newInstance();
- helper.setTargetEndpoint("http://" + System.getProperty("jboss.bind.address", "localhost") + ":8080" + path);
+ String hostName = System.getProperty("jboss.bind.address", "localhost");
+ if (hostName.startsWith(":"))
+ {
+ hostName = "[" + hostName + "]";
+ }
+ helper.setTargetEndpoint("http://" + hostName + ":8080" + path);
List<String> failedTests = new LinkedList<String>();
List<String> errorTests = new LinkedList<String>();
Method[] methods = helper.getClass().getMethods();
More information about the jbossws-commits
mailing list