Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 18911 invoked from network); 2 Apr 2008 08:40:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Apr 2008 08:40:37 -0000 Received: (qmail 42818 invoked by uid 500); 2 Apr 2008 08:40:37 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 42801 invoked by uid 500); 2 Apr 2008 08:40:37 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 42781 invoked by uid 99); 2 Apr 2008 08:40:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 01:40:36 -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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 08:40:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EA8511A9832; Wed, 2 Apr 2008 01:40:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r643791 - /incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java Date: Wed, 02 Apr 2008 08:40:14 -0000 To: tuscany-commits@ws.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080402084015.EA8511A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Wed Apr 2 01:40:02 2008 New Revision: 643791 URL: http://svn.apache.org/viewvc?rev=643791&view=rev Log: Merge fix for TUSCANY-1948 from trunk to 1.2 branch Modified: incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java Modified: incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java?rev=643791&r1=643790&r2=643791&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java Wed Apr 2 01:40:02 2008 @@ -284,9 +284,7 @@ } } - String contextPath = configContext.getServiceContextPath(); - - URI epURI = URI.create("http://" + ip + ":" + port + "/" + contextPath + "/" + serviceName).normalize(); + URI epURI = URI.create("http://" + ip + ":" + port + "/" + serviceName).normalize(); return new EndpointReference[]{new EndpointReference(epURI.toString())}; } --------------------------------------------------------------------- To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org For additional commands, e-mail: tuscany-commits-help@ws.apache.org