Author: dkulp Date: Fri Dec 21 16:49:10 2012 New Revision: 1425021 URL: http://svn.apache.org/viewvc?rev=1425021&view=rev Log: Merged revisions 1424981 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1424981 | dkulp | 2012-12-21 10:45:08 -0500 (Fri, 21 Dec 2012) | 11 lines Merged revisions 1424979 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1424979 | dkulp | 2012-12-21 10:43:29 -0500 (Fri, 21 Dec 2012) | 3 lines [CXF-4713] Grab all the methods Patch from Iris Ding applied. ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1425021&r1=1425020&r2=1425021&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Fri Dec 21 16:49:10 2012 @@ -165,13 +165,15 @@ public class JaxWsServiceConfiguration e || method.isSynthetic()) { return Boolean.FALSE; } + WebMethod wm = method.getAnnotation(WebMethod.class); - if (wm != null) { - if (wm.exclude()) { - return Boolean.FALSE; - } else { - return Boolean.TRUE; - } + Class<?> cls = method.getDeclaringClass(); + if ((wm != null) && wm.exclude()) { + return Boolean.FALSE; + } + if ((wm != null && !wm.exclude()) || (cls.isInterface() + && cls.isAssignableFrom(implInfo.getSEIClass()))) { + return Boolean.TRUE; } if (method.getDeclaringClass().isInterface()) { return hasWebServiceAnnotation(method);
