Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 79490 invoked from network); 1 Apr 2007 22:52:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Apr 2007 22:52:13 -0000 Received: (qmail 78761 invoked by uid 500); 1 Apr 2007 22:52:20 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 78715 invoked by uid 500); 1 Apr 2007 22:52:20 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 78701 invoked by uid 99); 1 Apr 2007 22:52:20 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 15:52:20 -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; Sun, 01 Apr 2007 15:52:12 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 59DE01A9838; Sun, 1 Apr 2007 15:51:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524698 - /geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java Date: Sun, 01 Apr 2007 22:51:52 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070401225152.59DE01A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Sun Apr 1 15:51:50 2007 New Revision: 524698 URL: http://svn.apache.org/viewvc?view=rev&rev=524698 Log: prefer service-ref-type service class (if set) Modified: geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java Modified: geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java?view=diff&rev=524698&r1=524697&r2=524698 ============================================================================== --- geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java (original) +++ geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java Sun Apr 1 15:51:50 2007 @@ -114,8 +114,14 @@ public Object getContent() throws NamingException { Service instance = null; URL wsdlURL = getWsdlURL(); + Class serviceClass = loadClass(this.serviceClassName); - + Class referenceClass = getReferenceClass(); + + if (referenceClass != null && Service.class.isAssignableFrom(referenceClass)) { + serviceClass = referenceClass; + } + if (Service.class.equals(serviceClass)) { serviceClass = GenericService.class; } @@ -127,7 +133,6 @@ instance.setHandlerResolver(handlerResolver); } - Class referenceClass = getReferenceClass(); if (referenceClass != null && !Service.class.isAssignableFrom(referenceClass)) { // do port lookup return instance.getPort(referenceClass);