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.
by jbossws-commits＠lists.jboss.org
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,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
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();
13 years
JBossWS SVN: r15969 - stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-16 06:03:58 -0400 (Fri, 16 Mar 2012)
New Revision: 15969
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
Log:
sync. hornetq
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-16 10:02:39 UTC (rev 15968)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-16 10:03:58 UTC (rev 15969)
@@ -709,13 +709,13 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>2.2.11.Final</version>
+ <version>2.2.13.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>2.2.11.Final</version>
+ <version>2.2.13.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
13 years
JBossWS SVN: r15967 - in stack/cxf/trunk/modules: client and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-16 06:02:12 -0400 (Fri, 16 Mar 2012)
New Revision: 15967
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
Log:
Minor cleanup / sort of dependencies version
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2012-03-15 15:12:24 UTC (rev 15966)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2012-03-16 10:02:12 UTC (rev 15967)
@@ -86,7 +86,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2012-03-15 15:12:24 UTC (rev 15966)
+++ stack/cxf/trunk/modules/client/pom.xml 2012-03-16 10:02:12 UTC (rev 15967)
@@ -230,7 +230,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-03-15 15:12:24 UTC (rev 15966)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-03-16 10:02:12 UTC (rev 15967)
@@ -34,7 +34,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-15 15:12:24 UTC (rev 15966)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-16 10:02:12 UTC (rev 15967)
@@ -24,10 +24,13 @@
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
+ <log4j.output.dir>${project.build.directory}</log4j.output.dir>
+ <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir>
+
<org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
- <log4j.output.dir>${project.build.directory}</log4j.output.dir>
- <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir>
+ <gnu.getopt.version>1.0.13</gnu.getopt.version>
+ <log4j.version>1.2.14</log4j.version>
</properties>
<!-- Modules -->
@@ -53,7 +56,7 @@
<dependency>
<groupId>gnu-getopt</groupId>
<artifactId>getopt</artifactId>
- <version>1.0.13</version>
+ <version>${gnu.getopt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -101,7 +104,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-03-15 15:12:24 UTC (rev 15966)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-03-16 10:02:12 UTC (rev 15967)
@@ -24,7 +24,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
13 years
JBossWS SVN: r15966 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-15 11:12:24 -0400 (Thu, 15 Mar 2012)
New Revision: 15966
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java
Log:
[JBWS-3460] Fixing sts test with IPv6 addresses
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2012-03-15 13:21:15 UTC (rev 15965)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2012-03-15 15:12:24 UTC (rev 15966)
@@ -65,7 +65,7 @@
List<ServiceMBean> services = new LinkedList<ServiceMBean>();
StaticService service = new StaticService();
- service.setEndpoints(Arrays.asList("http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust"));
+ service.setEndpoints(Arrays.asList("http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust", "http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust"));
services.add(service);
TokenIssueOperation issueOperation = new TokenIssueOperation();
13 years
JBossWS SVN: r15965 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-15 09:21:15 -0400 (Thu, 15 Mar 2012)
New Revision: 15965
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java
Log:
[JBWS-3458] fixing tests to be IPv6 compatible
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2012-03-15 11:58:08 UTC (rev 15964)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2012-03-15 13:21:15 UTC (rev 15965)
@@ -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/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-15 11:58:08 UTC (rev 15964)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-15 13:21:15 UTC (rev 15965)
@@ -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/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-15 11:58:08 UTC (rev 15964)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-15 13:21:15 UTC (rev 15965)
@@ -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/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java 2012-03-15 11:58:08 UTC (rev 15964)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java 2012-03-15 13:21:15 UTC (rev 15965)
@@ -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/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2012-03-15 11:58:08 UTC (rev 15964)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2012-03-15 13:21:15 UTC (rev 15965)
@@ -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/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2012-03-15 11:58:08 UTC (rev 15964)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2012-03-15 13:21:15 UTC (rev 15965)
@@ -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();
13 years
JBossWS SVN: r15964 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-15 07:58:08 -0400 (Thu, 15 Mar 2012)
New Revision: 15964
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3454] Fixing issues with test username/pwd (a leftover typo in build-testuite.xml and an issue with Maven 2.2.x and 3.0.x having different behaviours)
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-03-15 11:55:04 UTC (rev 15963)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-03-15 11:58:08 UTC (rev 15964)
@@ -341,7 +341,7 @@
public static String getTestUsername() {
String prop = System.getProperty(TEST_USERNAME);
- if (prop == null || "".equals(prop)) {
+ if (prop == null || "".equals(prop) || ("${" + TEST_USERNAME + "}").equals(prop)) {
prop = "kermit";
}
return prop;
@@ -349,7 +349,7 @@
public static String getTestPassword() {
String prop = System.getProperty(TEST_PASSWORD);
- if (prop == null || "".equals(prop)) {
+ if (prop == null || "".equals(prop) || ("${" + TEST_PASSWORD + "}").equals(prop)) {
prop = "thefrog";
}
return prop;
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-15 11:55:04 UTC (rev 15963)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-15 11:58:08 UTC (rev 15964)
@@ -660,7 +660,7 @@
<sysproperty key="test.classes.directory" value="${tests.output.dir}/test-classes"/>
<sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/>
<sysproperty key="test.username" value="${test.username}"/>
- <sysproperty key="test.password" value="${test.password"/>
+ <sysproperty key="test.password" value="${test.password}"/>
<sysproperty key="binary.distribution" value="true"/>
<classpath>
<path refid="tests.client.classpath"/>
13 years
JBossWS SVN: r15963 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-15 07:55:04 -0400 (Thu, 15 Mar 2012)
New Revision: 15963
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
sync. hornetq with AS7 versions
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-15 11:55:04 UTC (rev 15963)
@@ -1109,13 +1109,13 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>2.2.11.Final</version>
+ <version>2.2.13.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>2.2.11.Final</version>
+ <version>2.2.13.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -1329,13 +1329,13 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>2.2.11.Final</version>
+ <version>2.2.13.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>2.2.11.Final</version>
+ <version>2.2.13.Final</version>
<scope>test</scope>
</dependency>
</dependencies>
13 years
JBossWS SVN: r15962 - in stack/native/branches/jbossws-native-4.0.x: modules/client and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-14 14:26:20 -0400 (Wed, 14 Mar 2012)
New Revision: 15962
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml
stack/native/branches/jbossws-native-4.0.x/pom.xml
Log:
The 4.0.x branch now builds to 4.0.3-SNAPSHOT
Modified: stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/client/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -5,12 +5,12 @@
<name>JBoss Web Services - Stack Native Distribution</name>
<artifactId>jbossws-native-dist</artifactId>
<packaging>pom</packaging>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/endorsed/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/services/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-14 18:18:03 UTC (rev 15961)
+++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-14 18:26:20 UTC (rev 15962)
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<description>JBossWS Native stack</description>
- <version>4.0.2-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<!-- Parent -->
<parent>
13 years