JBossWS SVN: r16307 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-05-23 10:26:09 -0400 (Wed, 23 May 2012)
New Revision: 16307
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
Log:
[JBWS-3495][JBWS-3434][CXF-4304] Enabling test
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2012-05-23 14:10:46 UTC (rev 16306)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2012-05-23 14:26:09 UTC (rev 16307)
@@ -88,11 +88,6 @@
*/
public void testUsingEPR() throws Exception
{
- if (true) {
- System.out.println("FIXME: [CXF-4304] Complete WSA support for STS client configuration via EPR");
- return;
- }
-
Bus bus = BusFactory.newInstance().createBus();
try
{
11 years, 11 months
JBossWS SVN: r16306 - in stack/cxf/trunk/modules: resources/src/main/resources/modules/jboss710/org/apache/cxf/impl and 23 other directories.
by jbossws-commits＠lists.jboss.org
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
11 years, 11 months
JBossWS SVN: r16305 - stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-23 06:44:49 -0400 (Wed, 23 May 2012)
New Revision: 16305
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
Log:
implement temporary workaround
Modified: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-23 10:33:06 UTC (rev 16304)
+++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-23 10:44:49 UTC (rev 16305)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.ResourceBundle;
@@ -31,6 +32,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.bus.spring.BusApplicationContext;
+import org.apache.cxf.configuration.ConfiguredBeanLocator;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.http.HttpDestinationFactory;
@@ -67,6 +69,7 @@
protected BusApplicationContext ctx;
protected List<GenericApplicationContext> additionalCtx = new LinkedList<GenericApplicationContext>();
+ private ConfiguredBeanLocator delegatingBeanLocator;
protected URL[] additionalLocations;
@@ -90,13 +93,16 @@
//the cxf/jbossws-cxf check on actual need for spring bus (we know
//it's required here as we have the jbossws-cxf.xml descriptor)
bus = new JBossWSSpringBusFactory().createBus((URL[])null);
+ ConfiguredBeanLocator delegate = bus.getExtension(ConfiguredBeanLocator.class);
+ delegatingBeanLocator = new DelegatingBeanLocator(additionalCtx, delegate);
+ bus.setExtension(delegatingBeanLocator, ConfiguredBeanLocator.class);
ctx = bus.getExtension(BusApplicationContext.class);
//Load additional configurations from cxf-servlet.xml
if (location != null)
{
try
{
- additionalCtx.add(loadAdditionalConfig(ctx, location));
+ loadAdditionalConfig(ctx, location);
}
catch (IOException e)
{
@@ -130,7 +136,7 @@
{
try
{
- additionalCtx.add(loadAdditionalConfig(ctx, jbossCxfXml));
+ loadAdditionalConfig(ctx, jbossCxfXml);
}
catch (IOException e)
{
@@ -172,13 +178,14 @@
return serverConfigurer;
}
- protected static GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl)
+ protected GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl)
throws IOException
{
if (locationUrl == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_LOAD_ADDITIONAL_CONFIG"));
InputStream is = locationUrl.openStream();
GenericApplicationContext childCtx = new GenericApplicationContext(ctx);
+ additionalCtx.add(childCtx);
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx);
reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
reader.setNamespaceHandlerResolver(new NamespaceHandlerResolver(SecurityActions.getContextClassLoader()));
@@ -207,4 +214,51 @@
super.setBus(bus);
ctx = (bus.getExtension(BusApplicationContext.class));
}
+
+ private static class DelegatingBeanLocator implements ConfiguredBeanLocator {
+
+ private final ConfiguredBeanLocator delegate;
+ private final List<GenericApplicationContext> contexts;
+
+ private DelegatingBeanLocator(final List<GenericApplicationContext> contexts, final ConfiguredBeanLocator delegate) {
+ this.delegate = delegate;
+ this.contexts = contexts;
+ }
+
+ @Override
+ public List<String> getBeanNamesOfType(Class<?> arg0) {
+ return delegate.getBeanNamesOfType(arg0);
+ }
+
+ // TODO: hack for WSPolicyFeature local reference resolver :(
+ @Override
+ public <T> T getBeanOfType(String arg0, Class<T> arg1) {
+ for (final GenericApplicationContext ctx : contexts) {
+ if (ctx.containsBean(arg0)) {
+ return ctx.getBean(arg0, arg1);
+ }
+ }
+ return delegate.getBeanOfType(arg0, arg1);
+ }
+
+ @Override
+ public <T> Collection<? extends T> getBeansOfType(Class<T> arg0) {
+ return delegate.getBeansOfType(arg0);
+ }
+
+ @Override
+ public boolean hasBeanOfName(String arg0) {
+ return delegate.hasBeanOfName(arg0);
+ }
+
+ @Override
+ public boolean hasConfiguredPropertyValue(String arg0, String arg1, String arg2) {
+ return delegate.hasConfiguredPropertyValue(arg0, arg1, arg2);
+ }
+
+ @Override
+ public <T> boolean loadBeansOfType(Class<T> arg0, BeanLoaderListener<T> arg1) {
+ return delegate.loadBeansOfType(arg0, arg1);
+ }
+ }
}
11 years, 11 months
JBossWS SVN: r16304 - stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-23 06:33:06 -0400 (Wed, 23 May 2012)
New Revision: 16304
Modified:
stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
Log:
fixing compilation issue
Modified: stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
===================================================================
--- stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-05-23 10:32:21 UTC (rev 16303)
+++ stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-05-23 10:33:06 UTC (rev 16304)
@@ -118,7 +118,7 @@
return bus;
}
- private BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults)
+ protected BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults)
{
try
{
11 years, 11 months
JBossWS SVN: r16303 - stack/cxf/branches/ropalka/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-23 06:32:21 -0400 (Wed, 23 May 2012)
New Revision: 16303
Modified:
stack/cxf/branches/ropalka/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl
Log:
fixing client WSDL
Modified: stack/cxf/branches/ropalka/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl
===================================================================
--- stack/cxf/branches/ropalka/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl 2012-05-22 17:06:13 UTC (rev 16302)
+++ stack/cxf/branches/ropalka/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl 2012-05-23 10:32:21 UTC (rev 16303)
@@ -45,7 +45,7 @@
</wsdl:binding>
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
- <soap:address location="INVALID"/>
+ <soap:address location="http://unreachable-testHttpProxyUsingHTTPClientPolicy/jaxws-cxf-httpproxy..."/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
11 years, 11 months
JBossWS SVN: r16302 - in stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2012-05-22 13:06:13 -0400 (Tue, 22 May 2012)
New Revision: 16302
Added:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java
Modified:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java
Log:
[JBPAPP-9093] MTOM/XOP root MIME part does not contain charset parameter
Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2012-05-22 12:18:28 UTC (rev 16301)
+++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2012-05-22 17:06:13 UTC (rev 16302)
@@ -80,7 +80,7 @@
rootPart.setText(envStr, "UTF-8");
rootPart.setContentID(MimeConstants.ROOTPART_CID);
- rootPart.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_APPLICATION_XOP_XML + "; type=\"" + soapType + "\"");
+ rootPart.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_APPLICATION_XOP_XML + "; charset=UTF-8; type=\"" + soapType + "\"");
rootPart.setHeader(MimeConstants.CONTENT_TRANSFER_ENCODING, MimeConstants.TEXT_8BIT_ENCODING);
multipart.addBodyPart(rootPart);
Added: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java 2012-05-22 17:06:13 UTC (rev 16302)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, 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.
+ */
+package org.jboss.test.ws.common.soap.attachment.jbws2903;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
+
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.core.soap.attachment.MimeConstants;
+import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * This tests to make sure the MTOM/XOP root MIME part contains the charset parameter
+ * @author bmaxwell
+ */
+public class JBWS2903TestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2903TestCase.class, "");
+ }
+
+ public void testCharEncodingInRootHeader() throws Exception
+ {
+ MessageFactoryImpl factory = new MessageFactoryImpl();
+ SOAPMessage msg1 = factory.createMessage();
+ AttachmentPart attachment1 = msg1.createAttachmentPart();
+ attachment1.setContent("this is a test", "text/plain; charset=UTF-8");
+ attachment1.setContentId("<attachment1(a)test.ws.jboss.org>");
+ msg1.addAttachmentPart(attachment1);
+
+ if (msg1.saveRequired())
+ msg1.saveChanges();
+
+ MultipartRelatedXOPEncoder mrxe = new MultipartRelatedXOPEncoder( (SOAPMessageImpl) msg1);
+ mrxe.encodeMultipartRelatedMessage();
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ mrxe.writeTo(out);
+
+ if ( ! out.toString().contains("Content-Type: application/xop+xml; charset=UTF-8; type=\"text/xml\""))
+ fail("Content-Type does not contain charset=UTF-8");
+ }
+}
11 years, 11 months
JBossWS SVN: r16301 - in stack/cxf/branches/ropalka: modules/client and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-22 08:18:28 -0400 (Tue, 22 May 2012)
New Revision: 16301
Modified:
stack/cxf/branches/ropalka/modules/client/pom.xml
stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java
stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
stack/cxf/branches/ropalka/modules/server/pom.xml
stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java
stack/cxf/branches/ropalka/pom.xml
Log:
upgrade to Apache CXF 2.6.1, fix dependencies, update code to be compilable
Modified: stack/cxf/branches/ropalka/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/client/pom.xml 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/client/pom.xml 2012-05-22 12:18:28 UTC (rev 16301)
@@ -50,17 +50,12 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
Modified: stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java
===================================================================
--- stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-05-22 12:18:28 UTC (rev 16301)
@@ -108,14 +108,12 @@
}
/** JBossWSNonSpringBusFactory methods **/
- @SuppressWarnings("rawtypes")
- public Bus createBus(Map<Class, Object> extensions)
+ public Bus createBus(Map<Class<?>, Object> extensions)
{
return getNonSpringBusFactory().createBus(extensions);
}
- @SuppressWarnings("rawtypes")
- public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties)
+ public Bus createBus(Map<Class<?>, Object> extensions, Map<String, Object> properties)
{
return getNonSpringBusFactory().createBus(extensions, properties);
}
Modified: stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
--- stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-05-22 12:18:28 UTC (rev 16301)
@@ -38,12 +38,11 @@
*/
public class JBossWSNonSpringBusFactory extends CXFBusFactory
{
- @SuppressWarnings("rawtypes")
@Override
- public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties) {
+ public Bus createBus(Map<Class<?>, Object> extensions, Map<String, Object> properties) {
if (extensions == null)
{
- extensions = new HashMap<Class, Object>();
+ extensions = new HashMap<Class<?>, Object>();
}
if (!extensions.containsKey(Configurer.class))
{
Modified: stack/cxf/branches/ropalka/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/pom.xml 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/server/pom.xml 2012-05-22 12:18:28 UTC (rev 16301)
@@ -51,10 +51,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-05-22 12:18:28 UTC (rev 16301)
@@ -26,7 +26,7 @@
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
+import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.management.ServerConfig;
Modified: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-05-22 12:18:28 UTC (rev 16301)
@@ -30,8 +30,8 @@
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
-import org.apache.cxf.tools.util.SOAPBindingUtil;
+import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress;
+import org.apache.cxf.binding.soap.SOAPBindingUtil;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.management.ServerConfig;
Modified: stack/cxf/branches/ropalka/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/pom.xml 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/pom.xml 2012-05-22 12:18:28 UTC (rev 16301)
@@ -73,7 +73,7 @@
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.5.4-SNAPSHOT</cxf.version>
+ <cxf.version>2.6.1-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
@@ -109,7 +109,7 @@
<xmlsec.version>1.5.1</xmlsec.version>
<wss4j.version>1.6.5</wss4j.version>
<wstx.version>3.2.9</wstx.version>
- <spring.version>3.0.6.RELEASE</spring.version>
+ <spring.version>3.0.7.RELEASE</spring.version>
</properties>
@@ -240,21 +240,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jra</groupId>
- <artifactId>jra</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
<version>${cxf.version}</version>
</dependency>
11 years, 11 months
JBossWS SVN: r16300 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2012-05-21 13:18:47 -0400 (Mon, 21 May 2012)
New Revision: 16300
Added:
stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-9093/
Log:
creating one-off branch
11 years, 11 months
JBossWS SVN: r16299 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-21 08:58:49 -0400 (Mon, 21 May 2012)
New Revision: 16299
Added:
stack/cxf/branches/ropalka/
Log:
creating user branch
11 years, 11 months
JBossWS SVN: r16298 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-18 04:48:54 -0400 (Fri, 18 May 2012)
New Revision: 16298
Modified:
stack/cxf/trunk/pom.xml
Log:
use Apache CXF 2.5.x SNAPSHOT
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-05-17 13:24:48 UTC (rev 16297)
+++ stack/cxf/trunk/pom.xml 2012-05-18 08:48:54 UTC (rev 16298)
@@ -73,7 +73,7 @@
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.5.3</cxf.version>
+ <cxf.version>2.5.4-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
11 years, 11 months