Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 25253 invoked from network); 4 Aug 2008 15:28:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Aug 2008 15:28:15 -0000 Received: (qmail 69833 invoked by uid 500); 4 Aug 2008 15:28:13 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 69782 invoked by uid 500); 4 Aug 2008 15:28:13 -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 69768 invoked by uid 99); 4 Aug 2008 15:28:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Aug 2008 08:28:13 -0700 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; Mon, 04 Aug 2008 15:27:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B4A182388988; Mon, 4 Aug 2008 08:27:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r682421 - in /geronimo/server/branches/2.1/plugins: axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Date: Mon, 04 Aug 2008 15:27:53 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080804152753.B4A182388988@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Aug 4 08:27:53 2008 New Revision: 682421 URL: http://svn.apache.org/viewvc?rev=682421&view=rev Log: handle missing wsdl better Modified: geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java geronimo/server/branches/2.1/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Modified: geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java?rev=682421&r1=682420&r2=682421&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java (original) +++ geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java Mon Aug 4 08:27:53 2008 @@ -308,13 +308,12 @@ } protected void processGETRequest(Request request, Response response, AxisService service, MessageContext msgContext) throws Exception{ - if (AxisServiceGenerator.isHTTP(service)) { - processURLRequest(request, response, service, msgContext); - } else if (request.getURI().getQuery() != null && - (request.getURI().getQuery().startsWith("wsdl") || - request.getURI().getQuery().startsWith("xsd"))) { + String query = request.getURI().getQuery(); + if (query != null && + (query.startsWith("wsdl") || query.startsWith("WSDL") || + query.startsWith("xsd") || query.startsWith("XSD"))) { // wsdl or xsd request - + if (portInfo.getWsdlFile() != null && !portInfo.getWsdlFile().equals("")) { URL wsdlURL = AxisServiceGenerator.getWsdlURL(portInfo.getWsdlFile(), configurationBaseUrl, @@ -323,7 +322,7 @@ wsdlURL.toString(), response.getOutputStream()); } else { - service.printWSDL(response.getOutputStream()); + throw new Exception("Service does not have WSDL"); } } else if (AxisServiceGenerator.isSOAP11(service)) { response.setContentType("text/html"); Modified: geronimo/server/branches/2.1/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java?rev=682421&r1=682420&r2=682421&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java (original) +++ geronimo/server/branches/2.1/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Mon Aug 4 08:27:53 2008 @@ -85,9 +85,7 @@ } protected void processGET(Request request, Response response) throws Exception { - if (endpoint.isHTTP()) { - processPOST(request, response); - } else if (request.getParameter("wsdl") != null || request.getParameter("WSDL") != null || + if (request.getParameter("wsdl") != null || request.getParameter("WSDL") != null || request.getParameter("xsd") != null || request.getParameter("XSD") != null) { GeronimoQueryHandler queryHandler = new GeronimoQueryHandler(this.bus); URI requestURI = request.getURI();