[jbossws-commits] JBossWS SVN: r16198 - in stack/native/branches/jbossws-native-4.0.x: modules and 21 other directories.

Author: ropalka Date: 2012-04-20 08:19:53 -0400 (Fri, 20 Apr 2012) New Revision: 16198 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SAAJVisitable.java stack/native/branches/jbossws-native-4.0.x/modules/endorsed/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-factories/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-8737] Merged revisions 16182 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16182 | ropalka | 2012-04-19 06:47:36 +0200 (Thu, 19 Apr 2012) | 1 line [JBWS-3486] removing endorsed module ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171,16182 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -36,11 +36,6 @@ <artifactId>jboss-saaj-api_1.3_spec</artifactId> </dependency> <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-factories</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> </dependency> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -54,7 +54,6 @@ import org.jboss.ws.core.jaxrpc.ParameterWrapping; import org.jboss.ws.core.soap.SOAPBodyElementDoc; import org.jboss.ws.core.soap.SOAPBodyElementRpc; -import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPFaultImpl; @@ -439,8 +438,8 @@ throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); SOAPHeader soapHeader = soapEnvelope.getHeader(); - SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnvelope.getBody(); - SOAPBodyElement soapBodyElement = soapBody.getBodyElement(); + SOAPBody soapBody = (SOAPBody)soapEnvelope.getBody(); + SOAPBodyElement soapBodyElement = SOAPUtils.getFirstSOAPBodyElement(soapBody); // Translate the SOAPFault to an exception and throw it if (soapBodyElement instanceof SOAPFaultImpl) Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SAAJVisitable.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SAAJVisitable.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SAAJVisitable.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.core.soap; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @since Sep 26, 2006 - */ -public interface SAAJVisitable { - public void accept(SAAJVisitor visitor); -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -60,7 +60,7 @@ * * @author Thomas.Diesler(a)jboss.org */ -public class SOAPElementImpl extends NodeImpl implements SOAPElement, SAAJVisitable +public class SOAPElementImpl extends NodeImpl implements SOAPElement { private static final ResourceBundle bundle = BundleUtils.getBundle(SOAPElementImpl.class); // The org.w3c.dom.Element @@ -868,11 +868,6 @@ this.element.setIdAttributeNS(namespaceURI, localName, isId); } - public void accept(SAAJVisitor visitor) - { - visitor.visitSOAPElement(this); - } - @Override public void setPrefix(String prefix) throws DOMException { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -21,8 +21,13 @@ */ package org.jboss.ws.core.soap.utils; +import java.util.Iterator; + import javax.xml.namespace.QName; import javax.xml.soap.Name; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; @@ -31,6 +36,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.core.soap.SOAPConnectionFactoryImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; /** @@ -69,6 +75,24 @@ return newSOAPFactory(SOAPConstants.SOAP_1_2_PROTOCOL); } + public static SOAPConnectionFactory newSOAPConnectionFactory() throws SOAPException { + return new SOAPConnectionFactoryImpl(); + // TODO: use standard SOAP API to create objects + //return SOAPConnectionFactory.newInstance(); + } + + public static SOAPBodyElement getFirstSOAPBodyElement(final SOAPBody soapBody) { + SOAPBodyElement bodyElement = null; + final Iterator<?> it = soapBody.getChildElements(); + while (bodyElement == null && it.hasNext()) + { + Object next = it.next(); + if (next instanceof SOAPBodyElement) + bodyElement = (SOAPBodyElement)next; + } + return bodyElement; + } + private static SOAPFactory newSOAPFactory(final String protocol) { try { return new SOAPFactoryImpl(protocol); Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -19,12 +19,6 @@ <dependencies> <dependency> <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-factories</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-services</artifactId> <version>${project.version}</version> </dependency> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -73,7 +73,6 @@ <!-- Move the native API to the front of the classpath --> <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-native-factories.jar"/> <fileset dir="${thirdparty.dir}"> <exclude name="**/jbossws-jboss*.jar"/> </fileset> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -31,7 +31,6 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws.native:jbossws-native-factories:jar</include> <include>org.jboss.ws.native:jbossws-native-services:jar</include> <include>org.jboss.ws.native:jbossws-native-core</include> <include>org.jboss.ws:jbossws-api:jar</include> @@ -59,7 +58,7 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> + <unpack>false</unpack> <includes> <include>org.jboss.ws.native:jbossws-native-resources:jar:*:jboss*</include> </includes> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -29,13 +29,10 @@ <dependencies> <module name="javax.api" export="true"/> - <module name="javax.jws.api" export="true"/> <module name="javax.wsdl4j.api" export="true"/> - <module name="javax.xml.ws.api" export="true"/> <module name="org.jboss.ws.api" export="true"/> <module name="org.jboss.ws.spi" export="true"/> <module name="org.jboss.ws.common" services="import" export="true"/> - <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/> <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> <imports> <include path="META-INF"/> @@ -49,8 +46,8 @@ </exports> </module> <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/> - <module name="org.apache.xalan" services="export" export="true"/> <module name="org.apache.xerces" services="export" export="true"/> <module name="org.jboss.as.webservices" services="export" export="true"/> </dependencies> + </module> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -42,7 +42,6 @@ <module name="org.jboss.ws.api" /> <module name="org.jboss.ws.spi" /> <module name="org.jboss.ws.common" /> - <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/> <module name="org.jboss.ws.native.jbossws-native-services" services="import"/> <module name="org.jboss.common-core" /> <module name="org.jboss.logging" /> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -40,11 +40,6 @@ <include name="**/jbossws-native-core.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-factories/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jbossws-native-factories.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-services/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-native-services.jar"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -40,9 +40,8 @@ import org.jboss.ws.core.EndpointInvocation; import org.jboss.ws.core.jaxrpc.client.CallImpl; import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.utils.MessageContextAssociation; +import org.jboss.ws.core.soap.utils.SOAPUtils; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.common.DOMUtils; @@ -226,8 +225,8 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelope.getBytes()); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl reqMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream); + MessageFactory factory = SOAPUtils.newSOAP12MessageFactory(); + SOAPMessage reqMessage = (SOAPMessage)factory.createMessage(null, inputStream); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(reqMessage); @@ -253,8 +252,8 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelopeWithBoundHeader.getBytes()); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl reqMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream); + MessageFactory factory = SOAPUtils.newSOAP12MessageFactory(); + SOAPMessage reqMessage = factory.createMessage(null, inputStream); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(reqMessage); @@ -276,8 +275,8 @@ { ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelopeWithUnboundHeader.getBytes()); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl reqMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream); + MessageFactory factory = SOAPUtils.newSOAP12MessageFactory(); + SOAPMessage reqMessage = (SOAPMessage)factory.createMessage(null, inputStream); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(reqMessage); @@ -320,8 +319,8 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelope.getBytes()); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl resMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream); + MessageFactory factory = SOAPUtils.newSOAP12MessageFactory(); + SOAPMessage resMessage = factory.createMessage(null, inputStream); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(resMessage); @@ -340,8 +339,8 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithBoundHeader.getBytes()); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl resMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream); + MessageFactory factory = SOAPUtils.newSOAP12MessageFactory(); + SOAPMessage resMessage = factory.createMessage(null, inputStream); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(resMessage); @@ -371,8 +370,8 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithFault.getBytes()); - MessageFactory factory = new MessageFactoryImpl(); - SOAPMessageImpl resMessage = (SOAPMessageImpl)factory.createMessage(null, inputStream); + MessageFactory factory = SOAPUtils.newSOAP12MessageFactory(); + SOAPMessage resMessage = factory.createMessage(null, inputStream); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(resMessage); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/jbws1692/JBWS1692TestCase.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -29,6 +29,7 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPMessage; +import org.jboss.ws.core.soap.utils.SOAPUtils; import org.jboss.wsf.test.JBossWSTest; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -46,7 +47,7 @@ { public void testImportNode() throws Exception { - MessageFactory factory = MessageFactory.newInstance(); + MessageFactory factory = SOAPUtils.newSOAP11MessageFactory(); File soapreqfile = getResourceFile("common/jbws1692/soap-request-template.xml"); SOAPMessage msg = factory.createMessage(null, new FileInputStream(soapreqfile)); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -33,6 +33,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; +import org.jboss.ws.core.soap.utils.SOAPUtils; public class HRefHandler extends GenericHandler { @@ -77,7 +78,7 @@ "</env:Body>" + "</env:Envelope>"; - MessageFactory factory = MessageFactory.newInstance(); + MessageFactory factory = SOAPUtils.newSOAP11MessageFactory(); SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); ((SOAPMessageContext)msgContext).setMessage(reqMessage); } @@ -109,7 +110,7 @@ "</env:Body>" + "</env:Envelope>"; - MessageFactory factory = MessageFactory.newInstance(); + MessageFactory factory = SOAPUtils.newSOAP11MessageFactory(); SOAPMessage resMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); ((SOAPMessageContext)msgContext).setMessage(resMessage); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -39,6 +39,7 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.ws.common.DOMWriter; +import org.jboss.ws.core.soap.utils.SOAPUtils; /** * Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints @@ -117,7 +118,7 @@ { URL servletURL = new URL("http://" + getServerHost() + ":8080" + "/jaxrpc-jbws1093/ServletTest?type=soapMessage"); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPConnection con = SOAPUtils.newSOAPConnectionFactory().createConnection(); SOAPMessage resMessage = con.get(servletURL); SOAPEnvelope env = resMessage.getSOAPPart().getEnvelope(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -38,6 +38,7 @@ import junit.framework.Test; +import org.jboss.ws.core.soap.utils.SOAPUtils; import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -120,7 +121,7 @@ " </soapenv:Body>" + "</soapenv:Envelope>"; - MessageFactory msgFactory = MessageFactory.newInstance(); + MessageFactory msgFactory = SOAPUtils.newSOAP11MessageFactory(); SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); MimeHeaders mimeHeaders = new MimeHeaders(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-04-20 12:19:53 UTC (rev 16198) @@ -28,13 +28,14 @@ import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import junit.framework.Test; -import org.jboss.ws.core.soap.SOAPBodyImpl; +import org.jboss.ws.core.soap.utils.SOAPUtils; import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -201,8 +202,8 @@ mimeHeaders.addHeader("Content-Type", "text/xml; charset=UTF-8"); SOAPMessage soapMessage = mf.createMessage(mimeHeaders, new ByteArrayInputStream(xmlStr.getBytes())); - SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); - SOAPElement soapElement = soapBody.getBodyElement(); + SOAPBody soapBody = (SOAPBody)soapMessage.getSOAPBody(); + SOAPElement soapElement = SOAPUtils.getFirstSOAPBodyElement(soapBody); StringBuffer builder = new StringBuffer(); NodeList nlist = soapElement.getChildNodes(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -98,35 +98,6 @@ </testResource> </testResources> <plugins> - <plugin> <!-- This copies jbossws-native-factories jar to endorsed dir before the integration-tests are run --> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-factories-jar</id> - <phase>pre-integration-test</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../endorsed/target/</directory> - <includes> - <include>jbossws-native-factories-${project.version}.jar</include> - </includes> - </resource> - <resource> - <directory>${basedir}/../../endorsed/target/</directory> - <includes> - <include>jbossws-native-factories-${project.version}.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -284,7 +255,6 @@ <properties> <jboss.version>${jboss712.version}</jboss.version> <jbossws.integration.target>jboss712</jbossws.integration.target> - <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> </properties> <dependencies> <dependency> @@ -352,15 +322,9 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> + <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args}</argLine> <excludes> <!-- no excludes ATM --> </excludes> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-20 11:09:02 UTC (rev 16197) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-20 12:19:53 UTC (rev 16198) @@ -49,7 +49,6 @@ <!-- Modules --> <modules> - <module>modules/endorsed</module> <module>modules/core</module> <module>modules/resources</module> <module>modules/services</module>