axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hemap...@apache.org
Subject svn commit: r153985 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/clientapi/ java/org/apache/axis/context/ java/org/apache/axis/handlers/ java/org/apache/axis/providers/ java/org/apache/axis/transport/ java/org/apache/axis/transport/http/ test/org/apache/axis/engine/ test/org/apache/axis/testUtils/
Date Wed, 16 Feb 2005 03:13:39 GMT
Author: hemapani
Date: Tue Feb 15 19:13:31 2005
New Revision: 153985

URL: http://svn.apache.org/viewcvs?view=rev&rev=153985
Log:
move the constants to one place and handle the session support

Removed:
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java
Modified:
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/SimpleSessionContext.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/handlers/OpNameFinder.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportReciverLocator.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportSenderLocator.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageContextTest.java
    webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/testUtils/SimpleJavaProvider.java

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Call.java
Tue Feb 15 19:13:31 2005
@@ -1,5 +1,11 @@
 package org.apache.axis.clientapi;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.apache.axis.Constants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.AxisGlobal;
@@ -11,15 +17,9 @@
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.transport.TransportReciver;
 import org.apache.axis.transport.TransportReciverLocator;
-import org.apache.axis.transport.TransportSenderLocator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-
 /**
  * Copyright 2001-2004 The Apache Software Foundation.
  * <p/>
@@ -92,13 +92,14 @@
             final AxisEngine engine = new AxisEngine(registry);
             urlConnect.setDoOutput(true);
 
-            MessageContext msgctx = new MessageContext(registry, null);
+            MessageContext msgctx = new MessageContext(registry, null, null);
             msgctx.setEnvelope(envelope);
 
             out = urlConnect.getOutputStream();
             msgctx.setProperty(MessageContext.TRANSPORT_WRITER, out);
-            msgctx.setProperty(MessageContext.TRANSPORT_TYPE,
-                    TransportSenderLocator.TRANSPORT_HTTP);
+            msgctx.setProperty(
+                MessageContext.TRANSPORT_TYPE,
+                Constants.TRANSPORT_HTTP);
             msgctx.setTo(targetEPR);
 
             engine.send(msgctx);
@@ -118,22 +119,28 @@
         try {
             final AxisEngine engine = new AxisEngine(registry);
 
-            MessageContext msgctx = new MessageContext(registry, null);
+            MessageContext msgctx = new MessageContext(registry, null, null);
             msgctx.setEnvelope(envelope);
 
-            msgctx.setProperty(MessageContext.TRANSPORT_TYPE,
-                    TransportSenderLocator.TRANSPORT_HTTP);
+            msgctx.setProperty(
+                MessageContext.TRANSPORT_TYPE,
+                Constants.TRANSPORT_HTTP);
             msgctx.setTo(targetEPR);
             engine.send(msgctx);
 
             //todo dose the 202 response  come throgh the same connection
             //This is purely HTTP specific.
             //Handle the HTTP 202 respose
-            MessageContext response = new MessageContext(registry, msgctx.getProperties());
+            MessageContext response =
+                new MessageContext(
+                    registry,
+                    msgctx.getProperties(),
+                    msgctx.getSessionContext());
 
             response.setServerSide(false);
-            response.setProperty(MessageContext.TRANSPORT_TYPE,
-                    TransportSenderLocator.TRANSPORT_HTTP);
+            response.setProperty(
+                MessageContext.TRANSPORT_TYPE,
+                Constants.TRANSPORT_HTTP);
             TransportReciver reciver = TransportReciverLocator.locate(response);
             reciver.invoke(response);
         } catch (IOException e) {
@@ -146,20 +153,26 @@
         try {
 
             AxisEngine engine = new AxisEngine(registry);
-            MessageContext msgctx = new MessageContext(registry, null);
+            MessageContext msgctx = new MessageContext(registry, null, null);
             msgctx.setEnvelope(envelope);
 
-            msgctx.setProperty(MessageContext.TRANSPORT_TYPE,
-                    TransportSenderLocator.TRANSPORT_HTTP);
+            msgctx.setProperty(
+                MessageContext.TRANSPORT_TYPE,
+            Constants.TRANSPORT_HTTP);
             msgctx.setTo(targetEPR);
 
             engine.send(msgctx);
 
-            MessageContext response = new MessageContext(registry, msgctx.getProperties());
+            MessageContext response =
+                new MessageContext(
+                    registry,
+                    msgctx.getProperties(),
+                    msgctx.getSessionContext());
 
             response.setServerSide(false);
-            response.setProperty(MessageContext.TRANSPORT_TYPE,
-                    TransportSenderLocator.TRANSPORT_HTTP);
+            response.setProperty(
+                MessageContext.TRANSPORT_TYPE,
+            Constants.TRANSPORT_HTTP);
             TransportReciver reciver = TransportReciverLocator.locate(response);
             reciver.invoke(response);
             SOAPEnvelope resenvelope = response.getEnvelope();
@@ -176,24 +189,27 @@
      * @param envelope
      * @param callback
      */
