You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by he...@apache.org on 2005/05/20 06:12:34 UTC

svn commit: r171043 - in /webservices/axis/trunk/java/modules/core/src/org/apache/axis: clientapi/ListenerManager.java deployment/DeploymentParser.java description/TransportInDescription.java transport/http/SimpleHTTPServer.java transport/tcp/TCPServer.java

Author: hemapani
Date: Thu May 19 21:12:32 2005
New Revision: 171043

URL: http://svn.apache.org/viewcvs?rev=171043&view=rev
Log:
cleaning up the code

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java?rev=171043&r1=171042&r2=171043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/ListenerManager.java Thu May 19 21:12:32 2005
@@ -24,16 +24,16 @@
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.ConfigurationContext;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.transport.TransportReceiver;
+import org.apache.axis.transport.TransportListener;
 import org.apache.axis.transport.http.SimpleHTTPServer;
 import org.apache.axis.transport.tcp.TCPServer;
 
 public class ListenerManager {
 
-    public static TransportReceiver httpListener;
-    public static TransportReceiver tcpListener;
-    public static TransportReceiver mailListener;
-    public static TransportReceiver jmsListener;
+    public static TransportListener httpListener;
+    public static TransportListener tcpListener;
+    public static TransportListener mailListener;
+    public static TransportListener jmsListener;
     public static ConfigurationContext configurationContext;
 
     public static final void makeSureStarted(

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=171043&r1=171042&r2=171043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java Thu May 19 21:12:32 2005
@@ -21,7 +21,7 @@
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.MessageReceiver;
 import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.transport.TransportReceiver;
+import org.apache.axis.transport.TransportListener;
 import org.apache.axis.transport.TransportSender;
 
 import javax.xml.namespace.QName;
@@ -215,7 +215,7 @@
                 Class reciever = null;
                 try {
                     reciever = Class.forName(attvalue, true, Thread.currentThread().getContextClassLoader());
-                    TransportReceiver trnsrecievr = (TransportReceiver) reciever.newInstance();
+                    TransportListener trnsrecievr = (TransportListener) reciever.newInstance();
                     transportin.setReciver(trnsrecievr);
                 } catch (ClassNotFoundException e) {
                     throw  new DeploymentException(e.getMessage());

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java?rev=171043&r1=171042&r2=171043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java Thu May 19 21:12:32 2005
@@ -17,7 +17,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.transport.TransportReceiver;
+import org.apache.axis.transport.TransportListener;
 
 /**
  * Represents a transport deployed in AXis2
@@ -49,7 +49,7 @@
     protected QName name;
 
 
-    protected TransportReceiver reciever;
+    protected TransportListener reciever;
 
     /**
      * Constructor AxisTransport
@@ -112,14 +112,14 @@
     /**
      * @return
      */
-    public TransportReceiver getReciever() {
+    public TransportListener getReciever() {
         return reciever;
     }
 
     /**
      * @param receiver
      */
-    public void setReciver(TransportReceiver receiver) {
+    public void setReciver(TransportListener receiver) {
         reciever = receiver;
     }
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java?rev=171043&r1=171042&r2=171043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java Thu May 19 21:12:32 2005
@@ -23,7 +23,7 @@
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.TransportOutDescription;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.transport.TransportReceiver;
+import org.apache.axis.transport.TransportListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -41,7 +41,7 @@
  * not use multiple instances of this class in the same JVM/classloader unless
  * you want bad things to happen at shutdown.
  */
-public class SimpleHTTPServer extends TransportReceiver implements Runnable{
+public class SimpleHTTPServer extends TransportListener implements Runnable{
     /**
      * Field log
      */
@@ -50,7 +50,7 @@
     /**
      * Field systemContext
      */
-    protected ConfigurationContext systemContext;
+    protected ConfigurationContext configurationContext;
 
     /**
      * Field serverSocket
@@ -74,7 +74,7 @@
      * @param systemContext
      */
     public SimpleHTTPServer(ConfigurationContext systemContext, ServerSocket serverSoc) {
-        this.systemContext = systemContext;
+        this.configurationContext = systemContext;
         this.serverSocket = serverSoc;
     }
 
@@ -89,7 +89,7 @@
             this.serverSocket = serverSoc;
            // Class erClass = Class.forName("org.apache.axis.deployment.EngineContextFactoryImpl");
             ConfigurationContextFactory erfac = new ConfigurationContextFactory();
-            this.systemContext = erfac.buildEngineContext(dir);
+            this.configurationContext = erfac.buildEngineContext(dir);
             Thread.sleep(2000);
         } catch (Exception e1) {
             throw new AxisFault("Thread interuptted", e1);
@@ -124,21 +124,21 @@
                         break;
                     }
                     if (socket != null) {
-                        if (systemContext == null) {
+                        if (configurationContext == null) {
                             throw new AxisFault("Engine Must be null");
                         }
                         Writer out = new OutputStreamWriter(socket.getOutputStream());
                         Reader in = new InputStreamReader(socket.getInputStream());
                         TransportOutDescription transportOut =
-                            systemContext.getEngineConfig().getTransportOut(
+                            configurationContext.getEngineConfig().getTransportOut(
                                 new QName(Constants.TRANSPORT_HTTP));
                         MessageContext msgContext =
                             new MessageContext(
                                 null,
-                                systemContext.getEngineConfig().getTransportIn(
+                                configurationContext.getEngineConfig().getTransportIn(
                                     new QName(Constants.TRANSPORT_HTTP)),
                                 transportOut,
-                                systemContext);
+                                configurationContext);
                         msgContext.setServerSide(true);
 
                         // We do not have any Addressing Headers to put
@@ -146,7 +146,7 @@
                         msgContext.setProperty(MessageContext.TRANSPORT_WRITER, out);
                         msgContext.setProperty(MessageContext.TRANSPORT_READER, in);
                         HTTPTransportReceiver reciver = new HTTPTransportReceiver();
-                        reciver.invoke(msgContext, systemContext);
+                        reciver.invoke(msgContext, configurationContext);
 
                         if (msgContext.getReplyTo() != null
                             && !AddressingConstants.EPR_ANONYMOUS_URL.equals(
@@ -249,7 +249,7 @@
      * @return
      */
     public ConfigurationContext getSystemContext() {
-        return systemContext;
+        return configurationContext;
     }
 
     /**
@@ -277,7 +277,7 @@
         }
     }
     /* (non-Javadoc)
-     * @see org.apache.axis.transport.TransportReceiver#replyToEPR(java.lang.String)
+     * @see org.apache.axis.transport.TransportListener#replyToEPR(java.lang.String)
      */
     public EndpointReference replyToEPR(String serviceName) {
         return new EndpointReference(

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java?rev=171043&r1=171042&r2=171043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java Thu May 19 21:12:32 2005
@@ -40,7 +40,7 @@
 import org.apache.axis.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis.soap.SOAPEnvelope;
 import org.apache.axis.soap.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis.transport.TransportReceiver;
+import org.apache.axis.transport.TransportListener;
 import org.apache.axis.transport.http.SimpleHTTPServer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -48,7 +48,7 @@
 /**
  * Class HTTPTransportReceiver
  */
-public class TCPServer extends TransportReceiver implements Runnable {
+public class TCPServer extends TransportListener implements Runnable {
     private int port = 8000;
     private ServerSocket serversocket;
     private boolean started = false;
@@ -138,7 +138,7 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.axis.transport.TransportReceiver#replyToEPR(java.lang.String)
+     * @see org.apache.axis.transport.TransportListener#replyToEPR(java.lang.String)
      */
     public EndpointReference replyToEPR(String serviceName) throws AxisFault {
         return new EndpointReference(
@@ -147,7 +147,7 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.axis.transport.TransportReceiver#stop()
+     * @see org.apache.axis.transport.TransportListener#stop()
      */
     public void stop() throws AxisFault {
         started = false;