Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 32805 invoked from network); 19 Oct 2007 12:47:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Oct 2007 12:47:35 -0000 Received: (qmail 96866 invoked by uid 500); 19 Oct 2007 12:47:23 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 96595 invoked by uid 500); 19 Oct 2007 12:47:22 -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 96584 invoked by uid 500); 19 Oct 2007 12:47:22 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 96581 invoked by uid 99); 19 Oct 2007 12:47:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Oct 2007 05:47:22 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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, 19 Oct 2007 12:47:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D31521A9832; Fri, 19 Oct 2007 05:46:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r586406 - in /webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2: builder/XFormURLEncodedBuilder.java dispatchers/HTTPLocationBasedDispatcher.java Date: Fri, 19 Oct 2007 12:46:42 -0000 To: axis2-cvs@ws.apache.org From: keithc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071019124642.D31521A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: keithc Date: Fri Oct 19 05:46:42 2007 New Revision: 586406 URL: http://svn.apache.org/viewvc?rev=586406&view=rev Log: Fixing minor REST issues Modified: webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java Modified: webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java?rev=586406&r1=586405&r2=586406&view=diff ============================================================================== --- webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java (original) +++ webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java Fri Oct 19 05:46:42 2007 @@ -307,7 +307,10 @@ } private SOAPFactory getSOAPFactory(String nsURI) throws AxisFault { - if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) { + if (nsURI == null) { + return OMAbstractFactory.getSOAP12Factory(); + } + else if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) { return OMAbstractFactory.getSOAP12Factory(); } else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) { return OMAbstractFactory.getSOAP11Factory(); Modified: webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java?rev=586406&r1=586405&r2=586406&view=diff ============================================================================== --- webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java (original) +++ webservices/axis2/branches/java/1_3_post_mods/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java Fri Oct 19 05:46:42 2007 @@ -21,12 +21,15 @@ package org.apache.axis2.dispatchers; import org.apache.axis2.AxisFault; +import org.apache.axis2.Constants; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.AxisEndpoint; import org.apache.axis2.description.AxisOperation; import org.apache.axis2.description.AxisService; import org.apache.axis2.description.HandlerDescription; import org.apache.axis2.description.WSDL2Constants; +import org.apache.axis2.description.AxisBinding; +import org.apache.axis2.description.AxisBindingOperation; import org.apache.axis2.engine.AbstractDispatcher; import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.logging.Log; @@ -81,8 +84,22 @@ Map httpLocationTable = (Map) endpoint.getBinding() .getProperty(WSDL2Constants.HTTP_LOCATION_TABLE); if (httpLocationTable != null) { - return getOperationFromHTTPLocation(httpLocation, - httpLocationTable); + AxisOperation axisOperation = + getOperationFromHTTPLocation(httpLocation, + httpLocationTable); + if (axisOperation != null) { + messageContext.setProperty(WSDL2Constants.ENDPOINT_LOCAL_NAME, + endpoint); + AxisBinding axisBinding = endpoint.getBinding(); + if (axisBinding != null) { + AxisBindingOperation axisBindingOperation = + (AxisBindingOperation) axisBinding + .getChild(axisOperation.getName()); + messageContext.setProperty(Constants.AXIS_BINDING_OPERATION, + axisBindingOperation); + return axisOperation; + } + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org