JBossWS SVN: r17990 - in stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss: wsf/stack/jbws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-10 06:25:14 -0400 (Thu, 10 Oct 2013)
New Revision: 17990
Modified:
stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java
stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java
Log:
[JBWS-3717] Fixing EndpointResolver impls to check endpoint state
Modified: stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java 2013-10-09 15:15:35 UTC (rev 17989)
+++ stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java 2013-10-10 10:25:14 UTC (rev 17990)
@@ -26,6 +26,7 @@
import org.jboss.ws.NativeLoggers;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.EndpointState;
import org.jboss.wsf.spi.management.EndpointResolver;
/**
@@ -55,16 +56,19 @@
while(endpoints.hasNext())
{
Endpoint auxEndpoint = endpoints.next();
- ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class);
- if (pcName.equals(sepMetaData.getPortComponentName()))
+ if (EndpointState.STARTED.equals(auxEndpoint.getState()))
{
- if (endpoint != null)
+ ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class);
+ if (pcName.equals(sepMetaData.getPortComponentName()))
{
- NativeLoggers.ROOT_LOGGER.multipleServiceEndpointFoundFor(pcLink);
- endpoint = null;
- break;
+ if (endpoint != null)
+ {
+ NativeLoggers.ROOT_LOGGER.multipleServiceEndpointFoundFor(pcLink);
+ endpoint = null;
+ break;
+ }
+ endpoint = auxEndpoint;
}
- endpoint = auxEndpoint;
}
}
Modified: stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java 2013-10-09 15:15:35 UTC (rev 17989)
+++ stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java 2013-10-10 10:25:14 UTC (rev 17990)
@@ -26,6 +26,7 @@
import javax.management.ObjectName;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.EndpointState;
import org.jboss.wsf.spi.management.EndpointResolver;
/**
@@ -55,13 +56,16 @@
while(endpoints.hasNext())
{
Endpoint auxEndpoint = endpoints.next();
- ObjectName sepId = auxEndpoint.getName();
- String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
- String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ if (EndpointState.STARTED.equals(auxEndpoint.getState()))
{
- endpoint = auxEndpoint;
- break;
+ ObjectName sepId = auxEndpoint.getName();
+ String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
+ String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ {
+ endpoint = auxEndpoint;
+ break;
+ }
}
}
10 years, 6 months
JBossWS SVN: r17989 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-09 11:15:35 -0400 (Wed, 09 Oct 2013)
New Revision: 17989
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
Log:
Reverting commit 17477 to shared testsuite
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2013-10-08 16:57:49 UTC (rev 17988)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2013-10-09 15:15:35 UTC (rev 17989)
@@ -21,9 +21,7 @@
*/
package org.jboss.test.ws.management.recording;
-import java.net.InetAddress;
import java.net.URL;
-import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -34,12 +32,12 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+import org.jboss.ws.api.monitoring.Record;
+import org.jboss.ws.api.monitoring.RecordFilter;
import org.jboss.ws.common.monitoring.AndFilter;
import org.jboss.ws.common.monitoring.HostFilter;
import org.jboss.ws.common.monitoring.NotFilter;
import org.jboss.ws.common.monitoring.OperationFilter;
-import org.jboss.ws.api.monitoring.Record;
-import org.jboss.ws.api.monitoring.RecordFilter;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
@@ -134,7 +132,8 @@
port.echo1("Test getRecordsByClientHost");
//We have client and server on the same host here...
- String host = getClientHostName(getServerHost());
+ 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" });
@@ -145,14 +144,6 @@
assertTrue("There are records for 72.21.203.1", amazonRecords.size() == 0);
}
- private static String getClientHostName(String host) throws UnknownHostException {
- //AS8 (using Undertow) actually does reverse lookup in ServletRequest::getRemoteHost(), AS720 doesn't...
- final String ip = InetAddress.getByName(host).getHostAddress();
- String clientHost = (ip.equals(host) || isTargetJBoss7()) ? ip : InetAddress.getByName(ip).getHostName();
- if ("[::1]".equals(clientHost)) clientHost = "0:0:0:0:0:0:0:1"; // IPv6 hack
- return clientHost;
- }
-
@SuppressWarnings("unchecked")
public void testGetMatchingRecords() throws Exception
{
10 years, 6 months
JBossWS SVN: r17988 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-08 12:57:49 -0400 (Tue, 08 Oct 2013)
New Revision: 17988
Modified:
stack/cxf/trunk/pom.xml
Log:
Use latest spi
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-10-08 16:49:36 UTC (rev 17987)
+++ stack/cxf/trunk/pom.xml 2013-10-08 16:57:49 UTC (rev 17988)
@@ -60,7 +60,7 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>2.2.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>2.2.2.Final</jbossws.spi.version>
<jbossws.common.version>2.2.2.Final</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
<jbossws.jboss712.version>4.2.1.Final</jbossws.jboss712.version>
10 years, 6 months
JBossWS SVN: r17986 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-08 12:37:14 -0400 (Tue, 08 Oct 2013)
New Revision: 17986
Added:
spi/tags/jbossws-spi-2.2.2.Final/
Log:
Tagging jbossws-spi-2.2.2.Final
10 years, 6 months
JBossWS SVN: r17985 - in stack/cxf/trunk/modules/resources/src/main/resources/modules: jboss720/org/jboss/ws/saaj-impl/main and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-08 12:22:06 -0400 (Tue, 08 Oct 2013)
New Revision: 17985
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/saaj-impl/main/module.xml
Log:
[JBWS-3715] Adding jaxws-client module dependency to saaj-impl module to have the SOAPConnectionFactory resolved from jbossws-cxf-client
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/main/module.xml 2013-10-08 15:07:43 UTC (rev 17984)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/main/module.xml 2013-10-08 16:22:06 UTC (rev 17985)
@@ -29,6 +29,7 @@
</resources>
<dependencies>
+ <module name="org.jboss.ws.jaxws-client" services="import"/> <!-- to pull the jbossws-cxf SOAPConnection impl -->
<module name="com.sun.xml.messaging.saaj" services="import"/>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/module.xml 2013-10-08 15:07:43 UTC (rev 17984)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/saaj-impl/main/module.xml 2013-10-08 16:22:06 UTC (rev 17985)
@@ -33,6 +33,7 @@
</resources>
<dependencies>
+ <module name="org.jboss.ws.jaxws-client" services="import"/> <!-- to pull the jbossws-cxf SOAPConnection impl -->
<module name="com.sun.xml.messaging.saaj" services="import"/>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/saaj-impl/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/saaj-impl/main/module.xml 2013-10-08 15:07:43 UTC (rev 17984)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/saaj-impl/main/module.xml 2013-10-08 16:22:06 UTC (rev 17985)
@@ -33,6 +33,7 @@
</resources>
<dependencies>
+ <module name="org.jboss.ws.jaxws-client" services="import"/> <!-- to pull the jbossws-cxf SOAPConnection impl -->
<module name="com.sun.xml.messaging.saaj" services="import"/>
</dependencies>
10 years, 6 months
JBossWS SVN: r17984 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-08 11:07:43 -0400 (Tue, 08 Oct 2013)
New Revision: 17984
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java
Log:
[JBWS-3716] Reveal hidden exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java 2013-10-07 09:35:52 UTC (rev 17983)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.java 2013-10-08 15:07:43 UTC (rev 17984)
@@ -25,6 +25,8 @@
import javax.ejb.Stateless;
import javax.xml.ws.WebServiceRef;
+import org.jboss.logging.Logger;
+
/**
* This class verifies the default bus is not changed by
* basic client use (creation of bus through BusFactory.newInstance().createBus(),
@@ -46,9 +48,14 @@
AbstractClient.testBusCreation();
}
- public void testSOAPConnection(String host) throws BusTestException, Exception
+ public void testSOAPConnection(String host) throws BusTestException
{
- AbstractClient.testSOAPConnection(host);
+ try {
+ AbstractClient.testSOAPConnection(host);
+ } catch (Exception e) {
+ Logger.getLogger(this.getClass()).error("Could not run 'testSOAPConnection'", e);
+ throw new BusTestException(e.getMessage());
+ }
}
public void testWebServiceRef() throws BusTestException
@@ -56,8 +63,13 @@
AbstractClient.testWebServiceRef(port);
}
- public void testWebServiceClient(String host) throws BusTestException, Exception
+ public void testWebServiceClient(String host) throws BusTestException
{
- AbstractClient.testWebServiceClient(host);
+ try {
+ AbstractClient.testWebServiceClient(host);
+ } catch (Exception e) {
+ Logger.getLogger(this.getClass()).error("Could not run 'testWebServiceClient'", e);
+ throw new BusTestException(e.getMessage());
+ }
}
}
10 years, 6 months
JBossWS SVN: r17983 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-07 05:35:52 -0400 (Mon, 07 Oct 2013)
New Revision: 17983
Modified:
stack/cxf/trunk/pom.xml
Log:
Update wfly version to Beta2
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-10-07 09:33:41 UTC (rev 17982)
+++ stack/cxf/trunk/pom.xml 2013-10-07 09:35:52 UTC (rev 17983)
@@ -70,7 +70,7 @@
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Final</jboss720.version>
- <wildfly800.version>8.0.0.Beta1-SNAPSHOT</wildfly800.version>
+ <wildfly800.version>8.0.0.Beta2-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.7.7</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
10 years, 6 months
JBossWS SVN: r17982 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-07 05:33:41 -0400 (Mon, 07 Oct 2013)
New Revision: 17982
Modified:
hudson/trunk/ant.properties.example
Log:
Update version in hudson conf
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2013-10-04 17:43:35 UTC (rev 17981)
+++ hudson/trunk/ant.properties.example 2013-10-07 09:33:41 UTC (rev 17982)
@@ -33,7 +33,7 @@
hudson.jboss720.rev=7.2.0.Final-prerelease1
hudson.jboss800.url=https://github.com/wildfly/wildfly
-hudson.jboss800.build=wildfly-8.0.0.Beta1-SNAPSHOT
+hudson.jboss800.build=wildfly-8.0.0.Beta2-SNAPSHOT
hudson.jboss800.rev=master
hudson.mail.recipients=
10 years, 6 months
JBossWS SVN: r17981 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-10-04 13:43:35 -0400 (Fri, 04 Oct 2013)
New Revision: 17981
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
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/udp/TestServlet.java
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/shared-tests/src/test/ant-import/build-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
Log:
[JBWS-3714] Futher testsuite fixes
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-10-04 17:43:35 UTC (rev 17981)
@@ -219,6 +219,9 @@
<include name="org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.class"/>
<include name="org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorld*.class"/>
</classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common"/>
+ </manifest>
</war>
<!-- jaxws-cxf-fastinfoset -->
@@ -545,7 +548,7 @@
dir="${tests.output.dir}/test-resources/jaxws/cxf/udp/META-INF/wsdl"
prefix="WEB-INF/classes/META-INF/wsdl"/>
<manifest>
- <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services"/>
+ <attribute name="Dependencies" value="org.jboss.ws.common,org.jboss.ws.cxf.jbossws-cxf-client services"/>
</manifest>
</war>
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 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java 2013-10-04 17:43:35 UTC (rev 17981)
@@ -26,6 +26,8 @@
import javax.servlet.http.HttpServlet;
import javax.xml.ws.Endpoint;
+import org.jboss.ws.common.utils.AddressUtils;
+
/**
* @author Magesh Kumar B <mageshbk(a)jboss.com> (C) 2011 Red Hat Inc.
*/
@@ -36,11 +38,7 @@
@Override
public void init(ServletConfig config) throws ServletException
{
- String hostName = System.getProperty("jboss.bind.address", "localhost");
- if (hostName.startsWith(":"))
- {
- hostName = "[" + hostName + "]";
- }
+ String hostName = toIPv6URLFormat(System.getProperty("jboss.bind.address", "localhost"));
String serviceURL = "http://" + hostName + ":18080/HelloWorldService";
_endpoint = Endpoint.publish(serviceURL, new HelloWorldImpl(Thread.currentThread().getContextClassLoader()));
}
@@ -50,4 +48,18 @@
{
_endpoint.stop();
}
+
+ private String toIPv6URLFormat(final String host)
+ {
+ boolean isIPv6URLFormatted = false;
+ if (host.startsWith("[") && host.endsWith("]")) {
+ isIPv6URLFormatted = true;
+ }
+ //return IPv6 URL formatted address
+ if (isIPv6URLFormatted) {
+ return host;
+ } else {
+ return AddressUtils.isValidIPv6Address(host) ? "[" + host + "]" : host;
+ }
+ }
}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/TestServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/TestServlet.java 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/TestServlet.java 2013-10-04 17:43:35 UTC (rev 17981)
@@ -34,6 +34,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.jboss.ws.common.utils.AddressUtils;
@WebServlet(name = "TestServlet", urlPatterns = "/*")
public class TestServlet extends HttpServlet
@@ -77,11 +78,20 @@
}
private static String getHost() {
- String hostName = System.getProperty("jboss.bind.address", "localhost");
- if (hostName.startsWith(":"))
- {
- hostName = "[" + hostName + "]";
+ return toIPv6URLFormat(System.getProperty("jboss.bind.address", "localhost"));
+ }
+
+ private static String toIPv6URLFormat(final String host)
+ {
+ boolean isIPv6URLFormatted = false;
+ if (host.startsWith("[") && host.endsWith("]")) {
+ isIPv6URLFormatted = true;
}
- return hostName;
+ //return IPv6 URL formatted address
+ if (isIPv6URLFormatted) {
+ return host;
+ } else {
+ return AddressUtils.isValidIPv6Address(host) ? "[" + host + "]" : host;
+ }
}
}
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 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.java 2013-10-04 17:43:35 UTC (rev 17981)
@@ -65,7 +65,9 @@
List<ServiceMBean> services = new LinkedList<ServiceMBean>();
StaticService service = new StaticService();
- service.setEndpoints(Arrays.asList("http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService", "http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService"));
+ service.setEndpoints(Arrays.asList("http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService",
+ "http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService",
+ "http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust/SecurityService"));
services.add(service);
TokenIssueOperation issueOperation = new TokenIssueOperation();
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2013-10-04 17:43:35 UTC (rev 17981)
@@ -1193,6 +1193,9 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3223/WEB-INF">
<include name="wsdl/**" />
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common" />
+ </manifest>
</war>
<!-- jaxws-jbws3250 -->
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2013-10-04 17:43:35 UTC (rev 17981)
@@ -562,6 +562,9 @@
<webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF" erroronmissingdir="false">
<include name="wsdl/**"/>
</webinf>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common" />
+ </manifest>
</war>
<!-- management-recording-as7.jar -->
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2013-10-04 17:43:35 UTC (rev 17981)
@@ -31,6 +31,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.jboss.ws.common.utils.AddressUtils;
+
@SuppressWarnings("serial")
public class TestServlet extends HttpServlet
{
@@ -40,12 +42,7 @@
String param = req.getParameter("param");
boolean clCheck = Boolean.parseBoolean(req.getParameter("clCheck"));
Client client = new Client(clCheck);
- String jbossBindAddress = System.getProperty("jboss.bind.address", "localhost");
- if (jbossBindAddress.startsWith(":"))
- {
- jbossBindAddress = "[" + jbossBindAddress + "]";
- }
- URL wsdlURL = new URL("http://" + jbossBindAddress + ":8080/jaxws-jbws3223?wsdl");
+ URL wsdlURL = new URL("http://" + getHost() + ":8080/jaxws-jbws3223?wsdl");
String retStr = client.run(param, wsdlURL);
// Return the result
@@ -54,5 +51,22 @@
pw.close();
}
+ private static String getHost() {
+ return toIPv6URLFormat(System.getProperty("jboss.bind.address", "localhost"));
+ }
+ private static String toIPv6URLFormat(final String host)
+ {
+ boolean isIPv6URLFormatted = false;
+ if (host.startsWith("[") && host.endsWith("]")) {
+ isIPv6URLFormatted = true;
+ }
+ //return IPv6 URL formatted address
+ if (isIPv6URLFormatted) {
+ return host;
+ } else {
+ return AddressUtils.isValidIPv6Address(host) ? "[" + host + "]" : host;
+ }
+ }
+
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2013-10-04 17:43:35 UTC (rev 17981)
@@ -166,6 +166,7 @@
l.add("localhost");
l.add("127.0.0.1");
l.add("[::1]");
+ l.add("[0:0:0:0:0:0:0:1]");
HostFilter hostFilter = new HostFilter(l,false); //destination
RecordFilter[] filters = new RecordFilter[] {operationFilter, hostFilter};
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2013-10-04 16:37:48 UTC (rev 17980)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2013-10-04 17:43:35 UTC (rev 17981)
@@ -22,14 +22,8 @@
package org.jboss.test.ws.publish;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.net.URL;
import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
@@ -41,6 +35,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+import org.jboss.ws.common.utils.AddressUtils;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
@@ -89,11 +84,7 @@
}
//call endpoint
- String jbossBindAddress = System.getProperty("jboss.bind.address", "localhost");
- if (jbossBindAddress.startsWith(":"))
- {
- jbossBindAddress = "[" + jbossBindAddress + "]";
- }
+ String jbossBindAddress = toIPv6URLFormat(System.getProperty("jboss.bind.address", "localhost"));
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"));
@@ -124,6 +115,20 @@
}
}
}
+
+ private static String toIPv6URLFormat(final String host)
+ {
+ boolean isIPv6URLFormatted = false;
+ if (host.startsWith("[") && host.endsWith("]")) {
+ isIPv6URLFormatted = true;
+ }
+ //return IPv6 URL formatted address
+ if (isIPv6URLFormatted) {
+ return host;
+ } else {
+ return AddressUtils.isValidIPv6Address(host) ? "[" + host + "]" : host;
+ }
+ }
// See https://issues.jboss.org/browse/JBWS-3579
//
10 years, 6 months