Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 58106 invoked from network); 17 May 2006 16:15:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 May 2006 16:15:22 -0000 Received: (qmail 71403 invoked by uid 500); 17 May 2006 16:15:20 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 71331 invoked by uid 500); 17 May 2006 16:15:20 -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 71320 invoked by uid 500); 17 May 2006 16:15:20 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 71317 invoked by uid 99); 17 May 2006 16:15:20 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 May 2006 09:15:20 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 May 2006 09:15:19 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9F3E41A9835; Wed, 17 May 2006 09:14:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r407303 - /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Date: Wed, 17 May 2006 16:14:59 -0000 To: axis2-cvs@ws.apache.org From: dims@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060517161459.9F3E41A9835@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dims Date: Wed May 17 09:14:58 2006 New Revision: 407303 URL: http://svn.apache.org/viewvc?rev=407303&view=rev Log: remove hardcoded reference to axis Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=407303&r1=407302&r2=407303&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Wed May 17 09:14:58 2006 @@ -275,7 +275,17 @@ if (port == null) { port = "8080"; } - return new EndpointReference("http://" + ip + ":" + port + "/axis2/services/" + serviceName); + String webappName = null; + // HACK ALERT!!! - Is there a better way to get the webapp name? + try{ + String[] array = servletConfig.getServletContext().getResource("/").toString().split("/"); + webappName = array[array.length-1]; + }catch(Exception e){ + } + if(webappName == null) { + webappName = "axis2"; + } + return new EndpointReference("http://" + ip + ":" + port + '/' + webappName + "/services/" + serviceName); } protected MessageContext createMessageContext(HttpServletRequest req,