Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1229669 - in /cxf/branches/2.5.x-fixes: ./
 rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
 rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
Date: Tue, 10 Jan 2012 18:27:19 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20120110182720.2BB8F23889EB@eris.apache.org>

Author: dkulp
Date: Tue Jan 10 18:27:19 2012
New Revision: 1229669

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

........
  r1229663 | dkulp | 2012-01-10 13:12:18 -0500 (Tue, 10 Jan 2012) | 2 lines
  
  [CXF-4018] Fix problems with providers not getting the proper
  JAXWSMethodInvoker
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
    cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 10 18:27:19 2012
@@ -1,2 +1,3 @@
 /cxf/branches/wss4j-1.6-port:1043100-1069432
 /cxf/sandbox/wss4j-1.6-port:1031652-1043098
+/cxf/trunk:1229663

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 10 18:27:19 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739
+/cxf/trunk:1-1227739,1229663

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1229669&r1=1229668&r2=1229669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Tue Jan 10 18:27:19 2012
@@ -64,6 +64,7 @@ import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxws.JAXWSMethodDispatcher;
+import org.apache.cxf.jaxws.JAXWSMethodInvoker;
 import org.apache.cxf.jaxws.JAXWSProviderMethodDispatcher;
 import org.apache.cxf.jaxws.WrapperClassGenerator;
 import org.apache.cxf.jaxws.interceptors.WebFaultOutInterceptor;
@@ -73,6 +74,8 @@ import org.apache.cxf.service.factory.Fa
 import org.apache.cxf.service.factory.FactoryBeanListener.Event;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.service.invoker.Invoker;
+import org.apache.cxf.service.invoker.SingletonFactory;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -691,4 +694,13 @@ public class JaxWsServiceFactoryBean ext
         }
         super.initializeParameter(part, rawClass, type);
     }
+
+    @Override
+    protected Invoker createInvoker() {
+        Class<?> cls = getServiceClass();
+        if (cls.isInterface()) {
+            return null;
+        }
+        return new JAXWSMethodInvoker(new SingletonFactory(getServiceClass()));
+    }
 }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java?rev=1229669&r1=1229668&r2=1229669&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java Tue Jan 10 18:27:19 2012
@@ -55,6 +55,7 @@ public class ProviderServiceFactoryTest 
         bean.setServiceClass(HWSoapMessageProvider.class);
 
         Service service = bean.create();
+        assertTrue(service.getInvoker() instanceof JAXWSMethodInvoker);
 
         assertEquals("SOAPService", service.getName().getLocalPart());
         assertEquals("http://apache.org/hello_world_soap_http", service.getName().getNamespaceURI());
@@ -68,6 +69,7 @@ public class ProviderServiceFactoryTest 
         svrFactory.setStart(false);
 
         ServerImpl server = (ServerImpl)svrFactory.create();
+        assertTrue(server.getEndpoint().getService().getInvoker() instanceof JAXWSMethodInvoker);
 
         Endpoint endpoint = server.getEndpoint();
         Binding binding = endpoint.getBinding();