JBossWS SVN: r15950 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-14 11:10:49 -0400 (Wed, 14 Mar 2012)
New Revision: 15950
Modified:
common/trunk/pom.xml
Log:
Moving jbossws-common trunk to 2.1.0-SNAPSHOT version
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2012-03-14 15:08:47 UTC (rev 15949)
+++ common/trunk/pom.xml 2012-03-14 15:10:49 UTC (rev 15950)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<description>JBossWS Common</description>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -27,7 +27,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>2.1.0-SNAPSHOT</jbossws.spi.version>
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
<jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
<jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>
13 years
JBossWS SVN: r15949 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-14 11:08:47 -0400 (Wed, 14 Mar 2012)
New Revision: 15949
Modified:
spi/trunk/pom.xml
Log:
Moving jbossws spi trunk to 2.1.0-SNAPSHOT version
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2012-03-14 15:03:48 UTC (rev 15948)
+++ spi/trunk/pom.xml 2012-03-14 15:08:47 UTC (rev 15949)
@@ -7,7 +7,7 @@
<packaging>jar</packaging>
<description>JBossWS SPI</description>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
13 years
JBossWS SVN: r15948 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-14 11:03:48 -0400 (Wed, 14 Mar 2012)
New Revision: 15948
Added:
spi/branches/jbossws-spi-2.0.x/
Log:
13 years
JBossWS SVN: r15947 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-14 11:03:22 -0400 (Wed, 14 Mar 2012)
New Revision: 15947
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
[JBWS-3458] fixing appclient framework to be IPv6 compatible
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2012-03-14 15:02:46 UTC (rev 15946)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2012-03-14 15:03:22 UTC (rev 15947)
@@ -119,7 +119,14 @@
args.add(appclientArg);
}
}
- ap.process = new ProcessBuilder().command(args).start();
+ final ProcessBuilder pb = new ProcessBuilder().command(args);
+ // always propagate IPv6 related properties
+ final StringBuilder javaOptsValue = new StringBuilder();
+ javaOptsValue.append("\"-Djboss.bind.address=").append(undoIPv6Brackets(System.getProperty("jboss.bind.address", "localhost"))).append("\" ");
+ javaOptsValue.append("\"-Djava.net.preferIPv4Stack=").append(System.getProperty("java.net.preferIPv4Stack", "true")).append("\" ");
+ javaOptsValue.append("\"-Djava.net.preferIPv6Addresses=").append(System.getProperty("java.net.preferIPv6Addresses", "false")).append("\" ");
+ pb.environment().put("JAVA_OPTS", javaOptsValue.toString());
+ ap.process = pb.start();
ap.log = new FileOutputStream(new File(getAppclientOutputDir(), appclientShortName + ".log-" + System.currentTimeMillis()));
// appclient out
ap.outTask = new CopyJob(ap.process.getInputStream(),
@@ -132,6 +139,11 @@
return ap;
}
+ private static String undoIPv6Brackets(final String s)
+ {
+ return s.startsWith("[") ? s.substring(1, s.length() - 1) : s;
+ }
+
private static void shutdownAppclient(final String archive, final OutputStream os) throws IOException, InterruptedException
{
final File killFile = new File(getKillFileName(archive));
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-14 15:02:46 UTC (rev 15946)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-03-14 15:03:22 UTC (rev 15947)
@@ -207,6 +207,21 @@
{
try
{
+ if (host.startsWith(":"))
+ {
+ throw new IllegalArgumentException("JBossWS test suite requires IPv6 addresses to be wrapped with [] brackets. Expected format is: [" + host + "]");
+ }
+ if (host.startsWith("["))
+ {
+ if (System.getProperty("java.net.preferIPv4Stack") == null)
+ {
+ throw new IllegalStateException("always provide java.net.preferIPv4Stack JVM property when using IPv6 address format");
+ }
+ if (System.getProperty("java.net.preferIPv6Addresses") == null)
+ {
+ throw new IllegalStateException("always provide java.net.preferIPv6Addresses JVM property when using IPv6 address format");
+ }
+ }
final boolean isIPv6Address = InetAddress.getByName(host) instanceof Inet6Address;
final boolean isIPv6Formatted = isIPv6Address && host.startsWith("[");
return isIPv6Address && !isIPv6Formatted ? "[" + host + "]" : host;
13 years
JBossWS SVN: r15946 - in shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test: ws/jaxws/endpoint and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-14 11:02:46 -0400 (Wed, 14 Mar 2012)
New Revision: 15946
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/helper/TestServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
Log:
[JBWS-3458] fixing tests to be IPv6 compatible
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/helper/TestServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/helper/TestServlet.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/helper/TestServlet.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -58,7 +58,12 @@
try
{
ClientHelper helper = (ClientHelper) Class.forName(helperClassName).newInstance();
- helper.setTargetEndpoint("http://" + System.getProperty("jboss.bind.address", "localhost") + ":8080" + path);
+ String jbossBindAddress = System.getProperty("jboss.bind.address", "localhost");
+ if (jbossBindAddress.startsWith(":"))
+ {
+ jbossBindAddress = "[" + jbossBindAddress + "]";
+ }
+ helper.setTargetEndpoint("http://" + jbossBindAddress + ":8080" + path);
List<String> failedTests = new LinkedList<String>();
List<String> errorTests = new LinkedList<String>();
Method[] methods = helper.getClass().getMethods();
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -83,6 +83,7 @@
{
// Create the port
String hostName = System.getProperty("jboss.bind.address", "localhost");
+ hostName = hostName.indexOf(":") != -1 ? "[" + hostName + "]" : hostName;
// URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl");
URL wsdlURL = new URL("http://" + hostName + ":8081/jaxws-endpoint?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -40,9 +40,12 @@
String param = req.getParameter("param");
boolean clCheck = Boolean.parseBoolean(req.getParameter("clCheck"));
Client client = new Client(clCheck);
- String hostName = System.getProperty("jboss.bind.address", "localhost");
- //URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl");
- URL wsdlURL = new URL("http://" + hostName + ":8080/jaxws-jbws3223?wsdl");
+ String jbossBindAddress = System.getProperty("jboss.bind.address", "localhost");
+ if (jbossBindAddress.startsWith(":"))
+ {
+ jbossBindAddress = "[" + jbossBindAddress + "]";
+ }
+ URL wsdlURL = new URL("http://" + jbossBindAddress + ":8080/jaxws-jbws3223?wsdl");
String retStr = client.run(param, wsdlURL);
// Return the result
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -48,7 +48,7 @@
public void testAnonymousEndpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "AnonymousPOJOService");
- final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase1/AnonymousPOJOService?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3276-usecase1/AnonymousPOJOService?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final POJOIface port = service.getPort(POJOIface.class);
final String result = port.echo("hello");
@@ -58,7 +58,7 @@
public void testDeclaredEndpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "POJOImplService");
- final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase1/POJOService?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3276-usecase1/POJOService?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final POJOIface port = service.getPort(POJOIface.class);
final String result = port.echo("hello");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -48,7 +48,7 @@
public void testAnonymousEndpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3276", "AnonymousPOJOService");
- final URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3276-usecase2/AnonymousPOJOService?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3276-usecase2/AnonymousPOJOService?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final POJOIface port = service.getPort(POJOIface.class);
final String result = port.echo("hello");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -50,7 +50,7 @@
public void testPOJOEndpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "POJOEndpointService");
- final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/POJOEndpoint?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized/POJOEndpoint?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final EndpointIface port = service.getPort(EndpointIface.class);
final String result = port.echo("hello");
@@ -60,7 +60,7 @@
public void testEJB3Endpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "EJB3EndpointService");
- final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/EJB3Endpoint?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized/EJB3Endpoint?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final EndpointIface port = service.getPort(EndpointIface.class);
final String result = port.echo("hello");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -50,7 +50,7 @@
public void testEJB3Endpoint() throws Exception
{
final QName serviceName = new QName("org.jboss.test.ws.jaxws.jbws3367", "EJB3EndpointService");
- final URL wsdlURL = new URL("http://localhost:8080/jbws3367-customized/EJB3Endpoint?wsdl");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws3367-customized/EJB3Endpoint?wsdl");
final Service service = Service.create(wsdlURL, serviceName);
final EndpointIface port = service.getPort(EndpointIface.class);
final String result = port.echo("hello");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2012-03-14 15:01:31 UTC (rev 15945)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2012-03-14 15:02:46 UTC (rev 15946)
@@ -88,10 +88,15 @@
}
//call endpoint
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService"));
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2"));
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern3?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService3"));
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern4?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService4"));
+ String jbossBindAddress = System.getProperty("jboss.bind.address", "localhost");
+ if (jbossBindAddress.startsWith(":"))
+ {
+ jbossBindAddress = "[" + jbossBindAddress + "]";
+ }
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService"));
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2"));
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern3?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService3"));
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern4?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService4"));
res.getWriter().print("1");
}
13 years
JBossWS SVN: r15945 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-14 11:01:31 -0400 (Wed, 14 Mar 2012)
New Revision: 15945
Added:
common/branches/jbossws-common-2.0.x/
Log:
13 years
JBossWS SVN: r15944 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing: replyto and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-14 11:01:22 -0400 (Wed, 14 Mar 2012)
New Revision: 15944
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
Log:
[JBWS-3458] fixing tests to be IPv6 compatible
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.java 2012-03-14 14:57:00 UTC (rev 15943)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.java 2012-03-14 15:01:22 UTC (rev 15944)
@@ -38,6 +38,10 @@
public String getServerHost()
{
String hostName = System.getProperty("jboss.bind.address", "localhost");
+ if (hostName.startsWith(":"))
+ {
+ hostName = "[" + hostName + "]";
+ }
return hostName;
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-03-14 14:57:00 UTC (rev 15943)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-03-14 15:01:22 UTC (rev 15944)
@@ -53,7 +53,7 @@
{
try
{
- final String appclientArg = getServerHost();;
+ final String appclientArg = getServerHost();
final OutputStream appclientOS = new ByteArrayOutputStream();
JBossWSTestHelper.deployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-appclient.jar", appclientOS, appclientArg);
// wait till appclient stops
13 years
JBossWS SVN: r15943 - shared-testsuite/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-14 10:57:00 -0400 (Wed, 14 Mar 2012)
New Revision: 15943
Modified:
shared-testsuite/trunk/pom.xml
Log:
Moving jbossws-shared-testsuite trunk to 4.1.0-SNAPSHOT version
Modified: shared-testsuite/trunk/pom.xml
===================================================================
--- shared-testsuite/trunk/pom.xml 2012-03-14 14:28:16 UTC (rev 15942)
+++ shared-testsuite/trunk/pom.xml 2012-03-14 14:57:00 UTC (rev 15943)
@@ -6,7 +6,7 @@
<artifactId>jbossws-shared-testsuite</artifactId>
<description>JBossWS Stack Agnostic Testsuite</description>
- <version>4.0.3-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
13 years
JBossWS SVN: r15942 - shared-testsuite/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-14 10:28:16 -0400 (Wed, 14 Mar 2012)
New Revision: 15942
Added:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/
Log:
13 years