Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 76799 invoked from network); 8 Jun 2007 17:49:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Jun 2007 17:49:12 -0000 Received: (qmail 2693 invoked by uid 500); 8 Jun 2007 17:49:14 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 2640 invoked by uid 500); 8 Jun 2007 17:49:14 -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 2619 invoked by uid 99); 8 Jun 2007 17:49:14 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jun 2007 10:49:14 -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; Fri, 08 Jun 2007 10:49:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7CBFC1A981A; Fri, 8 Jun 2007 10:48:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r545569 - in /geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2: Axis2WebServiceContainer.java pojo/POJOWebServiceContainer.java Date: Fri, 08 Jun 2007 17:48:49 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070608174849.7CBFC1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Fri Jun 8 10:48:48 2007 New Revision: 545569 URL: http://svn.apache.org/viewvc?view=rev&rev=545569 Log: cleaned up the code a bit more Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java?view=diff&rev=545569&r1=545568&r2=545569 ============================================================================== --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java (original) +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java Fri Jun 8 10:48:48 2007 @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.PrintWriter; +import java.net.HttpURLConnection; import java.net.URL; import java.util.concurrent.CountDownLatch; @@ -201,16 +202,16 @@ MessageContext faultContext = MessageContextBuilder.createFaultMessageContext(msgContext, e); // If the fault is not going along the back channel we should be 202ing if (AddressingHelper.isFaultRedirected(msgContext)) { - response.setStatusCode(202); + response.setStatusCode(HttpURLConnection.HTTP_ACCEPTED); } else { - response.setStatusCode(500); + response.setStatusCode(HttpURLConnection.HTTP_INTERNAL_ERROR); } engine.sendFault(faultContext); } catch (Exception ex) { if (AddressingHelper.isFaultRedirected(msgContext)) { - response.setStatusCode(202); + response.setStatusCode(HttpURLConnection.HTTP_ACCEPTED); } else { - response.setStatusCode(500); + response.setStatusCode(HttpURLConnection.HTTP_INTERNAL_ERROR); response.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, "text/plain"); PrintWriter pw = new PrintWriter(response.getOutputStream()); ex.printStackTrace(pw); @@ -227,35 +228,11 @@ public void doService2(Request request, Response response, MessageContext msgContext) throws Exception { - - ConfigurationContext configurationContext = msgContext.getConfigurationContext(); - // TODO: Port this section -// // Adjust version and content chunking based on the config -// boolean chunked = false; -// TransportOutDescription transportOut = msgContext.getTransportOut(); -// if (transportOut != null) { -// Parameter p = transportOut.getParameter(HTTPConstants.PROTOCOL_VERSION); -// if (p != null) { -// if (HTTPConstants.HEADER_PROTOCOL_10.equals(p.getValue())) { -// ver = HttpVersion.HTTP_1_0; -// } -// } -// if (ver.greaterEquals(HttpVersion.HTTP_1_1)) { -// p = transportOut.getParameter(HTTPConstants.HEADER_TRANSFER_ENCODING); -// if (p != null) { -// if (HTTPConstants.HEADER_TRANSFER_ENCODING_CHUNKED.equals(p.getValue())) { -// chunked = true; -// } -// } -// } -// } - - if (request.getMethod() == Request.GET) { - processGETRequest(request, response, this.service, configurationContext, msgContext); + processGETRequest(request, response, this.service, msgContext); } else if (request.getMethod() == Request.POST) { - processPOSTRequest(request, response, this.service, configurationContext, msgContext); + processPOSTRequest(request, response, this.service, msgContext); } else { throw new UnsupportedOperationException("[" + request.getMethod() + " ] method not supported"); } @@ -271,12 +248,12 @@ if ((contextWritten != null) && Constants.VALUE_TRUE.equals(contextWritten)) { if ((isTwoChannel != null) && Constants.VALUE_TRUE.equals(isTwoChannel)) { - response.setStatusCode(202); + response.setStatusCode(HttpURLConnection.HTTP_ACCEPTED); return; } - response.setStatusCode(200); + response.setStatusCode(HttpURLConnection.HTTP_OK); } else { - response.setStatusCode(202); + response.setStatusCode(HttpURLConnection.HTTP_ACCEPTED); } } @@ -315,7 +292,7 @@ response.setContentType("text/xml; charset=" + msgContext.getProperty("message.character-set-encoding")); - response.setStatusCode(202); + response.setStatusCode(HttpURLConnection.HTTP_ACCEPTED); try { response.flushBuffer(); } catch (IOException e) { @@ -350,7 +327,7 @@ } } - protected void processGETRequest(Request request, Response response, AxisService service, ConfigurationContext configurationContext, MessageContext msgContext) throws Exception{ + protected void processGETRequest(Request request, Response response, AxisService service, MessageContext msgContext) throws Exception{ if (request.getURI().getQuery() != null && (request.getURI().getQuery().startsWith("wsdl") || request.getURI().getQuery().startsWith("xsd"))) { @@ -377,7 +354,7 @@ null); if (!processed.equals(InvocationResponse.CONTINUE)) { - response.setStatusCode(200); + response.setStatusCode(HttpURLConnection.HTTP_OK); String s = HTTPTransportReceiver.getServicesHTML(configurationContext); PrintWriter pw = new PrintWriter(response.getOutputStream()); pw.write(s); @@ -411,13 +388,14 @@ msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT, servletContext); } - protected void processPOSTRequest (Request request, Response response, AxisService service, ConfigurationContext configurationContext, MessageContext msgContext) throws Exception { + protected void processPOSTRequest (Request request, Response response, AxisService service, MessageContext msgContext) throws Exception { String contentType = request.getHeader(HTTPConstants.HEADER_CONTENT_TYPE); String soapAction = request.getHeader(HTTPConstants.HEADER_SOAP_ACTION); if (soapAction == null) { soapAction = "\"\""; } + ConfigurationContext configurationContext = msgContext.getConfigurationContext(); configurationContext.fillServiceContextAndServiceGroupContext(msgContext); setMsgContextProperties(msgContext, service, response, request); Modified: geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java?view=diff&rev=545569&r1=545568&r2=545569 ============================================================================== --- geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java (original) +++ geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java Fri Jun 8 10:48:48 2007 @@ -26,9 +26,7 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; -import org.apache.axis2.context.ServiceGroupContext; import org.apache.axis2.description.AxisService; -import org.apache.axis2.engine.DependencyManager; import org.apache.axis2.jaxws.binding.BindingImpl; import org.apache.axis2.jaxws.registry.FactoryRegistry; import org.apache.axis2.jaxws.server.JAXWSMessageReceiver; @@ -87,13 +85,14 @@ } @Override - protected void processPOSTRequest(Request request, Response response, AxisService service, ConfigurationContext configurationContext, MessageContext msgContext) throws Exception { + protected void processPOSTRequest(Request request, Response response, AxisService service, MessageContext msgContext) throws Exception { String contentType = request.getHeader(HTTPConstants.HEADER_CONTENT_TYPE); String soapAction = request.getHeader(HTTPConstants.HEADER_SOAP_ACTION); if (soapAction == null) { soapAction = "\"\""; } + ConfigurationContext configurationContext = msgContext.getConfigurationContext(); configurationContext.fillServiceContextAndServiceGroupContext(msgContext); setMsgContextProperties(msgContext, service, response, request);