axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r487227 - in /webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/context/ src/org/apache/axis2/description/ src/org/apache/axis2/engine/ src/org/apache/axis2/receivers/ src/org/apache/axis2/transport/http/ src/org/apache/axis...
Date Thu, 14 Dec 2006 15:03:49 GMT
Author: dims
Date: Thu Dec 14 07:03:47 2006
New Revision: 487227

URL: http://svn.apache.org/viewvc?view=rev&rev=487227
Log:
Fix for AXIS2-1847 - Duplicate code in Axis2

Removed:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowIncludeImpl.java
Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java
    webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
Thu Dec 14 07:03:47 2006
@@ -17,7 +17,6 @@
 
 package org.apache.axis2.context;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Thu Dec 14 07:03:47 2006
@@ -119,7 +119,7 @@
                 if (serviceGroupContext == null) {
                     AxisServiceGroup axisServiceGroup = messageContext.getAxisServiceGroup();
                     if (axisServiceGroup == null) {
-                        axisServiceGroup = (AxisServiceGroup) messageContext.getAxisService().getParent();
+                        axisServiceGroup = (AxisServiceGroup) axisService.getParent();
                     }
                     serviceGroupContext = new ServiceGroupContext(messageContext.getConfigurationContext(),
                             axisServiceGroup);
@@ -134,7 +134,7 @@
                 serviceGroupContext =
                         getServiceGroupContext(serviceGroupContextId, messageContext);
                 serviceContext =
-                        serviceGroupContext.getServiceContext(messageContext.getAxisService());
+                        serviceGroupContext.getServiceContext(axisService);
             } else {
 
                 // either the key is null or no SGC is found from the give key
@@ -144,10 +144,10 @@
                 }
 
                 if (messageContext.getAxisService() != null) {
-                    AxisServiceGroup axisServiceGroup = (AxisServiceGroup) messageContext.getAxisService().getParent();
+                    AxisServiceGroup axisServiceGroup = (AxisServiceGroup) axisService.getParent();
 
                     serviceGroupContext = new ServiceGroupContext(this, axisServiceGroup);
-                    serviceContext = serviceGroupContext.getServiceContext(messageContext.getAxisService());
+                    serviceContext = serviceGroupContext.getServiceContext(axisService);
 
                     // set the serviceGroupContextID
                     serviceGroupContext.setId(serviceGroupContextId);
@@ -191,13 +191,13 @@
      * @param messageID
      * @param mepContext
      */
-    public synchronized void registerOperationContext(String messageID,
+    public void registerOperationContext(String messageID,
                                                       OperationContext mepContext) {
         mepContext.setKey(messageID);
         this.operationContextMap.put(messageID, mepContext);
     }
 
-    public synchronized void registerServiceGroupContext(ServiceGroupContext serviceGroupContext)
{
+    public void registerServiceGroupContext(ServiceGroupContext serviceGroupContext) {
         String id = serviceGroupContext.getId();
 
         if (serviceGroupContextMap.get(id) == null) {
@@ -210,7 +210,7 @@
         cleanupServiceGroupContexts();
     }
 
-    public synchronized void addServiceGroupContextintoApplicatoionScopeTable(
+    public void addServiceGroupContextintoApplicatoionScopeTable(
             ServiceGroupContext serviceGroupContext) {
         applicationSessionServiceGroupContextTable.put(
                 serviceGroupContext.getDescription().getServiceGroupName(), serviceGroupContext);
@@ -247,22 +247,19 @@
         return null;
     }
 
-    public synchronized ServiceGroupContext getServiceGroupContext(String serviceGroupContextId,
+    public ServiceGroupContext getServiceGroupContext(String serviceGroupContextId,
                                                                    MessageContext msgContext)
{
-        ServiceGroupContext serviceGroupContext = null;
-        if (serviceGroupContextMap != null) {
+        ServiceGroupContext serviceGroupContext;
             serviceGroupContext = (ServiceGroupContext) serviceGroupContextMap.get(serviceGroupContextId);
             if (serviceGroupContext != null) {
                 serviceGroupContext.touch();
             }
-        }
         if (serviceGroupContext == null
-                && msgContext != null
                 && msgContext.getSessionContext() != null) {
             serviceGroupContext = msgContext.getSessionContext().getServiceGroupContext(
                     serviceGroupContextId);
         }
-        if (serviceGroupContext == null && msgContext != null) {
+        if (serviceGroupContext == null) {
             AxisService axisService = msgContext.getAxisService();
             if (axisService != null) {
                 AxisServiceGroup asg = (AxisServiceGroup) axisService.getParent();
@@ -324,7 +321,6 @@
     }
 
     private void cleanupServiceGroupContexts() {
-        synchronized (serviceGroupContextMap) {
             long currentTime = new Date().getTime();
             Iterator sgCtxtMapKeyIter = serviceGroupContextMap.keySet().iterator();
             while (sgCtxtMapKeyIter.hasNext()) {
@@ -338,7 +334,6 @@
                 }
             }
         }
-    }
 
     public ListenerManager getListenerManager() {
         return listenerManager;

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
Thu Dec 14 07:03:47 2006
@@ -71,7 +71,7 @@
 
     public static final String TRANSPORT_HEADERS = "TRANSPORT_HEADERS";
 
-    public Attachments attachments = new Attachments();
+    public Attachments attachments;
 
     /**
      * Field TRANSPORT_OUT
@@ -1174,10 +1174,16 @@
     }
 
     public Attachments getAttachmentMap() {
+        if (attachments == null) {
+            attachments = new Attachments();
+        }
         return attachments;
     }
 
     public void addAttachment(String contentID, DataHandler dataHandler) {
+        if (attachments == null) {
+            attachments = new Attachments();
+        }
         attachments.addDataHandler(contentID, dataHandler);
     }
 
@@ -1188,6 +1194,9 @@
     }
 
     public DataHandler getAttachment(String contentID) {
+        if (attachments == null) {
+            attachments = new Attachments();
+        }
         return attachments.getDataHandler(contentID);
     }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
Thu Dec 14 07:03:47 2006
@@ -79,11 +79,13 @@
 
     public Parameter getParameter(String name) {
         Parameter parameter = parameterInclude.getParameter(name);
-        if (parameter == null && parent != null) {
-            return parent.getParameter(name);
-        } else {
+        if(parameter!=null){
             return parameter;
         }
+        if(parent != null) {
+            return parent.getParameter(name);
+        }
+        return null;
     }
 
     public Object getParameterValue(String name) {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
Thu Dec 14 07:03:47 2006
@@ -37,12 +37,12 @@
  * <p>Handler are registered once they are available. They are available to all services
if axis2.xml
  * has a module ref="." or available to a single service if services.xml have module ref=".."</p>
  */
-public class AxisModule implements FlowInclude, ParameterInclude {
+public class AxisModule implements ParameterInclude {
 
     /**
      * Field flowInclude
      */
-    private final FlowInclude flowInclude = new FlowIncludeImpl();
+    private final FlowInclude flowInclude = new FlowInclude();
 
     /**
      * Field parameters

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
Thu Dec 14 07:03:47 2006
@@ -44,9 +44,6 @@
     private static final Log log = LogFactory.getLog(AxisOperation.class);
     private int mep = WSDL20_2004Constants.MEP_CONSTANT_INVALID;
 
-    public static final String SOAP_ACTION = "soapaction";
-
-
     // to store engaged modules
     private ArrayList engagedModules = new ArrayList();
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java
Thu Dec 14 07:03:47 2006
@@ -18,58 +18,85 @@
 package org.apache.axis2.description;
 
 /**
- * Interface FlowInclude
+ * Class FlowIncludeImpl
  */
-public interface FlowInclude {
+public class FlowInclude  {
+
+    /**
+     * Field fault
+     */
+    private Flow In_fault;
+    private Flow Out_fault;
+
+    /**
+     * Field in
+     */
+    private Flow in;
+
+    /**
+     * Field out
+     */
+    private Flow out;
 
     /**
      * Method getFaultInFlow.
      *
      * @return Returns Flow.
      */
-    public Flow getFaultInFlow();
-
-    public Flow getFaultOutFlow();
+    public Flow getFaultInFlow() {
+        return In_fault;
+    }
+
+    public Flow getFaultOutFlow() {
+        return this.Out_fault;
+    }
 
     /**
      * Method getInFlow.
      *
      * @return Returns Flow.
      */
-    public Flow getInFlow();
+    public Flow getInFlow() {
+        return in;
+    }
 
     /**
      * Method getOutFlow.
      *
      * @return Returns Flow.
      */
-    public Flow getOutFlow();
+    public Flow getOutFlow() {
+        return out;
+    }
 
     /**
      * Method setFaultInFlow.
      *
-     * @param faultFlow
-     */
-    public void setFaultInFlow(Flow faultFlow);
-
-    /**
-     * Method setFaultOutFlow.
-     *
-     * @param faultFlow
+     * @param flow
      */
-    public void setFaultOutFlow(Flow faultFlow);
+    public void setFaultInFlow(Flow flow) {
+        this.In_fault = flow;
+    }
+
+    public void setFaultOutFlow(Flow faultFlow) {
+        this.Out_fault = faultFlow;
+    }
 
     /**
      * Method setInFlow.
      *
-     * @param inFlow
+     * @param flow
      */
-    public void setInFlow(Flow inFlow);
+    public void setInFlow(Flow flow) {
+        this.in = flow;
+    }
 
     /**
      * Method setOutFlow.
      *
-     * @param outFlow
+     * @param flow
      */
-    public void setOutFlow(Flow outFlow);
+    public void setOutFlow(Flow flow) {
+        this.out = flow;
+    }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
Thu Dec 14 07:03:47 2006
@@ -20,10 +20,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
+import org.apache.axis2.context.*;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.HandlerDescription;
@@ -76,8 +73,9 @@
             log.debug(Messages.getMessage("checkingserviceforepr", address));
             }
             QName serviceName;
+            ConfigurationContext configurationContext = messageContext.getConfigurationContext();
             String[] values = Utils.parseRequestURLForServiceAndOperation(address,
-                    messageContext.getConfigurationContext().getServiceContextPath());
+                    configurationContext.getServiceContextPath());
             if (values == null) {
                 return null;
             }
@@ -89,7 +87,7 @@
                 serviceName = new QName(values[0]);
 
                 AxisConfiguration registry =
-                        messageContext.getConfigurationContext().getAxisConfiguration();
+                        configurationContext.getAxisConfiguration();
 
                 return registry.getService(serviceName.getLocalPart());
             }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
Thu Dec 14 07:03:47 2006
@@ -1,7 +1,6 @@
 package org.apache.axis2.engine;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.AddressingHelper;
 import org.apache.axis2.context.MessageContext;
@@ -31,8 +30,6 @@
 */
 
 public class DispatchPhase extends Phase {
-
-    private static final long serialVersionUID = -6596799621473224363L;
 
     public DispatchPhase() {
     }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/InstanceDispatcher.java
Thu Dec 14 07:03:47 2006
@@ -101,8 +101,6 @@
                         msgContext);
             }
         }
-        // setting myEPR
-        String transportURL = (String) msgContext.getProperty(Constants.Configuration.TRANSPORT_IN_URL);
         if (serviceContext != null) {
             serviceContext.setMyEPR(msgContext.getTo());
         }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
Thu Dec 14 07:03:47 2006
@@ -20,6 +20,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.HandlerDescription;
@@ -60,12 +61,13 @@
             }
             String filePart = toEPR.getAddress();
             //REVIEW: (nagy) Parsing the RequestURI will also give us the operationName if
present, so we could conceivably store it in the MessageContext, but doing so and retrieving
it is probably no faster than simply reparsing the URI
+            ConfigurationContext configurationContext = messageContext.getConfigurationContext();
             String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
-                    messageContext.getConfigurationContext().getServiceContextPath());
+                    configurationContext.getServiceContextPath());
 
             if ((values.length >= 1) && (values[0] != null)) {
                 AxisConfiguration registry =
-                        messageContext.getConfigurationContext().getAxisConfiguration();
+                        configurationContext.getAxisConfiguration();
 
                 return registry.getService(values[0]);
             } else {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
Thu Dec 14 07:03:47 2006
@@ -21,6 +21,7 @@
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.HandlerDescription;
@@ -45,7 +46,7 @@
 
     public AxisOperation findOperation(AxisService service, MessageContext messageContext)
             throws AxisFault {
-        QName operationName = null;
+        QName operationName ;
         
         OMElement bodyFirstChild = messageContext.getEnvelope().getBody().getFirstElement();
 
@@ -73,7 +74,7 @@
      * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext)
      */
     public AxisService findService(MessageContext messageContext) throws AxisFault {
-        String serviceName = null;
+        String serviceName ;
         
         OMElement bodyFirstChild = messageContext.getEnvelope().getBody().getFirstElement();
 
@@ -88,14 +89,15 @@
                         "Checking for Service using SOAP message body's first child's namespace
: "
                                 + filePart);
                 }
+                ConfigurationContext configurationContext = messageContext.getConfigurationContext();
                 String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
-                        messageContext.getConfigurationContext().getServiceContextPath());
+                        configurationContext.getServiceContextPath());
 
                 if (values[0] != null) {
                     serviceName = values[0];
 
                     AxisConfiguration registry =
-                            messageContext.getConfigurationContext().getAxisConfiguration();
+                            configurationContext.getAxisConfiguration();
 
                     return registry.getService(serviceName);
                 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
Thu Dec 14 07:03:47 2006
@@ -23,8 +23,6 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.i18n.Messages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.lang.reflect.Method;
 
@@ -42,11 +40,9 @@
 public class RawXMLINOnlyMessageReceiver extends AbstractInMessageReceiver
         implements MessageReceiver {
 
-    private static final Log log = LogFactory.getLog(RawXMLINOnlyMessageReceiver.class);
-
-    private Method findOperation(AxisOperation op, Class ImplClass) {
+    private Method findOperation(AxisOperation op, Class implClass) {
         String methodName = op.getName().getLocalPart();
-        Method[] methods = ImplClass.getMethods();
+        Method[] methods = implClass.getMethods();
 
         for (int i = 0; i < methods.length; i++) {
             if (methods[i].getName().equals(methodName) &&
@@ -74,10 +70,10 @@
             Object obj = getTheImplementationObject(msgContext);
 
             // find the WebService method
-            Class ImplClass = obj.getClass();
+            Class implClass = obj.getClass();
 
-            AxisOperation op = msgContext.getOperationContext().getAxisOperation();
-            Method method = findOperation(op, ImplClass);
+            AxisOperation op = msgContext.getAxisOperation();
+            Method method = findOperation(op, implClass);
 
             if (method != null) {
                 method.invoke(

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
Thu Dec 14 07:03:47 2006
@@ -41,9 +41,9 @@
  */
 public class RawXMLINOutAsyncMessageReceiver extends AbstractInOutAsyncMessageReceiver {
 
-    private Method findOperation(AxisOperation op, Class ImplClass) {
+    private Method findOperation(AxisOperation op, Class implClass) {
         String methodName = op.getName().getLocalPart();
-        Method[] methods = ImplClass.getMethods();
+        Method[] methods = implClass.getMethods();
 
         for (int i = 0; i < methods.length; i++) {
             if (methods[i].getName().equals(methodName) &&
@@ -73,10 +73,10 @@
             Object obj = getTheImplementationObject(msgContext);
 
             // find the WebService method
-            Class ImplClass = obj.getClass();
+            Class implClass = obj.getClass();
 
-            AxisOperation opDesc = msgContext.getOperationContext().getAxisOperation();
-            Method method = findOperation(opDesc, ImplClass);
+            AxisOperation opDesc = msgContext.getAxisOperation();
+            Method method = findOperation(opDesc, implClass);
 
             if (method != null) {
                 OMElement result = (OMElement) method.invoke(

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
Thu Dec 14 07:03:47 2006
@@ -26,8 +26,6 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.i18n.Messages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.lang.reflect.Method;
 
@@ -45,11 +43,9 @@
 public class RawXMLINOutMessageReceiver extends AbstractInOutSyncMessageReceiver
         implements MessageReceiver {
 
-    private static final Log log = LogFactory.getLog(RawXMLINOutMessageReceiver.class);
-
-    private Method findOperation(AxisOperation op, Class ImplClass) {
+    private Method findOperation(AxisOperation op, Class implClass) {
         String methodName = op.getName().getLocalPart();
-        Method[] methods = ImplClass.getMethods();
+        Method[] methods = implClass.getMethods();
 
         for (int i = 0; i < methods.length; i++) {
             if (methods[i].getName().equals(methodName) &&
@@ -79,10 +75,10 @@
             Object obj = getTheImplementationObject(msgContext);
 
             // find the WebService method
-            Class ImplClass = obj.getClass();
+            Class implClass = obj.getClass();
 
-            AxisOperation opDesc = msgContext.getOperationContext().getAxisOperation();
-            Method method = findOperation(opDesc, ImplClass);
+            AxisOperation opDesc = msgContext.getAxisOperation();
+            Method method = findOperation(opDesc, implClass);
 
             if (method != null) {
                 OMElement result = (OMElement) method.invoke(

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
Thu Dec 14 07:03:47 2006
@@ -66,7 +66,6 @@
 public class AxisServlet extends HttpServlet implements TransportListener {
 
     private static final Log log = LogFactory.getLog(AxisServlet.class);
-    private static final long serialVersionUID = -2085869393709833372L;
     public static final String CONFIGURATION_CONTEXT = "CONFIGURATION_CONTEXT";
     public static final String SESSION_ID = "SessionId";
     protected transient ConfigurationContext configContext;
@@ -108,10 +107,8 @@
         msgContext.setFrom(new EndpointReference(req.getRemoteAddr()));
         msgContext.setProperty(MessageContext.TRANSPORT_HEADERS,
                 getTransportHeaders(req));
-        msgContext.setProperty(Constants.Configuration.TRANSPORT_IN_URL, req.getRequestURL().toString());
         msgContext.setIncomingTransportName(Constants.TRANSPORT_HTTP);
         msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST, req);
-//        msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT, servletConfig.getServletContext());
         return msgContext;
     }
 
@@ -251,7 +248,6 @@
 
             try {
                 // adding ServletContext into msgContext;
-                out = res.getOutputStream();
                 InvocationResponse pi = HTTPTransportUtils.processHTTPPostRequest(msgContext,
req.getInputStream(), out,
                         req.getContentType(), req.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
                         req.getRequestURL().toString());

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Thu Dec 14 07:03:47 2006
@@ -23,7 +23,6 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.util.JavaUtils;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
@@ -266,8 +265,6 @@
             }
         }
 
-        format.setDoOptimize(msgContext.isDoingMTOM());
-        format.setDoingSWA(msgContext.isDoingSwA());
         format.setAutoCloseWriter(true);
         if (!(msgContext.isDoingMTOM()) & (msgContext.isDoingSwA())
                 & !(msgContext.isDoingREST())) {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
Thu Dec 14 07:03:47 2006
@@ -178,7 +178,7 @@
                     if (schema != null) {
                         EntityTemplate entity = new EntityTemplate(new ContentProducer()
{
 
-                            public void writeTo(final OutputStream outstream) throws IOException
{
+                            public void writeTo(final OutputStream outstream) {
                                 schema.write(outstream);
                             }
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpServiceProcessor.java
Thu Dec 14 07:03:47 2006
@@ -176,7 +176,6 @@
             msgContext.setTransportOut(transportOut);
             msgContext.setServiceGroupContextId(UUIDGenerator.getUUID());
             msgContext.setServerSide(true);
-            msgContext.setProperty(Constants.Configuration.TRANSPORT_IN_URL, reqline.getUri());
 
             // set the transport Headers
             HashMap headerMap = new HashMap();

Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java?view=diff&rev=487227&r1=487226&r2=487227
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/RegistryTest.java
Thu Dec 14 07:03:47 2006
@@ -65,7 +65,7 @@
         assertEquals(p, parmInclude.getParameter(key));
     }
 
-    public void testFlowIncludeTest(FlowInclude flowInclude) {
+    public void testFlowIncludeTest(AxisModule flowInclude) {
         Flow flow1 = new Flow();
         Flow flow2 = new Flow();
         Flow flow3 = new Flow();
@@ -81,7 +81,6 @@
 
     public void testHandlers() throws AxisFault {
         Handler handler = new AbstractHandler() {
-            private static final long serialVersionUID = 196289132377245632L;
 
 			public InvocationResponse invoke(MessageContext msgContext)  {
                 return InvocationResponse.CONTINUE;        



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


Mime
View raw message