svn commit: r701586 - in /cxf/branches/2.1.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ rt/transports/jms/src/main/resources/schemas/configuration/ rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/

[ningjiang]

Author: ningjiang
Date: Fri Oct  3 19:41:02 2008
New Revision: 701586

URL: http://svn.apache.org/viewvc?rev=701586&view=rev
Log:
Merged revisions 700278-700308 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r700278 | cschneider | 2008-09-30 06:01:59 +0800 (Tue, 30 Sep 2008) | 1 line
 
  CXF-1832
........
  r700290 | cschneider | 2008-09-30 06:32:54 +0800 (Tue, 30 Sep 2008) | 1 line
 
  Fix for broken build
........
  r700308 | cschneider | 2008-09-30 07:39:28 +0800 (Tue, 30 Sep 2008) | 1 line
 
  Fix for broken build NullpointerException in ClientImpl
........

Removed:
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/PooledSessionTest.java
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=701586&r1=701585&r2=701586&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Fri Oct  3 19:41:02 2008
@@ -191,10 +191,10 @@
                 }
                 correlationMap.remove(correlationId);
             }
+            exchange.setInMessage(inMessage);
             if (incomingObserver != null) {
                 incomingObserver.onMessage(inMessage);
-            }
-            exchange.setInMessage(inMessage);
+            }      
         }
     }
 

Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java?rev=701586&r1=701585&r2=701586&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java Fri Oct  3 19:41:02 2008
@@ -20,7 +20,9 @@
 
 import java.io.IOException;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.message.Exchange;
 
@@ -28,6 +30,8 @@
  * Outputstream that sends a message when the exchange is closed
  */
 class JMSOutputStream extends CachedOutputStream {
+    static final Logger LOG = LogUtils.getL7dLogger(JMSOutputStream.class);
+    
     private final JMSExchangeSender sender;
     private Exchange exchange;
     private boolean isTextPayload;
@@ -71,8 +75,8 @@
         } catch (IOException ex) {
             throw new IOException("Error creating request Object from Message content, exception " + ex);
         }
-        if (JMSConduit.LOG.isLoggable(Level.FINE)) {
-            JMSConduit.LOG.log(Level.FINE, "Payload to be sent out is :[" + request + "]");
+        if (LOG.isLoggable(Level.FINE)) {
+            LOG.log(Level.FINE, "Payload to be sent out is :[" + request + "]");
         }
         return request;
     }

Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd?rev=701586&r1=701585&r2=701586&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd Fri Oct  3 19:41:02 2008
@@ -60,7 +60,7 @@
                      <xs:element name="address"
                      type="jms:AddressType" minOccurs="0" />
                      <xs:element name="jmsConfig-ref"
-                     type="xs:string">
+                     type="xs:string" maxOccurs="1" minOccurs="0">
                      </xs:element>
                     </xs:sequence>
                     <xs:attributeGroup ref="cxf-beans:beanAttributes"/>