Author: alessio.soldano(a)jboss.com Date: 2012-05-23 10:10:46 -0400 (Wed, 23 May 2012) New Revision: 16306 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF Log: [JBWS-3501] Separating cxf apis from impl in org.apache.cxf AS7 module Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -0,0 +1,58 @@ +<?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.1" name="org.apache.cxf.impl"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="asm.asm" /> + <module name="javax.api" /> + <module name="javax.annotation.api" /> + <module name="javax.jms.api" /> + <module name="javax.jws.api" /> + <module name="javax.mail.api" /> + <module name="javax.resource.api" /> + <module name="javax.servlet.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.apache.commons.lang" /> + <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.joda.time" /> + <module name="org.opensaml" /> + <module name="org.springframework.spring" optional="true"/> + <module name="org.apache.cxf" export="true"/> + </dependencies> +</module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -29,29 +29,17 @@ </resources> <dependencies> - <module name="asm.asm" /> + <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="javax.api" /> - <module name="javax.annotation.api" /> - <module name="javax.jms.api" /> - <module name="javax.jws.api" /> - <module name="javax.mail.api" /> - <module name="javax.resource.api" /> - <module name="javax.servlet.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" services="import"/> <module name="com.sun.xml.bind" services="import"/> - <module name="javax.xml.soap.api" /> - <module name="javax.xml.stream.api" /> - <module name="javax.xml.ws.api" /> - <module name="org.apache.commons.lang" /> <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.joda.time" /> - <module name="org.opensaml" /> - <module name="org.springframework.spring" optional="true"/> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -58,8 +58,8 @@ </exports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/> - <!-- Do not import services from cxf module direclty, those need to come from jbossws --> - <module name="org.apache.cxf" export="true"> + <!-- Do not import services from cxf module directly, those need to come from jbossws --> + <module name="org.apache.cxf.impl" export="true"> <imports> <include path="META-INF/cxf"/> <include path="META-INF"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -41,7 +41,7 @@ <module name="org.jboss.ws.jaxws-client" export="true" services="export" /> <!-- JBossWS configuration of Apache CXF --> <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" /> - <!-- Apache CXF - do not import services, those need to come from JBossWS --> + <!-- Apache CXF APIs only --> <module name="org.apache.cxf" export="true" /> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" /> <module name="org.jboss.jaxbintros" export="true"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -42,7 +42,7 @@ <module name="org.jboss.ws.jaxws-client" /> <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> <!-- do not import services from cxf, those need to come from jbossws --> - <module name="org.apache.cxf"> + <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> <include path="META-INF/"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -34,7 +34,7 @@ <module name="javax.annotation.api" /> <module name="javax.xml.ws.api" /> <module name="org.jboss.ws.jaxws-jboss-httpserver-httpspi" /> - <module name="org.apache.cxf" services="import"> + <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/"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -38,7 +38,7 @@ <module name="org.jboss.ws.common" /> <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> <!-- do not import services from cxf, those need to come from jbossws --> - <module name="org.apache.cxf"> + <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> <include path="META-INF/"/> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -0,0 +1,58 @@ +<?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.1" name="org.apache.cxf.impl"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="asm.asm" /> + <module name="javax.api" /> + <module name="javax.annotation.api" /> + <module name="javax.jms.api" /> + <module name="javax.jws.api" /> + <module name="javax.mail.api" /> + <module name="javax.resource.api" /> + <module name="javax.servlet.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.apache.commons.lang" /> + <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.joda.time" /> + <module name="org.opensaml" /> + <module name="org.springframework.spring" optional="true"/> + <module name="org.apache.cxf" export="true"/> + </dependencies> +</module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -29,29 +29,17 @@ </resources> <dependencies> - <module name="asm.asm" /> + <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="javax.api" /> - <module name="javax.annotation.api" /> - <module name="javax.jms.api" /> - <module name="javax.jws.api" /> - <module name="javax.mail.api" /> - <module name="javax.resource.api" /> - <module name="javax.servlet.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" services="import"/> <module name="com.sun.xml.bind" services="import"/> - <module name="javax.xml.soap.api" /> - <module name="javax.xml.stream.api" /> - <module name="javax.xml.ws.api" /> - <module name="org.apache.commons.lang" /> <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.joda.time" /> - <module name="org.opensaml" /> - <module name="org.springframework.spring" optional="true"/> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -58,8 +58,8 @@ </exports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/> - <!-- Do not import services from cxf module direclty, those need to come from jbossws --> - <module name="org.apache.cxf" export="true"> + <!-- Do not import services from cxf module directly, those need to come from jbossws --> + <module name="org.apache.cxf.impl" export="true"> <imports> <include path="META-INF/cxf"/> <include path="META-INF"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -41,7 +41,7 @@ <module name="org.jboss.ws.jaxws-client" export="true" services="export" /> <!-- JBossWS configuration of Apache CXF --> <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" /> - <!-- Apache CXF - do not import services, those need to come from JBossWS --> + <!-- Apache CXF APIs only --> <module name="org.apache.cxf" export="true" /> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" /> <module name="org.jboss.jaxbintros" export="true"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -42,7 +42,7 @@ <module name="org.jboss.ws.jaxws-client" /> <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> <!-- do not import services from cxf, those need to come from jbossws --> - <module name="org.apache.cxf"> + <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> <include path="META-INF/"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -34,7 +34,7 @@ <module name="javax.annotation.api" /> <module name="javax.xml.ws.api" /> <module name="org.jboss.ws.jaxws-jboss-httpserver-httpspi" /> - <module name="org.apache.cxf" services="import"> + <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/"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -38,7 +38,7 @@ <module name="org.jboss.ws.common" /> <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> <!-- do not import services from cxf, those need to come from jbossws --> - <module name="org.apache.cxf"> + <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> <include path="META-INF/"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -95,7 +95,13 @@ </copy> <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> + <include name="**/cxf-api*.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> <include name="**/cxf-*.jar"/> + <exclude name="**/cxf-api*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true"> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -64,7 +64,7 @@ <include name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/> </classes> <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> + <attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- cxf impl required due to AegisDataBinding reference in endpoint impl --> </manifest> </war> @@ -98,7 +98,7 @@ <include name="jbossws-cxf.xml"/> </webinf> <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> + <attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> </manifest> </war> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -138,7 +138,7 @@ <include name="org/jboss/wsf/test/ClientHelper.class"/> </classes> <manifest> - <attribute name="Dependencies" value="org.apache.ws.security,org.jboss.ws.cxf.jbossws-cxf-client services"/> + <attribute name="Dependencies" value="org.apache.ws.security,org.jboss.ws.cxf.jbossws-cxf-client services,org.apache.cxf.impl"/> </manifest> </war> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.java 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.java 2012-05-23 14:10:46 UTC (rev 16306) @@ -23,7 +23,6 @@ import java.util.List; -import org.apache.cxf.binding.soap.interceptor.RPCInInterceptor; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageContentsList; import org.apache.cxf.phase.AbstractPhaseInterceptor; @@ -39,7 +38,7 @@ public ChangeRequestnterceptor() { super(Phase.UNMARSHAL); - addAfter(RPCInInterceptor.class.getName()); + addAfter("org.apache.cxf.binding.soap.interceptor.RPCInInterceptor"); } public void handleMessage(final Message message) { Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java 2012-05-23 14:10:46 UTC (rev 16306) @@ -32,7 +32,6 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.configuration.ConfiguredBeanLocator; import org.apache.cxf.workqueue.AutomaticWorkQueue; -import org.apache.cxf.workqueue.AutomaticWorkQueueImpl; import org.jboss.logging.Logger; @WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3497", serviceName = "ServiceOne") @@ -46,10 +45,21 @@ { Bus bus = BusFactory.getThreadDefaultBus(false); ConfiguredBeanLocator locator = bus.getExtension(ConfiguredBeanLocator.class); - AutomaticWorkQueueImpl queue = (AutomaticWorkQueueImpl)locator.getBeanOfType("cxf.default.workqueue", AutomaticWorkQueue.class); - if (queue.getMaxSize() != 10) { - throw new RuntimeException("Expected max queue size '10' but got '" + queue.getMaxSize() + "'!"); + AutomaticWorkQueue queue = locator.getBeanOfType("cxf.default.workqueue", AutomaticWorkQueue.class); + //this is just a verification of a workaround, so going the dirty way... + Long qs = null; + try + { + qs = (Long) queue.getClass().getMethod("getMaxSize").invoke(queue); } + catch (Exception e) + { + throw new RuntimeException(e); + } + if (qs != 10) + { + throw new RuntimeException("Expected max queue size '10' but got '" + qs + "'!"); + } Logger.getLogger(this.getClass()).info("echo: " + input); count.incrementAndGet(); return input; 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 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -202,7 +202,7 @@ <include name="org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.class"/> </fileset> <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> + <attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> </manifest> </jar> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-05-23 14:10:46 UTC (rev 16306) @@ -242,7 +242,7 @@ <include name="stsKeystore.properties" /> </zipfileset> <manifest> - <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/> + <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl"/> <!-- cxf impl required to extend STS impl --> </manifest> </war> @@ -326,7 +326,7 @@ <include name="wsdl/*"/> </webinf> <manifest> - <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/> + <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> </manifest> </war> @@ -345,7 +345,7 @@ <include name="wsdl/*"/> </webinf> <manifest> - <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/> + <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> </manifest> </war> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2012-05-23 14:10:46 UTC (rev 16306) @@ -23,8 +23,8 @@ import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; -import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.io.CachedOutputStream; import org.apache.cxf.message.Message; @@ -61,7 +61,7 @@ CachedOutputStream bos = new CachedOutputStream(); try { - IOUtils.copy(is, bos); + copy(is, bos, 4096); bos.flush(); is.close(); message.setContent(InputStream.class, bos.getInputStream()); @@ -80,4 +80,32 @@ } } + public static int copy(final InputStream input, final OutputStream output, int bufferSize) throws IOException + { + int avail = input.available(); + if (avail > 262144) + { + avail = 262144; + } + if (avail > bufferSize) + { + bufferSize = avail; + } + final byte[] buffer = new byte[bufferSize]; + int n = 0; + n = input.read(buffer); + int total = 0; + while (-1 != n) + { + if (n == 0) + { + throw new IOException("0 bytes read in violation of InputStream.read(byte[])"); + } + output.write(buffer, 0, n); + total += n; + n = input.read(buffer); + } + return total; + } + } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF 2012-05-23 10:44:49 UTC (rev 16305) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF 2012-05-23 14:10:46 UTC (rev 16306) @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services \ No newline at end of file +Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services,org.apache.cxf.impl \ No newline at end of file