Author: ningjiang Date: Fri Oct 3 22:12:07 2008 New Revision: 701599 URL: http://svn.apache.org/viewvc?rev=701599&view=rev Log: Merged revisions 701586 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r701586 | ningjiang | 2008-10-04 10:41:02 +0800 (Sat, 04 Oct 2008) | 17 lines 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.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/PooledSessionTest.java Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=701599&r1=701598&r2=701599&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Fri Oct 3 22:12:07 2008 @@ -191,10 +191,10 @@ } correlationMap.remove(correlationId); } + exchange.setInMessage(inMessage); if (incomingObserver != null) { incomingObserver.onMessage(inMessage); - } - exchange.setInMessage(inMessage); + } } } Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=701599&r1=701598&r2=701599&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Fri Oct 3 22:12:07 2008 @@ -36,7 +36,7 @@ private boolean messageTimestampEnabled = true; private boolean pubSubNoLocal; private long receiveTimeout; - // Repalce the JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT with 0 to support the Spring 2.0.x + // Replace the JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT with 0 to support the Spring 2.0.x private boolean explicitQosEnabled; private int deliveryMode = Message.DEFAULT_DELIVERY_MODE; private int priority = Message.DEFAULT_PRIORITY; Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java?rev=701599&r1=701598&r2=701599&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOutputStream.java Fri Oct 3 22:12:07 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.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd?rev=701599&r1=701598&r2=701599&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd Fri Oct 3 22:12:07 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"/> Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?rev=701599&r1=701598&r2=701599&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java Fri Oct 3 22:12:07 2008 @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.OutputStream; import java.net.URL; +import java.util.Map; import javax.xml.namespace.QName; @@ -111,7 +112,7 @@ } else { target = EasyMock.createMock(EndpointReferenceType.class); } - + JMSConfiguration jmsConfig = new JMSOldConfigHolder() .createJMSConfigurationFromEndpointInfo(bus, endpointInfo, true); jmsConfig.setDeliveryMode(3); @@ -122,7 +123,7 @@ if (send) { // setMessageObserver observer = new MessageObserver() { - public void onMessage(Message m) { + public void onMessage(Message m) { inMessage = m; } }; Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java?rev=701599&r1=701598&r2=701599&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Fri Oct 3 22:12:07 2008 @@ -97,6 +97,7 @@ } public void verifyReceivedMessage(Message message) { + System.out.println("inMessage " + inMessage.toString()); ByteArrayInputStream bis = (ByteArrayInputStream)inMessage.getContent(InputStream.class); byte bytes[] = new byte[bis.available()]; try {
