From fbbad3c5499f0bdaad13a9ed121feef44f631f71 Mon Sep 17 00:00:00 2001
From: Jim Ma <ema@redhat.com>
Date: Wed, 12 Jul 2023 12:02:47 +0800
Subject: [PATCH] [JBWS-4387]:Add cxf modules and fix AddressingTestCase

---
 modules/feature-pack/pom.xml                  | 125 ++++++++++++++++
 .../base/org/apache/cxf/impl/main/module.xml  | 138 ++++++++++++++++++
 .../base/org/apache/cxf/main/module.xml       |  70 +++++++++
 .../apache/cxf/services-sts/main/module.xml   |  78 ++++++++++
 .../apache/cxf/ws-security/main/module.xml    |  65 +++++++++
 .../jaxws/samples/wsa/AddressingTestCase.java |   2 +-
 6 files changed, 477 insertions(+), 1 deletion(-)
 create mode 100644 modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
 create mode 100644 modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
 create mode 100644 modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
 create mode 100644 modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml

diff --git a/modules/feature-pack/pom.xml b/modules/feature-pack/pom.xml
index bfc365136..cbb39e106 100644
--- a/modules/feature-pack/pom.xml
+++ b/modules/feature-pack/pom.xml
@@ -65,6 +65,131 @@
             <artifactId>opensaml-xacml-saml-impl</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!--CXF dependencies-->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-soap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-coloc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-features-clustering</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-management</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-jms</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-local</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http-hc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-simple</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-addr</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-mex</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-rm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-policy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-java2ws</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.services.sts</groupId>
