geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
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 GMT
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();



Mime
View raw message