axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r355899 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/transport/jms/ integration/test/org/apache/axis2/jms/
Date Sun, 11 Dec 2005 04:25:11 GMT
Author: dims
Date: Sat Dec 10 20:25:06 2005
New Revision: 355899

URL: http://svn.apache.org/viewcvs?rev=355899&view=rev
Log:
get rid of wait for response flag.


Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConstants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConstants.java?rev=355899&r1=355898&r2=355899&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConstants.java
Sat Dec 10 20:25:06 2005
@@ -36,7 +36,6 @@
 
     // abbreviated version of all constants (see below for description of each constant)
     // the short name is used in the JMS URL. the full name is used in the Axis call.
-    final static String _WAIT_FOR_RESPONSE = "waitForResponse";
     final static String _CLIENT_ID = "clientID";
     final static String _VENDOR = "vendor";
     final static String _DOMAIN = "domain";
@@ -64,17 +63,6 @@
     final static String _MSG_PROP_PREFIX = "msgProp.";
 
     public static String JMS_PROPERTY_PREFIX = "transport.jms.";
-
-    /**
-     * This is used as a key in the Call properties telling the JMS transport
-     * to wait for a response from the service.  The default value is true.
-     * If false is specified, the message will be delivered without specifying
-     * a ReplyTo.  The client will always return null from invoke unless
-     * a client-side exception is thrown (similar to invokeOneWay in semantics)
-     * The value must be a <code>java.lang.Boolean</code>.
-     * See the javax.jms javadoc for information on this property.
-     */
-    final static String WAIT_FOR_RESPONSE = JMS_PROPERTY_PREFIX + _WAIT_FOR_RESPONSE;
 
     /**
      * <code>JMSConnectorFactory</code> parameter valid for either domain.  This
should

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java?rev=355899&r1=355898&r2=355899&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
Sat Dec 10 20:25:06 2005
@@ -101,10 +101,10 @@
 
         boolean waitForResponse = false;
         if (dest == null) {
-            if (msgContext.getProperty(JMSConstants.WAIT_FOR_RESPONSE) != null &&
msgContext.getProperty(JMSConstants.WAIT_FOR_RESPONSE).equals(Boolean.TRUE))
+            if (msgContext.getProperty(Constants.Configuration.IS_USING_SEPARATE_LISTENER)
!= null && msgContext.getProperty(Constants.Configuration.IS_USING_SEPARATE_LISTENER).equals(Boolean.TRUE))
                 waitForResponse =
-                        ((Boolean) msgContext.getProperty(
-                                JMSConstants.WAIT_FOR_RESPONSE)).booleanValue();
+                        !((Boolean) msgContext.getProperty(
+                                Constants.Configuration.IS_USING_SEPARATE_LISTENER)).booleanValue();
         } else {
             if (properties != null) {
                 JMSURLHelper url = null;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java?rev=355899&r1=355898&r2=355899&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java
Sat Dec 10 20:25:06 2005
@@ -223,11 +223,6 @@
         if (ttl != null)
             context.setProperty(JMSConstants.TIME_TO_LIVE, Long.valueOf(ttl));
 
-        String wait = null;
-        if (jmsurl != null)
-            wait = jmsurl.getPropertyValue(JMSConstants._WAIT_FOR_RESPONSE);
-        if (wait != null)
-            context.setProperty(JMSConstants.WAIT_FOR_RESPONSE, Boolean.valueOf(wait));
         setupApplicationProperties(context, jmsurl);
     }
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?rev=355899&r1=355898&r2=355899&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
Sat Dec 10 20:25:06 2005
@@ -114,7 +114,6 @@
         options.setListenerTransportProtocol(Constants.TRANSPORT_JMS);
         options.setAction(serviceName.getLocalPart());
         options.setSoapAction("echoOMElement");
-        options.getProperties().put(JMSConstants.WAIT_FOR_RESPONSE, Boolean.TRUE);
 
         Callback callback = new Callback() {
             public void onComplete(AsyncResult result) {
@@ -164,7 +163,6 @@
         options.setListenerTransportProtocol(Constants.TRANSPORT_JMS);
         options.setAction(serviceName.getLocalPart());
         options.setSoapAction("EchoXMLService/echoOMElement");
-        options.getProperties().put(JMSConstants.WAIT_FOR_RESPONSE, Boolean.TRUE);
 
         OMElement result =
                 call.invokeBlocking(operationName.getLocalPart(),
@@ -197,7 +195,6 @@
         options.setAction(operationName.getLocalPart());
         options.setListenerTransportProtocol(Constants.TRANSPORT_JMS);
         options.setSoapAction("EchoXMLService/echoOMElement");
-        options.getProperties().put(JMSConstants.WAIT_FOR_RESPONSE, Boolean.FALSE);
         options.setUseSeparateListener(true);
 
         OMElement result = call.invokeBlocking(
@@ -220,7 +217,6 @@
         options.setAction(operationName.getLocalPart());
         options.setListenerTransportProtocol(Constants.TRANSPORT_JMS);
         options.setSoapAction("EchoXMLService/echoOMElement");
-        options.getProperties().put(JMSConstants.WAIT_FOR_RESPONSE, Boolean.TRUE);
 
         OMFactory fac = OMAbstractFactory.getOMFactory();
 



Mime
View raw message