Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 78886 invoked from network); 19 Jul 2007 19:15:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jul 2007 19:15:52 -0000 Received: (qmail 89797 invoked by uid 500); 19 Jul 2007 19:15:25 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 89730 invoked by uid 500); 19 Jul 2007 19:15:25 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 89708 invoked by uid 99); 19 Jul 2007 19:15:25 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2007 12:15:25 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2007 12:15:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 480CB1A981A; Thu, 19 Jul 2007 12:15:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Thu, 19 Jul 2007 19:15:01 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070719191502.480CB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }