From 20ea4b874fcb14c01d87a2a4aa47a8aedcc84104 Mon Sep 17 00:00:00 2001 From: hns Date: Wed, 24 Jul 2002 18:35:45 +0000 Subject: [PATCH] Get init parameters in in init method instead of a special constructor the way servlets should. --- src/helma/servlet/EmbeddedServletClient.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/helma/servlet/EmbeddedServletClient.java b/src/helma/servlet/EmbeddedServletClient.java index f46ab8e0..2feea9eb 100644 --- a/src/helma/servlet/EmbeddedServletClient.java +++ b/src/helma/servlet/EmbeddedServletClient.java @@ -22,22 +22,25 @@ public final class EmbeddedServletClient extends AbstractServletClient { private String appName; // The path where this servlet is mounted - String servletPath; + String mountpoint; public EmbeddedServletClient () { super (); } - public EmbeddedServletClient (String appName, String servletPath) { + /* public EmbeddedServletClient (String appName, String servletPath) { this.appName = appName; this.servletPath = servletPath; - } + } */ public void init (ServletConfig init) throws ServletException { super.init (init); - String app = init.getInitParameter ("application"); - if (app != null) - appName = app; + appName = init.getInitParameter ("application"); + if (appName == null) + throw new ServletException ("Application name not set in init parameters"); + mountpoint = init.getInitParameter ("mountpoint"); + if (mountpoint == null) + mountpoint = "/"+appName; } IRemoteApp getApp (String appID) { @@ -58,9 +61,9 @@ public final class EmbeddedServletClient extends AbstractServletClient { String getRequestPath (String path) { if (path == null) return ""; - int pathMatch = path.indexOf (servletPath); + int pathMatch = path.indexOf (mountpoint); if (pathMatch > -1) - return trim (path.substring (pathMatch+servletPath.length())); + return trim (path.substring (pathMatch+mountpoint.length())); else return trim (path); }