+            <artifactId>cxf-services-sts-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.services.ws-discovery</groupId>
+            <artifactId>cxf-services-ws-discovery-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-wsdlto-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-features-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjcplugins</groupId>
+            <artifactId>cxf-xjc-boolean</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjcplugins</groupId>
+            <artifactId>cxf-xjc-bug986</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjcplugins</groupId>
+            <artifactId>cxf-xjc-dv</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjcplugins</groupId>
+            <artifactId>cxf-xjc-ts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjc-utils</groupId>
+            <artifactId>cxf-xjc-runtime</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-ee-galleon-pack</artifactId>
diff --git a/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
new file mode 100644
index 000000000..7051b3f31
--- /dev/null
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2012, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.9" name="org.apache.cxf.impl">
+
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="${org.jboss.ws.cxf:jbossws-cxf-server}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-bindings-coloc}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-bindings-soap}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-bindings-xml}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-databinding-aegis}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-databinding-jaxb}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-features-clustering}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-frontend-jaxws}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-frontend-simple}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-management}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-security}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-security-saml}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-transports-http}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-transports-http-hc}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-transports-jms}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-transports-local}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-wsdl}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-ws-addr}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-ws-mex}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-ws-policy}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-ws-rm}"/>
+        <artifact name="${org.apache.cxf:cxf-tools-common}"/>
+        <artifact name="${org.apache.cxf:cxf-tools-java2ws}"/>
+        <artifact name="${org.apache.cxf:cxf-tools-validator}"/>
+        <artifact name="${org.apache.cxf:cxf-tools-wsdlto-core}"/>
+        <artifact name="${org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb}"/>
+        <artifact name="${org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws}"/>
+        <artifact name="${org.apache.cxf.services.ws-discovery:cxf-services-ws-discovery-api}"/>
+        <artifact name="${org.apache.cxf.xjcplugins:cxf-xjc-boolean}"/>
+        <artifact name="${org.apache.cxf.xjcplugins:cxf-xjc-bug986}"/>
+        <artifact name="${org.apache.cxf.xjcplugins:cxf-xjc-dv}"/>
+        <artifact name="${org.apache.cxf.xjcplugins:cxf-xjc-ts}"/>
+        <artifact name="${org.apache.cxf.xjc-utils:cxf-xjc-runtime}"/>
+    </resources>
+
+    <dependencies>
+        <module name="java.desktop"/>
+        <module name="java.logging"/>
+        <module name="java.sql"/>
+        <module name="java.management"/>
+        <module name="java.management.rmi"/>
+        <module name="java.naming"/>
+        <module name="java.net.http"/>
+        <module name="java.rmi"/>
+        <module name="java.security.jgss"/>
+        <module name="java.xml"/>
+        <module name="asm.asm"/>
+        <module name="jakarta.annotation.api"/>
+        <module name="jakarta.jms.api"/>
+        <module name="jakarta.mail.api"/>
+        <module name="jakarta.resource.api"/>
+        <module name="jakarta.servlet.api"/>
+        <module name="javax.wsdl4j.api"/>
+        <module name="jakarta.xml.bind.api" services="import"/>
+        <module name="com.sun.xml.bind" services="import"/>
+        <module name="jakarta.xml.soap.api"/>
+        <module name="jakarta.xml.ws.api"/>
+        <module name="org.apache.commons.lang3"/>
+        <module name="org.apache.commons.logging"/>
+        <module name="org.apache.httpcomponents"/>
+        <module name="org.apache.neethi"/>
+        <module name="org.apache.velocity"/>
+        <module name="org.apache.xml-resolver"/>
+        <module name="org.apache.ws.xmlschema"/>
+        <module name="org.apache.ws.security"/>
+        <module name="org.apache.santuario.xmlsec"/>
+        <module name="org.codehaus.woodstox"/>
+        <module name="org.joda.time"/>
+        <module name="org.opensaml"/>
+        <module name="org.apache.cxf" export="true">
+          <imports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </imports>
+          <exports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </exports>
+        </module>
+        <module name="org.apache.cxf.ws-security" export="true" services="export">
+          <imports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </imports>
+          <exports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </exports>
+        </module>
+        <module name="org.apache.cxf.services-sts" export="true" services="export">
+          <imports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </imports>
+          <exports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </exports>
+        </module>
+        <module name="org.springframework.spring" optional="true">
+            <imports>
+                <include path="META-INF"/>
+            </imports>
+        </module>
+    </dependencies>
+
+</module>
diff --git a/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
new file mode 100644
index 000000000..5d51742c5
--- /dev/null
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.9" name="org.apache.cxf">
+
+    <resources>
+        <artifact name="${org.apache.cxf:cxf-core}"/>
+        <artifact name="${org.apache.cxf:cxf-rt-features-logging}"/>
+    </resources>
+
+    <dependencies>
+        <module name="java.compiler"/>
+        <module name="java.desktop"/>
+        <module name="java.logging"/>
+        <module name="java.management"/>
+        <module name="java.naming"/>
+        <module name="java.sql"/>
+        <module name="java.xml"/>
+        <module name="org.apache.cxf.impl" services="import">
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
+        </module>
+        <module name="org.slf4j"/>
+        <module name="asm.asm" />
+        <module name="jakarta.annotation.api" />
+        <module name="jakarta.validation.api" optional="true"/>
+        <module name="jakarta.mail.api" />
+        <module name="jakarta.resource.api" />
+        <module name="javax.wsdl4j.api" />
+        <module name="jakarta.xml.bind.api" services="import"/>
+        <module name="com.sun.xml.bind" services="import"/>
+        <module name="com.sun.xml.messaging.saaj" export="true" services="export"/>
+        <module name="jakarta.xml.soap.api" />
+        <module name="jakarta.xml.ws.api" />
+        <module name="com.sun.xml.fastinfoset"/>
+        <module name="org.apache.neethi" />
+        <module name="org.apache.ws.xmlschema" />
+        <module name="org.codehaus.woodstox" />
+        <module name="org.apache.xml-resolver" />
+        <module name="org.springframework.spring" optional="true">
+            <imports>
+                <include path="META-INF"/>
+            </imports>
+        </module>
+    </dependencies>
+
+</module>
diff --git a/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
new file mode 100644
index 000000000..a00008709
--- /dev/null
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2016, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.9" name="org.apache.cxf.services-sts">
+
+    <resources>
+        <artifact name="${org.apache.cxf.services.sts:cxf-services-sts-core}"/>
+    </resources>
+
+    <dependencies>
+        <module name="java.logging"/>
+        <module name="java.management"/>
+        <module name="java.naming"/>
+        <module name="java.security.jgss"/>
+        <module name="java.xml"/>
+        <module name="java.xml.crypto"/>
+        <module name="org.apache.cxf.ws-security" services="import">
+          <imports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </imports>
+          <exports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </exports>
+        </module>
+        <module name="org.apache.cxf.impl" services="import">
+          <imports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </imports>
+        </module>
+        <module name="asm.asm" />
+        <module name="jakarta.annotation.api" />
+        <module name="jakarta.jms.api" />
+        <module name="jakarta.mail.api" />
+        <module name="jakarta.resource.api" />
+        <module name="jakarta.servlet.api" />
+        <module name="javax.wsdl4j.api" />
+        <module name="jakarta.xml.bind.api" services="import"/>
+        <module name="com.sun.xml.bind" services="import"/>
+        <module name="jakarta.xml.soap.api" />
+        <module name="jakarta.xml.ws.api" />
+        <module name="org.apache.commons.lang3" />
+        <module name="org.apache.httpcomponents"/>
+        <module name="org.apache.neethi" />
+        <module name="org.apache.velocity" />
+        <module name="org.apache.xml-resolver" />
+        <module name="org.apache.ws.xmlschema" />
+        <module name="org.apache.ws.security" />
+        <module name="org.apache.santuario.xmlsec" />
+        <module name="org.codehaus.woodstox" />
+        <module name="org.joda.time" />
+        <module name="org.opensaml" />
+    </dependencies>
+
+</module>
diff --git a/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml
new file mode 100644
index 000000000..ed788e4e9
--- /dev/null
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2016, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.9" name="org.apache.cxf.ws-security">
+
+    <resources>
+        <artifact name="${org.apache.cxf:cxf-rt-ws-security}"/>
+    </resources>
+
+    <dependencies>
+        <module name="asm.asm" />
+        <module name="com.sun.xml.bind" services="import"/>
+        <module name="java.logging" />
+        <module name="java.security.jgss" />
+        <module name="java.xml" />
+        <module name="jakarta.annotation.api" />
+        <module name="jakarta.jms.api" />
+        <module name="jakarta.mail.api" />
+        <module name="jakarta.resource.api" />
+        <module name="jakarta.servlet.api" />
+        <module name="javax.wsdl4j.api" />
+        <module name="jakarta.xml.bind.api" services="import"/>
+        <module name="jakarta.xml.soap.api" />
+        <module name="jakarta.xml.ws.api" />
+        <module name="org.apache.commons.lang3" />
+        <module name="org.apache.httpcomponents"/>
+        <module name="org.apache.neethi" />
+        <module name="org.apache.velocity" />
+        <module name="org.apache.xml-resolver" />
+        <module name="org.apache.ws.xmlschema" />
+        <module name="org.apache.ws.security" />
+        <module name="org.apache.santuario.xmlsec" />
+        <module name="org.codehaus.woodstox" />
+        <module name="org.joda.time" />
+        <module name="org.opensaml" />
+        <module name="org.apache.cxf.impl" services="import">
+          <imports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </imports>
+        </module>
+    </dependencies>
+
+</module>
diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
index e41ac3ce6..5ecd435b0 100644
--- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
+++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
@@ -143,7 +143,7 @@ public void testDecoupledEndpointForLongLastingProcessingOfInvocations() throws
             proxy.sayHello("Sleepy"); //this takes at least 30 secs
             fail("Timeout exception expected");
          } catch (WebServiceException e) {
-            assertTrue(e.getCause() instanceof SocketTimeoutException);
+            assertTrue(e.getCause().getMessage().contains("Timeout"));
          }
          
          policy.setDecoupledEndpoint("http://" + getServerHost() + ":18181/jaxws-samples-wsa/decoupled-endpoint");