You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/12/18 02:39:55 UTC
svn commit: r892084 - in /cxf/branches/2.2.x-fixes: ./
rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/
rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/
Author: dkulp
Date: Fri Dec 18 01:39:53 2009
New Revision: 892084
URL: http://svn.apache.org/viewvc?rev=892084&view=rev
Log:
Merged revisions 892056 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r892056 | dkulp | 2009-12-17 20:16:28 -0500 (Thu, 17 Dec 2009) | 1 line
More Spring3 fixes
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
cxf/branches/2.2.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 18 01:39:53 2009
@@ -1 +1 @@
-/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946
+/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946,892056
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=892084&r1=892083&r2=892084&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Fri Dec 18 01:39:53 2009
@@ -219,7 +219,11 @@
JAXBDataBinding db = new JAXBDataBinding(getQualifyWrapperSchema());
Map props = this.getProperties();
if (props != null && props.get("jaxb.additionalContextClasses") != null) {
- Class[] extraClass = (Class[])this.getProperties().get("jaxb.additionalContextClasses");
+ Object o = this.getProperties().get("jaxb.additionalContextClasses");
+ if (o instanceof Class) {
+ o = new Class[] {(Class)o};
+ }
+ Class[] extraClass = (Class[])o;
db.setExtraClass(extraClass);
}
retVal = db;
Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=892084&r1=892083&r2=892084&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java Fri Dec 18 01:39:53 2009
@@ -246,6 +246,7 @@
jmsListener.setDestination(dest);
}
jmsListener.initialize();
+ jmsListener.start();
return jmsListener;
}
Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?rev=892084&r1=892083&r2=892084&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Fri Dec 18 01:39:53 2009
@@ -206,10 +206,12 @@
public void testOneWayDestination() throws Exception {
setupServiceInfo("http://cxf.apache.org/hello_world_jms", "/wsdl/jms_test.wsdl",
"HWStaticReplyQBinMsgService", "HWStaticReplyQBinMsgPort");
+ JMSDestination destination = setupJMSDestination(true);
+
JMSConduit conduit = setupJMSConduit(true, false);
Message outMessage = new MessageImpl();
setupMessageHeader(outMessage);
- JMSDestination destination = setupJMSDestination(true);
+
sendoutMessage(conduit, outMessage, true);
// wait for the message to be get from the destination
waitForReceiveDestMessage();