From axis-cvs-return-30256-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org Thu Sep 03 14:49:12 2009 Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 17947 invoked from network); 3 Sep 2009 14:49:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Sep 2009 14:49:12 -0000 Received: (qmail 23130 invoked by uid 500); 3 Sep 2009 14:49:11 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 22995 invoked by uid 500); 3 Sep 2009 14:49:11 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 22986 invoked by uid 500); 3 Sep 2009 14:49:11 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 22983 invoked by uid 99); 3 Sep 2009 14:49:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 14:49:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 14:49:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DB7412388908; Thu, 3 Sep 2009 14:48:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r810978 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Date: Thu, 03 Sep 2009 14:48:49 -0000 To: axis2-cvs@ws.apache.org From: rott@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090903144849.DB7412388908@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rott Date: Thu Sep 3 14:48:49 2009 New Revision: 810978 URL: http://svn.apache.org/viewvc?rev=810978&view=rev Log: initial WSDL processing should flow through XML catalog Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?rev=810978&r1=810977&r2=810978&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java (original) +++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Thu Sep 3 14:48:49 2009 @@ -221,7 +221,8 @@ } this.wsdlURL = sparseCompositeWsdlURL.toString(); } else { - this.wsdlURL = wsdlURL == null ? null : wsdlURL.toString(); + // need to call getWSDLURL here to flow through XML catalog during WSDL processing + this.wsdlURL = wsdlURL == null ? null : getWSDLURL(wsdlURL.toString()).toString(); } if (log.isDebugEnabled()) { log.debug("Wsdl Location value used: " + this.wsdlURL);