Author: alessio.soldano(a)jboss.com Date: 2010-09-30 13:34:20 -0400 (Thu, 30 Sep 2010) New Revision: 13050 Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionFactoryImpl.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory Removed: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/saaj/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/javax.xml.soap.SOAPConnectionFactory Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-3084] Moving custom SOAPConnectionFactory to jbossws-cxf-client.jar for basic client side usage. Also including the test in binary distribution. Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionFactoryImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionFactoryImpl.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionFactoryImpl.java 2010-09-30 17:34:20 UTC (rev 13050) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.wsf.stack.cxf.saaj; + +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPException; + +public class SOAPConnectionFactoryImpl extends SOAPConnectionFactory +{ + + @Override + public SOAPConnection createConnection() throws SOAPException + { + return new SOAPConnectionImpl(); + } + +} Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/saaj/SOAPConnectionImpl.java 2010-09-30 17:34:20 UTC (rev 13050) @@ -0,0 +1,214 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.wsf.stack.cxf.saaj; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.MimeHeader; +import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.helpers.IOUtils; +import org.apache.cxf.helpers.LoadingByteArrayOutputStream; +import org.apache.cxf.message.Exchange; +import org.apache.cxf.message.ExchangeImpl; +import org.apache.cxf.message.Message; +import org.apache.cxf.message.MessageImpl; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.Conduit; +import org.apache.cxf.transport.ConduitInitiator; +import org.apache.cxf.transport.ConduitInitiatorManager; +import org.apache.cxf.transport.MessageObserver; +import org.apache.cxf.transport.http.HTTPConduit; + +public class SOAPConnectionImpl extends SOAPConnection +{ + + @SuppressWarnings("unchecked") + @Override + public SOAPMessage call(SOAPMessage msgOut, Object addressObject) throws SOAPException + { + String address = getAddress(addressObject); + ConduitInitiator ci = getConduitInitiator(address); + + + // create a new Message and Exchange + EndpointInfo info = new EndpointInfo(); + info.setAddress(address); + Message outMessage = new MessageImpl(); + Exchange exch = new ExchangeImpl(); + outMessage.setExchange(exch); + + // sent SOAPMessage + try + { + final Conduit c = ci.getConduit(info); + + + Map<String, List<String>> outHeaders = new HashMap<String, List<String>>(); + for (Iterator it = msgOut.getMimeHeaders().getAllHeaders(); it.hasNext();) + { + MimeHeader mimeHeader = (MimeHeader)it.next(); + if ("Content-Type".equals(mimeHeader.getName())) + { + outMessage.put(Message.CONTENT_TYPE, mimeHeader.getValue()); + } + + // disable the chunked encoding if requested + if ("Transfer-Encoding".equals(mimeHeader.getName()) + && "disabled".equals(mimeHeader.getValue()) + && c instanceof HTTPConduit) + { + ((HTTPConduit)c).getClient().setAllowChunking(false); + continue; + } + + List<String> values = outHeaders.get(mimeHeader.getName()); + if (values == null) + { + values = new ArrayList<String>(); + outHeaders.put(mimeHeader.getName(), values); + } + values.add(mimeHeader.getValue()); + } + outMessage.put(Message.HTTP_REQUEST_METHOD, "POST"); + outMessage.put(Message.PROTOCOL_HEADERS, outHeaders); + c.prepare(outMessage); + + OutputStream outs = outMessage.getContent(OutputStream.class); + msgOut.writeTo(outs); + + c.setMessageObserver(new MessageObserver() { + public void onMessage(Message inMessage) + { + LoadingByteArrayOutputStream bout = new LoadingByteArrayOutputStream(); + try + { + IOUtils.copy(inMessage.getContent(InputStream.class), bout); + inMessage.getExchange().put(InputStream.class, bout.createInputStream()); + + Map<String, List<String>> inHeaders = + (Map<String, List<String>>)inMessage.get(Message.PROTOCOL_HEADERS); + + inMessage.getExchange().put(Message.PROTOCOL_HEADERS, inHeaders); + c.close(inMessage); + } + catch (IOException e) + { + //ignore + } + } + }); + + c.close(outMessage); + } + catch (Exception ex) + { + throw new SOAPException("SOAPMessage can not be sent", ex); + } + + // read SOAPMessage + try + { + InputStream ins = exch.get(InputStream.class); + Map<String, List<String>> inHeaders = + (Map<String, List<String>>)exch.get(Message.PROTOCOL_HEADERS); + + MimeHeaders mimeHeaders = new MimeHeaders(); + if (inHeaders != null) + { + for (Map.Entry<String, List<String>> entry : inHeaders.entrySet()) + { + if (entry.getValue() != null) + { + for (String value : entry.getValue()) + { + mimeHeaders.addHeader(entry.getKey(), value); + } + } + } + } + + MessageFactory msgFac = MessageFactory.newInstance(); + return msgFac.createMessage(mimeHeaders, ins); + } + catch (Exception ex) + { + throw new SOAPException("SOAPMessage can not be read", ex); + } + + + } + + @Override + public void close() throws SOAPException + { + // complete + } + + private String getAddress(Object addressObject) throws SOAPException + { + if (addressObject instanceof URL || addressObject instanceof String) + { + return addressObject.toString(); + } + throw new SOAPException("Address object of type " + addressObject.getClass().getName() + + " is not supported"); + } + + private ConduitInitiator getConduitInitiator(String address) throws SOAPException { + + ConduitInitiator ci = null; + try { + Bus bus = BusFactory.getThreadDefaultBus(true); + ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class); + + if (address.startsWith("http")) { + ci = mgr.getConduitInitiator("http://cxf.apache.org/transports/http"); + } + if (ci == null) { + ci = mgr.getConduitInitiatorForUri(address); + } + + } catch (Exception ex) { + throw new SOAPException("No ConduitInitiator is available for " + address, ex); + } + + if (ci == null) { + throw new SOAPException("No ConduitInitiator is available for " + address); + } + return ci; + } +} Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory 2010-09-30 17:34:20 UTC (rev 13050) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.saaj.SOAPConnectionFactoryImpl Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/javax.xml.soap.SOAPConnectionFactory =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/javax.xml.soap.SOAPConnectionFactory 2010-09-30 16:41:01 UTC (rev 13049) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/javax.xml.soap.SOAPConnectionFactory 2010-09-30 17:34:20 UTC (rev 13050) @@ -1 +0,0 @@ -org.jboss.wsf.stack.cxf.saaj.SOAPConnectionFactoryImpl Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2010-09-30 16:41:01 UTC (rev 13049) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2010-09-30 17:34:20 UTC (rev 13050) @@ -103,12 +103,14 @@ <include>java/org/jboss/test/ws/jaxws/smoke/**</include> <include>java/org/jboss/test/ws/management/**</include> <include>java/org/jboss/test/ws/projectGenerator/**</include> + <include>java/org/jboss/test/ws/saaj/**</include> <include>resources/console/**</include> <include>resources/jaxrpc/samples/**</include> <include>resources/jaxws/samples/**</include> <include>resources/jaxws/smoke/**</include> <include>resources/management/**</include> <include>resources/projectGenerator/**</include> + <include>resources/saaj/**</include> </includes> </unpackOptions> </dependencySet>