axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r396299 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/client/ core/src/org/apache/axis2/description/ core/src/org/apache/axis2/engine/ core/src/org/apache/axis2/util/ integration/test/org/apache/axis2/engine/
Date Sun, 23 Apr 2006 17:51:21 GMT
Author: dims
Date: Sun Apr 23 10:51:18 2006
New Revision: 396299

URL: http://svn.apache.org/viewcvs?rev=396299&view=rev
Log:
Fix for AXIS2-604 - Typo in method name setTranportOut() in the Options class


Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java
Sun Apr 23 10:51:18 2006
@@ -94,7 +94,7 @@
     public void reset() throws AxisFault;
 
     /**
-     * To close the tranport if necessary , can call this method. The most usage of thie
method
+     * To close the transport if necessary , can call this method. The most usage of thie
method
      * when clinet use two tarnport for sending and receiving , there we need to remove entry
from
      * waitings calls in the transport listener queue
      * Note : DO NOT call this method if you are not using two transport send and receive

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Sun
Apr 23 10:51:18 2006
@@ -253,9 +253,9 @@
         return replyTo;
     }
 
-    public TransportOutDescription getTranportOut() {
+    public TransportOutDescription getTransportOut() {
         if (transportOut == null && parent != null) {
-            return parent.getTranportOut();
+            return parent.getTransportOut();
         }
 
         return transportOut;
@@ -417,7 +417,7 @@
         this.replyTo = replyTo;
     }
 
-    public void setTranportOut(TransportOutDescription transportOut) {
+    public void setTransportOut(TransportOutDescription transportOut) {
         this.transportOut = transportOut;
     }
 
@@ -480,7 +480,7 @@
      *             useSeparateListener(boolean) instead. You do not need to
      *             setSenderTransportProtocol(String) as sender transport can be
      *             inferred from the to EPR. But still you can
-     *             setTranportOut(TransportOutDescription).
+     *             setTransportOut(TransportOutDescription).
      */
     public void setTransportInfo(String senderTransport,
                                  String listenerTransport, boolean useSeparateListener)

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
Sun Apr 23 10:51:18 2006
@@ -432,7 +432,7 @@
             if (callback.envelope != null) {
                 // building soap enevlop
                 callback.envelope.build();
-                // closing tranport
+                // closing transport
                 return callback.envelope.getBody().getFirstElement();
             } else {
                 if (callback.error instanceof AxisFault) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
Sun Apr 23 10:51:18 2006
@@ -229,7 +229,7 @@
         mc.setOptions(options);
         // if the transport to use for sending is not specified, try to find it
         // from the URL
-        TransportOutDescription transportOut = options.getTranportOut();
+        TransportOutDescription transportOut = options.getTransportOut();
         if (transportOut == null) {
             EndpointReference toEPR = (options.getTo() != null) ? options
                     .getTo() : mc.getTo();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
Sun Apr 23 10:51:18 2006
@@ -325,7 +325,7 @@
         // setting messge ID if it null
         // if the transport to use for sending is not specified, try to find it
         // from the URL
-        TransportOutDescription senderTransport = options.getTranportOut();
+        TransportOutDescription senderTransport = options.getTransportOut();
         if (senderTransport == null) {
             EndpointReference toEPR = (options.getTo() != null) ? options
                     .getTo() : mc.getTo();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
Sun Apr 23 10:51:18 2006
@@ -500,7 +500,7 @@
 
     /**
      * To resume the invocation at the send path , this is neened since it is require to
call
-     * TranportSender at the end
+     * TransportSender at the end
      *
      * @param msgContext
      */
@@ -588,11 +588,11 @@
             // This boolean property only used in client side fireAndForget invocation
             //It will set a property into message context and if some one has set the
             //property then transport sender will invoke in a diffrent thread
-            Object isTranportBlocking = msgContext.getProperty(
+            Object isTransportBlocking = msgContext.getProperty(
                     MessageContext.TRANSPORT_NON_BLOCKING);
-            if (isTranportBlocking != null && ((Boolean) isTranportBlocking).booleanValue())
{
+            if (isTransportBlocking != null && ((Boolean) isTransportBlocking).booleanValue())
{
                 msgContext.getConfigurationContext().getThreadPool().execute(
-                        new TranportNonBlockingInvocationWorker(msgContext, sender));
+                        new TransportNonBlockingInvocationWorker(msgContext, sender));
             } else {
                 sender.invoke(msgContext);
             }
@@ -646,12 +646,12 @@
      * This class is the workhorse for a non-blocking invocation that uses a two
      * way transport.
      */
-    private class TranportNonBlockingInvocationWorker implements Runnable {
+    private class TransportNonBlockingInvocationWorker implements Runnable {
         private Log log = LogFactory.getLog(getClass());
         private MessageContext msgctx;
         private TransportSender sender;
 
-        public TranportNonBlockingInvocationWorker(MessageContext msgctx,
+        public TransportNonBlockingInvocationWorker(MessageContext msgctx,
                                                    TransportSender sender) {
             this.msgctx = msgctx;
             this.sender = sender;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
Sun Apr 23 10:51:18 2006
@@ -38,7 +38,7 @@
     public static ConfigurationContext defaultConfigurationContext;
     
     private ConfigurationContext configctx;
-    private HashMap startedTranports = new HashMap();
+    private HashMap startedTransports = new HashMap();
     private boolean stopped = true;
 
     public void init(ConfigurationContext configCtx) {
@@ -54,19 +54,19 @@
      * To get an EPR for a given service
      *
      * @param serviceName  : Name of the service
-     * @param tranportName : name of the trasport can be null , if it is null then
+     * @param transportName : name of the trasport can be null , if it is null then
      * @return String
      */
     public synchronized EndpointReference getEPRforService(String serviceName, String opName,
-                                                           String tranportName) throws AxisFault
{
-        if (tranportName == null || "".equals(tranportName)) {
+                                                           String transportName) throws AxisFault
{
+        if (transportName == null || "".equals(transportName)) {
             AxisService service = configctx.getAxisConfiguration().getService(serviceName);
             if (service == null) {
                 throw new AxisFault(Messages.getMessage(
                         "servicenotfoundinthesystem", serviceName));
             }
             if (service.isEnableAllTransport()) {
-                Iterator itr_st = startedTranports.values().iterator();
+                Iterator itr_st = startedTransports.values().iterator();
                 if (itr_st.hasNext()) {
                     TransportListener transportListener = (TransportListener) itr_st.next();
                     return transportListener.getEPRForService(serviceName, null);
@@ -76,7 +76,7 @@
             } else {
                 String exposeTransport [] = service.getExposeTransports();
                 TransportListener listener = (TransportListener)
-                        startedTranports.get(exposeTransport[0]);
+                        startedTransports.get(exposeTransport[0]);
                 if (opName == null) {
                     return listener.getEPRForService(serviceName, null);
                 } else return listener.getEPRForService(serviceName + "/" + opName, null);
@@ -84,7 +84,7 @@
 
         } else {
             TransportInDescription trsIN = configctx.getAxisConfiguration()
-                    .getTransportIn(new QName(tranportName));
+                    .getTransportIn(new QName(transportName));
             TransportListener listener = trsIN.getReceiver();
             if (opName == null) {
                 return listener.getEPRForService(serviceName, null);
@@ -93,20 +93,20 @@
     }
 
     /**
-     * To start all the tranports
+     * To start all the transports
      */
     public synchronized void start() {
-        Iterator tranportNames = configctx.getAxisConfiguration().
+        Iterator transportNames = configctx.getAxisConfiguration().
                 getTransportsIn().values().iterator();
-        while (tranportNames.hasNext()) {
+        while (transportNames.hasNext()) {
             try {
-                TransportInDescription tranportIn = (TransportInDescription) tranportNames.next();
-                TransportListener listener = tranportIn.getReceiver();
-                if (listener != null && startedTranports.get(tranportIn.getName().getLocalPart())
== null) {
-                    listener.init(configctx, tranportIn);
+                TransportInDescription transportIn = (TransportInDescription) transportNames.next();
+                TransportListener listener = transportIn.getReceiver();
+                if (listener != null && startedTransports.get(transportIn.getName().getLocalPart())
== null) {
+                    listener.init(configctx, transportIn);
                     listener.start();
-                    if (startedTranports.get(tranportIn.getName().getLocalPart()) == null)
{
-                        startedTranports.put(tranportIn.getName().getLocalPart(), listener);
+                    if (startedTransports.get(transportIn.getName().getLocalPart()) == null)
{
+                        startedTransports.put(transportIn.getName().getLocalPart(), listener);
                     }
                 }
             } catch (Exception e) {
@@ -122,10 +122,10 @@
     }
 
     /**
-     * To stop all the tranport
+     * To stop all the transports
      */
     public synchronized void stop() throws AxisFault {
-        Iterator itr_st = startedTranports.values().iterator();
+        Iterator itr_st = startedTransports.values().iterator();
         while (itr_st.hasNext()) {
             TransportListener transportListener = (TransportListener) itr_st.next();
             transportListener.stop();
@@ -147,12 +147,12 @@
                 transportListener.start();
             }
             stopped = false;
-            startedTranports.put(trsIn.getName().getLocalPart(), transportListener);
+            startedTransports.put(trsIn.getName().getLocalPart(), transportListener);
         }
     }
 
     public synchronized boolean isListenerRunning(String transportName) {
-        return startedTranports.get(transportName) != null;
+        return startedTransports.get(transportName) != null;
     }
 
     public boolean isStopped() {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
Sun Apr 23 10:51:18 2006
@@ -36,7 +36,6 @@
         if (callback != null) {
             callback.onComplete(result);
             callback.setComplete(true);
-            //closing the tranport
         } else {
             throw new AxisFault("The Callback realtes to MessageID " + messageID + " is not
found");
         }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=396299&r1=396298&r2=396299&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
Sun Apr 23 10:51:18 2006
@@ -138,7 +138,7 @@
         Options options = new Options();
         sender.setOptions(options);
         options.setTo(targetEPR);
-        options.setTranportOut(tOut);
+        options.setTransportOut(tOut);
         options.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         sender.fireAndForget(payload);
 



Mime
View raw message