svn commit: r557746 - in /incubator/cxf/trunk: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ systests/src/test/java/org/apache/cxf/systest/jaxws/

[dkulp]

Author: dkulp
Date: Thu Jul 19 12:15:00 2007
New Revision: 557746

URL: http://svn.apache.org/viewvc?view=rev&rev=557746
Log:
[CXF-813] Only grab methods from the appropriate endpoint definition

Modified:
    
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java

Modified: 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?view=diff&rev=557746&r1=557745&r2=557746
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 Thu Jul 19 12:15:00 2007
@@ -124,7 +124,8 @@
     public Boolean isOperation(Method method) {
         Method origMethod = method;
         method = getDeclaredMethod(method);
-        if (method.getReturnType().equals(Future.class)
+        if (method == null
+            || method.getReturnType().equals(Future.class)
             || method.getReturnType().equals(Response.class)) {
             return false;
         }
@@ -161,7 +162,7 @@
             } catch (SecurityException e) {
                 throw new ServiceConstructionException(e);
             } catch (NoSuchMethodException e) {
-                // Do nothing
+                return null;
             }
         }
         return method;

Modified: 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?view=diff&rev=557746&r1=557745&r2=557746
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 Thu Jul 19 12:15:00 2007
@@ -346,7 +346,7 @@
         // client/servers.
         Arrays.sort(methods, new MethodComparator());
 
-        for (Method m : serviceClass.getMethods()) {
+        for (Method m : methods) {
             if (isValidMethod(m)) {
                 createOperation(serviceInfo, intf, m);
             }

Modified: 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java?view=diff&rev=557746&r1=557745&r2=557746
==============================================================================
--- 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
 (original)
+++ 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
 Thu Jul 19 12:15:00 2007
@@ -30,6 +30,10 @@
 public class DocLitWrappedCodeFirstServiceImpl implements 
DocLitWrappedCodeFirstService {
     public static final String DATA[] = new String[] {"string1", "string2", 
"string3"};
     
+    public int thisShouldNotBeInTheWSDL(int i) {
+        return i;
+    }
+    
     public String[] arrayOutput() {
         return DATA;
     }