Author: alessio.soldano(a)jboss.com Date: 2013-01-08 04:29:13 -0500 (Tue, 08 Jan 2013) New Revision: 17188 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 16914,16951,16996 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r16914 | richard.opalka(a)jboss.com | 2012-10-16 12:27:52 +0200 (Tue, 16 Oct 2012) | 1 line remove unused/unsupported fastinfoset maven dependency ....... r16951 | richard.opalka(a)jboss.com | 2012-10-29 09:54:25 +0100 (Mon, 29 Oct 2012) | 1 line fix JAXWS wrappers issue - ASM have to be on CXF API classpath ....... r16996 | richard.opalka(a)jboss.com | 2012-11-15 10:41:35 +0100 (Thu, 15 Nov 2012) | 1 line fixing hudson regression ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16943-16944 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2013-01-08 07:48:00 UTC (rev 17187) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/pom.xml 2013-01-08 09:29:13 UTC (rev 17188) @@ -142,10 +142,6 @@ <artifactId>wstx-lgpl</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.fastinfoset</groupId> - <artifactId>FastInfoset</artifactId> - </dependency> - <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> </dependency> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2013-01-08 07:48:00 UTC (rev 17187) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2013-01-08 09:29:13 UTC (rev 17188) @@ -278,6 +278,7 @@ } } + if (ins == null) return null; //if inputstream is empty, no need to build if (ins.markSupported()) { Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-01-08 07:48:00 UTC (rev 17187) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-01-08 09:29:13 UTC (rev 17188) @@ -47,7 +47,6 @@ <include>org.apache.neethi:neethi:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.apache.ws.xmlschema:xmlschema-core:jar</include> - <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>org.apache.ws.security:wss4j:jar</include> <include>org.apache.santuario:xmlsec:jar</include> <include>asm:asm:jar</include> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2013-01-08 07:48:00 UTC (rev 17187) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2013-01-08 09:29:13 UTC (rev 17188) @@ -35,6 +35,7 @@ <include path="META-INF/"/> </imports> </module> + <module name="asm.asm" /> <module name="javax.api" /> <module name="javax.annotation.api" /> <module name="javax.mail.api" /> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2013-01-08 07:48:00 UTC (rev 17187) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2013-01-08 09:29:13 UTC (rev 17188) @@ -69,7 +69,6 @@ <cxf.version>2.4.10.jbossorg-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> <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> <jboss.logging.version>3.1.0.GA</jboss.logging.version> <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version> @@ -888,11 +887,6 @@ <version>${ejb.api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.fastinfoset</groupId> - <artifactId>FastInfoset</artifactId> - <version>${fastinfoset.api.version}</version> - </dependency> - <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>${velocity.version}</version>