You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by ru...@apache.org on 2007/10/05 10:21:18 UTC

svn commit: r582118 - in /webservices/synapse/trunk/java/modules: core/src/main/java/org/apache/synapse/config/ core/src/main/java/org/apache/synapse/config/xml/ core/src/main/java/org/apache/synapse/config/xml/endpoints/ core/src/main/java/org/apache/...

Author: ruwan
Date: Fri Oct  5 01:21:17 2007
New Revision: 582118

URL: http://svn.apache.org/viewvc?rev=582118&view=rev
Log:
Fixing a configuration build time issue when having a registry defined for the configuration and renaming the Util classes to names which carrie its context

Added:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java   (contents, props changed)
      - copied, changed from r581849, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java
    webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/NhttpUtils.java   (contents, props changed)
      - copied, changed from r581849, webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Util.java
Removed:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java
    webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Util.java
Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
    webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
    webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
    webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java

Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java (from r581849, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java&r1=581849&r2=582118&rev=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/Util.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java Fri Oct  5 01:21:17 2007
@@ -40,9 +40,9 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-public class Util {
+public class SynapseConfigUtils {
 
-    private static final Log log = LogFactory.getLog(Util.class);
+    private static final Log log = LogFactory.getLog(SynapseConfigUtils.class);
 
     /**
      * Return a StreamSource for the given Object
@@ -136,7 +136,7 @@
                                 log.debug("Faild to resolve an absolute path of the " +
                                           " URL using the synapse.home : " + synapseHome);
                             }
-                            log.error("IO Error reading from URL " + url.getPath() + e);
+                            log.warn("IO Error reading from URL " + url.getPath() + e);
                         }
                     }
                 }
@@ -213,12 +213,12 @@
     }
 
     private static void handleException(String msg, Exception e) {
-        log.error(msg, e);
+        log.warn(msg, e);
         throw new SynapseException(msg, e);
     }
 
     private static void handleException(String msg) {
-        log.error(msg);
+        log.warn(msg);
         throw new SynapseException(msg);
     }
 
@@ -279,7 +279,7 @@
                                 log.debug("Faild to resolve an absolute path of the " +
                                           " URL using the synapse.home : " + synapseHome);
                             }
-                            log.error("IO Error reading from URL : " + url.getPath() + e);
+                            log.warn("IO Error reading from URL : " + url.getPath() + e);
                         }
                     }
                 }

Propchange: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java Fri Oct  5 01:21:17 2007
@@ -210,7 +210,7 @@
 
 		if (entry.getType() == Entry.URL_SRC) {
 			try {
-				entry.setValue(Util.getOMElementFromURL(entry.getSrc()
+				entry.setValue(SynapseConfigUtils.getOMElementFromURL(entry.getSrc()
 						.toString()));
 				localRegistry.put(key, entry);
 			} catch (IOException e) {

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java Fri Oct  5 01:21:17 2007
@@ -57,7 +57,7 @@
                     entry.setSrc(new URL(src.trim()));
                     entry.setType(Entry.URL_SRC);
                     entry.setValue(
-                        org.apache.synapse.config.Util.getObject(entry.getSrc()));
+                        org.apache.synapse.config.SynapseConfigUtils.getObject(entry.getSrc()));
                 } catch (MalformedURLException e) {
                     handleException("The entry with key : " + key + " refers to an invalid URL");
                 }

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java Fri Oct  5 01:21:17 2007
@@ -31,9 +31,10 @@
 import org.apache.synapse.Mediator;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.Startup;
+import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.config.Entry;
 import org.apache.synapse.config.SynapseConfiguration;
-import org.apache.synapse.config.Util;
+import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.config.xml.endpoints.EndpointAbstractFactory;
 import org.apache.synapse.core.axis2.ProxyService;
 import org.apache.synapse.endpoints.Endpoint;
@@ -95,15 +96,15 @@
                 rootSequence.getList().isEmpty() && config.getRegistry() != null) {
             OMNode remoteConfigNode = config.getRegistry().lookup("synapse.xml");
             try {
-                config = XMLConfigurationBuilder.getConfiguration(
-                        Util.getStreamSource(remoteConfigNode).getInputStream());
+                config = XMLConfigurationBuilder.getConfiguration(SynapseConfigUtils
+                    .getStreamSource(remoteConfigNode).getInputStream());
             } catch (XMLStreamException xse) {
                 throw new SynapseException("Problem loading remote synapse.xml ", xse);
             }
 
         }
 
-        if (config.getMainSequence() == null) {
+        if (!config.getLocalRegistry().containsKey(SynapseConstants.MAIN_SEQUENCE_KEY)) {
             if (rootSequence.getList().isEmpty()) {
                 setDefaultMainSequence(config);
             } else {
@@ -189,9 +190,9 @@
      */
     private static void setDefaultMainSequence(SynapseConfiguration config) {
         SequenceMediator main = new SequenceMediator();
-        main.setName(org.apache.synapse.SynapseConstants.MAIN_SEQUENCE_KEY);
+        main.setName(SynapseConstants.MAIN_SEQUENCE_KEY);
         main.addChild(new SendMediator());
-        config.addSequence(org.apache.synapse.SynapseConstants.MAIN_SEQUENCE_KEY, main);
+        config.addSequence(SynapseConstants.MAIN_SEQUENCE_KEY, main);
     }
 
     /**

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java Fri Oct  5 01:21:17 2007
@@ -31,7 +31,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.axis2.description.WSDL2Constants;
-import org.apache.synapse.config.Util;
+import org.apache.synapse.config.SynapseConfigUtils;
 
 import javax.xml.namespace.QName;
 import java.net.URL;
@@ -127,7 +127,7 @@
                 wsdlEndpoint.setWsdlURI(wsdlURI.trim());
 
                 try {
-                    String ns = Util.getOMElementFromURL(new URL(wsdlURI).toString())
+                    String ns = SynapseConfigUtils.getOMElementFromURL(new URL(wsdlURI).toString())
                         .getNamespace().getNamespaceURI();
 
                     if (org.apache.axis2.namespace.Constants.NS_URI_WSDL11.equals(ns)) {

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java Fri Oct  5 01:21:17 2007
@@ -33,7 +33,7 @@
 import org.apache.synapse.mediators.base.SequenceMediator;
 import org.apache.synapse.endpoints.Endpoint;
 import org.apache.synapse.config.SynapseConfiguration;
-import org.apache.synapse.config.Util;
+import org.apache.synapse.config.SynapseConfigUtils;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -207,7 +207,7 @@
         } else if (wsdlURI != null) {
             try {
                 URL url = wsdlURI.toURL();
-                wsdlElement = Util.getOMElementFromURL(url.toString());
+                wsdlElement = SynapseConfigUtils.getOMElementFromURL(url.toString());
             } catch (MalformedURLException e) {
                 handleException("Malformed URI for wsdl", e);
             } catch (IOException e) {
@@ -357,10 +357,10 @@
                 if (policyProp != null) {
                     if (svcEffectivePolicy == null) {
                         svcEffectivePolicy = PolicyEngine.getPolicy(
-                            Util.getStreamSource(policyProp).getInputStream());
+                            SynapseConfigUtils.getStreamSource(policyProp).getInputStream());
                     } else {
                         svcEffectivePolicy = (Policy) svcEffectivePolicy.merge(
-                            PolicyEngine.getPolicy(Util.getStreamSource(policyProp).getInputStream()));
+                            PolicyEngine.getPolicy(SynapseConfigUtils.getStreamSource(policyProp).getInputStream()));
                     }
                 }
             }

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java Fri Oct  5 01:21:17 2007
@@ -23,13 +23,11 @@
 import org.apache.axiom.om.xpath.AXIOMXPath;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.MessageContext;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.FaultHandler;
-import org.apache.synapse.config.Util;
+import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.config.Entry;
 import org.apache.synapse.mediators.AbstractListMediator;
 import org.apache.synapse.mediators.MediatorProperty;
@@ -152,7 +150,7 @@
                 int i = 0;
                 for (Iterator iterator = schemaKeys.iterator(); iterator.hasNext();) {
                     String propName = (String) iterator.next();
-                    sources[i++] = Util.getStreamSource(synCtx.getEntry(propName));
+                    sources[i++] = SynapseConfigUtils.getStreamSource(synCtx.getEntry(propName));
                 }
 
                 try {

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java Fri Oct  5 01:21:17 2007
@@ -35,7 +35,7 @@
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.core.axis2.Axis2MessageContext;
 import org.apache.synapse.config.Entry;
-import org.apache.synapse.config.Util;
+import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.mediators.AbstractMediator;
 import org.apache.synapse.mediators.MediatorProperty;
 import org.apache.axis2.transport.base.BaseConstants;
@@ -52,7 +52,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-import javax.xml.namespace.QName;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
@@ -277,7 +276,7 @@
             if (reCreate || cachedTemplates == null) {
                 try {
                     cachedTemplates = transFact.newTemplates(
-                        Util.getStreamSource(synCtx.getEntry(xsltKey)));
+                        SynapseConfigUtils.getStreamSource(synCtx.getEntry(xsltKey)));
 
                 } catch (TransformerConfigurationException e) {
                     handleException("Error creating XSLT transformer using : " + xsltKey, e, synCtx);

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java Fri Oct  5 01:21:17 2007
@@ -24,7 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseException;
-import org.apache.synapse.config.Util;
+import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.registry.AbstractRegistry;
 import org.apache.synapse.registry.Registry;
 import org.apache.synapse.registry.RegistryEntry;
@@ -53,7 +53,7 @@
         log.info("==> Repository fetch of resource with key : " + key);
         URLConnection urlc = null;
         try {
-            URL url = Util.getURLFromPath(getRoot() + key);
+            URL url = SynapseConfigUtils.getURLFromPath(getRoot() + key);
             if (url == null) {
                 return null;
             }
@@ -86,7 +86,7 @@
             log.debug("Perform RegistryEntry lookup for key : " + key);
         }
         try {
-            URL url = Util.getURLFromPath(getRoot() + key);
+            URL url = SynapseConfigUtils.getURLFromPath(getRoot() + key);
             if (url == null) {
                 return null;
             }
@@ -161,7 +161,7 @@
             urlEntry.setKey("");
             entry = urlEntry;
         }
-        url = Util.getURLFromPath(getRoot() + entry.getKey());
+        url = SynapseConfigUtils.getURLFromPath(getRoot() + entry.getKey());
         if (url == null) {
             return null;
         }

Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java Fri Oct  5 01:21:17 2007
@@ -19,14 +19,10 @@
 
 package org.apache.synapse.mediators.spring;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseException;
 import org.apache.synapse.Mediator;
-import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.config.Util;
+import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.config.Entry;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
@@ -121,7 +117,7 @@
         xbdr.setValidating(false);
         xbdr.loadBeanDefinitions(
             new InputStreamResource(
-                Util.getStreamSource(synCtx.getEntry(configKey)).getInputStream()));
+                SynapseConfigUtils.getStreamSource(synCtx.getEntry(configKey)).getInputStream()));
         appContext.refresh();
         if (traceOrDebugOn) {
             traceOrDebug(traceOn, "Spring ApplicationContext from key : " + configKey + " created");

Modified: webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java Fri Oct  5 01:21:17 2007
@@ -21,7 +21,6 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.util.Utils;
 import org.apache.axis2.transport.nhttp.util.PipeImpl;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.transport.MessageFormatter;
@@ -68,7 +67,7 @@
         this.epr = epr;
         this.httpHost = httpHost;
         this.msgContext = msgContext;
-        this.format = Util.getOMOutputFormat(msgContext);
+        this.format = NhttpUtils.getOMOutputFormat(msgContext);
         try {
             messageFormatter = TransportUtils.getMessageFormatter(msgContext);
         } catch (AxisFault axisFault) {

Modified: webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java?rev=582118&r1=582117&r2=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/HttpCoreNIOSender.java Fri Oct  5 01:21:17 2007
@@ -202,7 +202,7 @@
         // remove unwanted HTTP headers (if any from the current message)
         removeUnwantedHeaders(msgContext);
 
-        EndpointReference epr = Util.getDestinationEPR(msgContext);
+        EndpointReference epr = NhttpUtils.getDestinationEPR(msgContext);
         if (epr != null) {
             if (!AddressingConstants.Final.WSA_NONE_URI.equals(epr.getAddress())) {
                 sendAsyncRequest(epr, msgContext);
@@ -316,7 +316,7 @@
         ServerWorker worker = (ServerWorker) msgContext.getProperty(Constants.OUT_TRANSPORT_INFO);
         HttpResponse response = worker.getResponse();
 
-        OMOutputFormat format = Util.getOMOutputFormat(msgContext);
+        OMOutputFormat format = NhttpUtils.getOMOutputFormat(msgContext);
         MessageFormatter messageFormatter = TransportUtils.getMessageFormatter(msgContext);
         response.setHeader(
             HTTP.CONTENT_TYPE,
@@ -370,7 +370,7 @@
     }
 
     private void sendUsingOutputStream(MessageContext msgContext) throws AxisFault {
-        OMOutputFormat format = Util.getOMOutputFormat(msgContext);
+        OMOutputFormat format = NhttpUtils.getOMOutputFormat(msgContext);
         MessageFormatter messageFormatter = TransportUtils.getMessageFormatter(msgContext);
         OutputStream out = (OutputStream) msgContext.getProperty(MessageContext.TRANSPORT_OUT);
 

Copied: webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/NhttpUtils.java (from r581849, webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Util.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/NhttpUtils.java?p2=webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/NhttpUtils.java&p1=webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Util.java&r1=581849&r2=582118&rev=582118&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/Util.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/NhttpUtils.java Fri Oct  5 01:21:17 2007
@@ -27,7 +27,7 @@
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axiom.om.OMOutputFormat;
 
-public class Util {
+public class NhttpUtils {
 
     /**
      * Get the EPR for the message passed in

Propchange: webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/axis2/transport/nhttp/NhttpUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native



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