-    public void sendReceiveAsync(SOAPEnvelope envelope,
-                                 final Callback callback)
-            throws AxisFault {
+    public void sendReceiveAsync(
+        SOAPEnvelope envelope,
+        final Callback callback)
+        throws AxisFault {
         try {
             // URL url =new URL(targetEPR.getAddress());
             AxisEngine engine = new AxisEngine(registry);
-            final MessageContext msgctx = new MessageContext(registry, null);
+            final MessageContext msgctx =
+                new MessageContext(registry, null, null);
             msgctx.setEnvelope(envelope);
 
-            msgctx.setProperty(MessageContext.TRANSPORT_TYPE,
-                    TransportSenderLocator.TRANSPORT_HTTP);
+            msgctx.setProperty(
+                MessageContext.TRANSPORT_TYPE,
+            Constants.TRANSPORT_HTTP);
             msgctx.setTo(targetEPR);
 
             // only the transport blocked , client dose not hang
             if (blocked) {
                 //TODO This shoudld be taken from a pool of inovkers.
                 Invoker invoker =
-                        new Invoker(msgctx, engine, registry, callback);
+                    new Invoker(msgctx, engine, registry, callback);
                 Thread th = new Thread(invoker);
                 th.start();
             } else {

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java
Tue Feb 15 19:13:31 2005
@@ -11,12 +11,12 @@
  * governing permissions and limitations under the License.
  */
 
+import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.EngineRegistry;
 import org.apache.axis.transport.TransportReciver;
 import org.apache.axis.transport.TransportReciverLocator;
-import org.apache.axis.transport.TransportSenderLocator;
 
 public class Invoker implements Runnable {
 
@@ -49,11 +49,11 @@
             correlator.addCorrelationInfo(reqMsgContext.getMessageID(),
                     callback);
 
-            MessageContext resMsgContext = new MessageContext(registry, reqMsgContext.getProperties());
+            MessageContext resMsgContext = new MessageContext(registry, reqMsgContext.getProperties(),reqMsgContext.getSessionContext());
 
             resMsgContext.setServerSide(false);
             resMsgContext.setProperty(MessageContext.TRANSPORT_TYPE,
-                    TransportSenderLocator.TRANSPORT_HTTP);
+            Constants.TRANSPORT_HTTP);
             TransportReciver reciver =
                     TransportReciverLocator.locate(resMsgContext);
             reciver.invoke(resMsgContext);

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java
Tue Feb 15 19:13:31 2005
@@ -16,13 +16,13 @@
 
 package org.apache.axis.context;
 
+import org.apache.axis.Constants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.addressing.miheaders.RelatesTo;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.AxisTransport;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Constants;
 import org.apache.axis.engine.EngineRegistry;
 import org.apache.axis.engine.ExecutionChain;
 import org.apache.axis.om.OMElement;
@@ -40,8 +40,10 @@
  */
 public class MessageContext {
     private int messageStyle = Constants.SOAP_STYLE_RPC_ENCODED;
-//    private HashMap messages = new HashMap();
-
+    
+    /**
+     *  Follwing are the defined properties that are stored in the message Context 
+     */
     public static final String USER_NAME = "USER";
     public static final String PASSWORD = "PASSWD";
     public static final String TRANSPORT_TYPE = "TRANSPORT_TYPE";
@@ -77,10 +79,21 @@
     private boolean newThreadRequired = false;
     private XMLStreamReader xpp;
     private OMElement soapOperationElement;
+    
+    /**
+     * 
+     * @param er
+     * @param initialProperties
+     * @param sessionContext
+     * @throws AxisFault
+     */
 
-    public MessageContext(EngineRegistry er, Map initialProperties) throws AxisFault {
+    public MessageContext(EngineRegistry er, Map initialProperties,SessionContext sessionContext)
throws AxisFault {
         this.globalContext = new GlobalContext(er);
-        this.sessionContext = new SimpleSessionContext();
+        if(sessionContext == null){
+            this.sessionContext = new SimpleSessionContext();
+        }
+        
         if (initialProperties == null) {
             initialProperties = new HashMap();
         }

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/SimpleSessionContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/SimpleSessionContext.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/SimpleSessionContext.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/SimpleSessionContext.java
Tue Feb 15 19:13:31 2005
@@ -20,6 +20,7 @@
 
 public class SimpleSessionContext implements SessionContext {
     private HashMap map = new HashMap();
+    
 
     public Object get(Object key) {
         return map.get(key);

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/handlers/OpNameFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/handlers/OpNameFinder.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/handlers/OpNameFinder.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/handlers/OpNameFinder.java
Tue Feb 15 19:13:31 2005
@@ -15,12 +15,12 @@
  */
 package org.apache.axis.handlers;
 
+import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.HandlerMetaData;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Constants;
 import org.apache.axis.om.*;
 
 import javax.xml.namespace.QName;

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/providers/RawXMLProvider.java
Tue Feb 15 19:13:31 2005
@@ -16,11 +16,11 @@
 
 package org.apache.axis.providers;
 
+import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.SessionContext;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Constants;
 import org.apache.axis.engine.Provider;
 import org.apache.axis.om.OMElement;
 import org.apache.axis.om.OMFactory;
@@ -111,7 +111,7 @@
             Object[] parms = new Object[]{parmeter};
             //invoke the WebService 
             OMElement result = (OMElement) method.invoke(obj, parms);
-            MessageContext msgContext1 = new MessageContext(msgContext.getGlobalContext().getRegistry(),
msgContext.getProperties());
+            MessageContext msgContext1 = new MessageContext(msgContext.getGlobalContext().getRegistry(),
msgContext.getProperties(),msgContext.getSessionContext());
 
             SOAPEnvelope envelope = OMFactory.newInstance().getDefaultEnvelope();
             envelope.getBody().setFirstChild(result);

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportReciverLocator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportReciverLocator.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportReciverLocator.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportReciverLocator.java
Tue Feb 15 19:13:31 2005
@@ -16,19 +16,17 @@
 
 package org.apache.axis.transport;
 
+import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.transport.http.HTTPTransportReciver;
 
 public class TransportReciverLocator {
-    public static final String TRANSPORT_TCP = "tcp";
-    public static final String TRANSPORT_HTTP = "http";
-
+    
     public static TransportReciver locate(MessageContext msgContext)
             throws AxisFault {
-        String type =
-                (String) msgContext.getProperty(MessageContext.TRANSPORT_TYPE);
-        if (TransportReciverLocator.TRANSPORT_HTTP.equals(type)) {
+        String type = (String) msgContext.getProperty(MessageContext.TRANSPORT_TYPE);
+        if (Constants.TRANSPORT_HTTP.equals(type)) {
             return new HTTPTransportReciver();
         } else {
             throw new AxisFault("No tranport found");

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportSenderLocator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportSenderLocator.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportSenderLocator.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/TransportSenderLocator.java
Tue Feb 15 19:13:31 2005
@@ -16,18 +16,17 @@
 
 package org.apache.axis.transport;
 
+import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.transport.http.HTTPTransportSender;
 
 
 public class TransportSenderLocator {
-    public static final String TRANSPORT_TCP = "tcp";
-    public static final String TRANSPORT_HTTP = "http";
-
+ 
     public static TransportSender locate(MessageContext msgContext) throws AxisFault {
         String type = (String) msgContext.getProperty(MessageContext.TRANSPORT_TYPE);
-        if (TransportSenderLocator.TRANSPORT_HTTP.equals(type)) {
+        if (Constants.TRANSPORT_HTTP.equals(type)) {
             return new HTTPTransportSender();
         }
         throw new AxisFault("No tranport found");

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/AxisServlet.java
Tue Feb 15 19:13:31 2005
@@ -16,9 +16,30 @@
 package org.apache.axis.transport.http;
 
 
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis.Constants;
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.SessionContext;
+import org.apache.axis.context.SimpleSessionContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.engine.AxisEngine;
@@ -29,24 +50,6 @@
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis.transport.TransportSenderLocator;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
 
 
 public class AxisServlet extends HttpServlet {
@@ -72,7 +75,16 @@
         try {
             res.setContentType("text/xml; charset=utf-8");
             AxisEngine engine = new AxisEngine(engineRegistry);
-            MessageContext msgContext = new MessageContext(engineRegistry, null);
+            
+            
+            Object sessionContext = req.getSession().getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
+            if(sessionContext == null){
+                sessionContext = new SimpleSessionContext();
+                req.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY,sessionContext);
+            }
+            
+            MessageContext msgContext = new MessageContext(engineRegistry, null,(SessionContext)sessionContext);
+            
             msgContext.setServerSide(true);
             String filePart = req.getRequestURL().toString();
             if (filePart != null && filePart.endsWith(LISTSERVICES)) {
@@ -94,7 +106,7 @@
             msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
 
             msgContext.setProperty(MessageContext.TRANSPORT_TYPE,
-                    TransportSenderLocator.TRANSPORT_HTTP);
+                    Constants.TRANSPORT_HTTP);
             msgContext.setProperty(MessageContext.TRANSPORT_WRITER,
                     res.getWriter());
 

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
Tue Feb 15 19:13:31 2005
@@ -16,18 +16,22 @@
 
 package org.apache.axis.transport.http;
 
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.EngineRegistry;
 import org.apache.axis.engine.EngineRegistryFactory;
-import org.apache.axis.transport.TransportSenderLocator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.*;
-import java.net.ServerSocket;
-import java.net.Socket;
-
 /**
  * This is a simple implementation of an HTTP server for processing
  * SOAP requests via Apache's xml-axis.  This is not intended for production
@@ -101,7 +105,7 @@
                         Reader in =
                                 new InputStreamReader(socket.getInputStream());
                         MessageContext msgContext =
-                                new MessageContext(this.engineReg, null);
+                                new MessageContext(this.engineReg, null,null);
                         msgContext.setServerSide(true);
 
                         out.write(HTTPConstants.HTTP);
@@ -111,7 +115,7 @@
                         //We do not have any Addressing Headers to put
                         //let us put the information about incoming transport
                         msgContext.setProperty(MessageContext.TRANSPORT_TYPE,
-                                TransportSenderLocator.TRANSPORT_HTTP);
+                                Constants.TRANSPORT_HTTP);
                         msgContext.setProperty(MessageContext.TRANSPORT_WRITER,
                                 out);
                         msgContext.setProperty(MessageContext.TRANSPORT_READER,

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
Tue Feb 15 19:13:31 2005
@@ -15,14 +15,23 @@
  */
 package org.apache.axis.engine;
 
-import org.apache.axis.description.*;
-import org.apache.axis.testUtils.SimpleJavaProvider;
-import org.apache.axis.transport.http.SimpleHTTPServer;
-
-import javax.xml.namespace.QName;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis.Constants;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.MockFlow;
+import org.apache.axis.description.SimpleAxisOperationImpl;
+import org.apache.axis.testUtils.SimpleJavaProvider;
+import org.apache.axis.transport.http.SimpleHTTPServer;
 
 
 public class EngineUtils {

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageContextTest.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageContextTest.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageContextTest.java
Tue Feb 15 19:13:31 2005
@@ -27,7 +27,7 @@
 
     public void testMesssageContext() throws AxisFault {
         EngineRegistry er = new EngineRegistryImpl(new AxisGlobal());
-        MessageContext msgctx = new MessageContext(er, null);
+        MessageContext msgctx = new MessageContext(er, null,null);
 
         msgctx.setEnvelope(OMFactory.newInstance().getDefaultEnvelope());
         assertNotNull(msgctx.getEnvelope());

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/testUtils/SimpleJavaProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/testUtils/SimpleJavaProvider.java?view=diff&r1=153984&r2=153985
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/testUtils/SimpleJavaProvider.java
(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/testUtils/SimpleJavaProvider.java
Tue Feb 15 19:13:31 2005
@@ -16,12 +16,12 @@
 
 package org.apache.axis.testUtils;
 
+import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.SessionContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.Constants;
 import org.apache.axis.engine.Provider;
 import org.apache.axis.om.*;
 import org.apache.axis.providers.AbstractProvider;



Mime
View raw message