diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2013-02-05 21:50:19 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-02-05 22:14:14 -0500 |
commit | 2a0ee4780561c4f9da42ddab6640da144339594d (patch) | |
tree | 05103d98d9e787f505f31dd6b717ee081731d2ca /base/common/src | |
parent | 981ebcce84770c9d48e80fc9b5ffd2bbf8fd0816 (diff) | |
download | pki-2a0ee4780561c4f9da42ddab6640da144339594d.tar.gz pki-2a0ee4780561c4f9da42ddab6640da144339594d.tar.xz pki-2a0ee4780561c4f9da42ddab6640da144339594d.zip |
Added default config path.
Previously the config path had to be defined in web.xml, so the web.xml
had to be customized during deployment. The CMSStartServlet code now
has been modified to generate the config path from catalina.base and
webapp's context path by default.
Diffstat (limited to 'base/common/src')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java index e00f2bdba..3af4099a2 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java @@ -50,6 +50,18 @@ public class CMSStartServlet extends HttpServlet { super.init(config); String path = config.getInitParameter(PROP_CMS_CFG); + if (path == null) { + String[] s = config.getServletContext().getContextPath().split("/"); + if (s.length < 2) { + throw new ServletException("Unable to get subsystem from context path"); + } + String subsystem = s[1]; + + path = System.getProperty("catalina.base") + File.separator + + "conf" + File.separator + + subsystem + File.separator + "CS.cfg"; + } + File f = new File(path); String old_path = ""; if (!f.exists()) { |