You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/05/04 16:18:27 UTC

svn commit: r399708 - in /webservices/sandesha/trunk/src/org/apache/sandesha2: util/SandeshaUtil.java workers/Sender.java

Author: chamikara
Date: Thu May  4 07:18:24 2006
New Revision: 399708

URL: http://svn.apache.org/viewcvs?rev=399708&view=rev
Log:
Removed the way sync responses are handled. Used the method provided by Axis2

Modified:
    webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
    webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=399708&r1=399707&r2=399708&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java Thu May  4 07:18:24 2006
@@ -16,7 +16,6 @@
  */
 package org.apache.sandesha2.util;
 
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -25,22 +24,16 @@
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXBuilder;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
-import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.AddressingConstants;
@@ -59,8 +52,6 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
-import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.TransportUtils;
 import org.apache.axis2.util.UUIDGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -491,8 +482,6 @@
 			
 			newMessageContext.setOptions(newOptions);
 			
-			boolean newServiceGroup = false;
-			boolean newService = false;
 			if (referenceMessage.getAxisServiceGroup() != null) {
 				newMessageContext.setAxisServiceGroup(referenceMessage.getAxisServiceGroup());
 				newMessageContext.setServiceGroupContext(referenceMessage.getServiceGroupContext());
@@ -503,8 +492,6 @@
 
 				newMessageContext.setAxisServiceGroup(axisServiceGroup);
 				newMessageContext.setServiceGroupContext(serviceGroupContext);
-				
-				newServiceGroup = true;
 			}
 
 			if (referenceMessage.getServiceContext() != null) {
@@ -522,16 +509,13 @@
 
 				newMessageContext.setAxisService(axisService);
 				newMessageContext.setServiceContext(serviceContext);
-				
-				newService = true;
 			}
 
 			newMessageContext.setAxisOperation(operation);
 
 			// setting parent child relationships
 			AxisService service = newMessageContext.getAxisService();
-			AxisServiceGroup serviceGroup = newMessageContext.getAxisServiceGroup();
-			
+
 			if (service != null && operation != null) {
 				service.addChild(operation);
 				operation.setParent(service);
@@ -886,68 +870,4 @@
 		return sequenceID;
 	}
 
-	public static SOAPEnvelope createSOAPEnvelopeFromTransportStream(MessageContext msgContext, String soapNamespaceURI)
-			throws AxisFault {
-		InputStream inStream = (InputStream) msgContext.getProperty(MessageContext.TRANSPORT_IN);
-
-		msgContext.setProperty(MessageContext.TRANSPORT_IN, null);
-
-		// this inputstram is set by the TransportSender represents a two way
-		// transport or
-		// by a Transport Recevier
-		if (inStream == null) {
-			throw new AxisFault(Messages.getMessage("inputstreamNull"));
-		}
-
-		return createSOAPMessage(msgContext, inStream, soapNamespaceURI);
-	}
-
-	public static SOAPEnvelope createSOAPMessage(MessageContext msgContext, InputStream inStream,
-			String soapNamespaceURI) throws AxisFault {
-		try {
-			Object contentType;
-
-			StAXBuilder builder;
-			SOAPEnvelope envelope;
-			String charSetEnc = (String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
-
-			if (charSetEnc == null) {
-				charSetEnc = MessageContext.DEFAULT_CHAR_SET_ENCODING;
-			}
-			
-			contentType = msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING);
-			
-
-			if (contentType != null) {
-				msgContext.setDoingMTOM(true);
-				builder = TransportUtils.selectBuilderForMIME(msgContext, inStream, (String) contentType);
-				envelope = (SOAPEnvelope) builder.getDocumentElement();
-			} else if (msgContext.isDoingREST()) {
-				XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(inStream, charSetEnc);
-				SOAPFactory soapFactory = new SOAP11Factory();
-
-				builder = new StAXOMBuilder(xmlreader);
-				builder.setOMBuilderFactory(soapFactory);
-				envelope = soapFactory.getDefaultEnvelope();
-				envelope.getBody().addChild(builder.getDocumentElement());
-
-				// We now have the message inside an envolope. However, this is
-				// only an OM; We need to build a SOAP model from it.
-
-				builder = new StAXSOAPModelBuilder(envelope.getXMLStreamReader(), soapNamespaceURI);
-				envelope = (SOAPEnvelope) builder.getDocumentElement();
-			} else {
-				XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(inStream, charSetEnc);
-
-				builder = new StAXSOAPModelBuilder(xmlreader, soapNamespaceURI);
-				envelope = (SOAPEnvelope) builder.getDocumentElement();
-			}
-
-			return envelope;
-		} catch (Exception e) {
-			throw new AxisFault(e);
-		}
-	}
-
-	
 }

Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java?rev=399708&r1=399707&r2=399708&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Thu May  4 07:18:24 2006
@@ -27,6 +27,7 @@
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.transport.TransportUtils;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.util.threadpool.ThreadPool;
 import org.apache.commons.logging.Log;
@@ -233,7 +234,7 @@
 			} catch (AxisFault e) {
 				String message = "An Exception was throws in sending";
 				log.debug(message,e);
-
+				
 				// TODO : when this is the client side throw the exception to
 				// the client when necessary.
 
@@ -285,12 +286,12 @@
 			//copying required properties from op. context to the response msg ctx.
 			OperationContext requestMsgOpCtx = msgCtx.getOperationContext();
 			if (requestMsgOpCtx!=null) {
-			     if (responseMessageContext.getProperty(HTTPConstants.MTOM_RECEIVED_CONTENT_TYPE)!=null) {
+			     if (responseMessageContext.getProperty(HTTPConstants.MTOM_RECEIVED_CONTENT_TYPE)==null) {
 			    	 responseMessageContext.setProperty(HTTPConstants.MTOM_RECEIVED_CONTENT_TYPE,
 			    			 requestMsgOpCtx.getProperty(HTTPConstants.MTOM_RECEIVED_CONTENT_TYPE));
 			     }
 			     
-			     if (responseMessageContext.getProperty(HTTPConstants.CHAR_SET_ENCODING)!=null) {
+			     if (responseMessageContext.getProperty(HTTPConstants.CHAR_SET_ENCODING)==null) {
 			    	 responseMessageContext.setProperty(HTTPConstants.CHAR_SET_ENCODING,
 			    			 requestMsgOpCtx.getProperty(HTTPConstants.CHAR_SET_ENCODING));
 			     }
@@ -303,9 +304,9 @@
 
 			SOAPEnvelope resenvelope = null;
 			try {
-				resenvelope = SandeshaUtil.createSOAPEnvelopeFromTransportStream (
-						responseMessageContext, msgCtx.getEnvelope().getNamespace()
-								.getName());
+				resenvelope = TransportUtils.createSOAPMessage(msgCtx, 
+						msgCtx.getEnvelope().getNamespace().getName());
+				
 			} catch (AxisFault e) {
 				// TODO Auto-generated catch block
 				log.debug("Valid SOAP envelope not found");
@@ -327,9 +328,7 @@
 		} catch (Exception e) {
 			String message = "No valid Sync response...";
 			log.info(message);
-			
 			throw new SandeshaException(message, e);
-
 		}
 	}
 	



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org