cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r892056 - in /cxf/trunk/rt: frontend/simple/src/main/java/org/apache/cxf/service/factory/ transports/jms/src/main/java/org/apache/cxf/transport/jms/ transports/jms/src/test/java/org/apache/cxf/transport/jms/
Date Fri, 18 Dec 2009 01:16:28 GMT
Author: dkulp
Date: Fri Dec 18 01:16:28 2009
New Revision: 892056

URL: http://svn.apache.org/viewvc?rev=892056&view=rev
Log:
More Spring3 fixes

Modified:
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
    cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=892056&r1=892055&r2=892056&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Fri Dec 18 01:16:28 2009
@@ -220,7 +220,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/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=892056&r1=892055&r2=892056&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
(original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
Fri Dec 18 01:16:28 2009
@@ -99,7 +99,6 @@
     
     public void ensureProperlyConfigured(org.apache.cxf.common.i18n.Message msg) {
         if (targetDestination == null ||  getOrCreateWrappedConnectionFactory() == null)
{
-            System.out.println("targetDestination " + targetDestination);
             throw new ConfigurationException(msg);
         }
     }

Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=892056&r1=892055&r2=892056&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
(original)
+++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
Fri Dec 18 01:16:28 2009
@@ -222,6 +222,7 @@
             jmsListener.setDestination(dest);
         }
         jmsListener.initialize();
+        jmsListener.start();
         return jmsListener;
     }
 

Modified: cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?rev=892056&r1=892055&r2=892056&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
(original)
+++ cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
Fri Dec 18 01:16:28 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();



Mime
View raw message