From 2a0ee4780561c4f9da42ddab6640da144339594d Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Tue, 5 Feb 2013 21:50:19 -0500
Subject: 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.
---
 base/ca/shared/webapps/ca/WEB-INF/web.xml                    |  2 --
 .../src/com/netscape/cms/servlet/base/CMSStartServlet.java   | 12 ++++++++++++
 base/kra/shared/webapps/kra/WEB-INF/web.xml                  |  2 --
 base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml                |  2 --
 base/tks/shared/webapps/tks/WEB-INF/web.xml                  |  2 --
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/base/ca/shared/webapps/ca/WEB-INF/web.xml b/base/ca/shared/webapps/ca/WEB-INF/web.xml
index 286d1e33f..582a717a2 100644
--- a/base/ca/shared/webapps/ca/WEB-INF/web.xml
+++ b/base/ca/shared/webapps/ca/WEB-INF/web.xml
@@ -332,8 +332,6 @@
       <servlet-class> com.netscape.cms.servlet.base.CMSStartServlet  </servlet-class>
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  cfgPath     </param-name>
-                         <param-value> [PKI_INSTANCE_PATH]/conf/[PKI_SUBSYSTEM_DIR]CS.cfg </param-value> </init-param>
              <init-param><param-name>  ID          </param-name>
                          <param-value> castart     </param-value> </init-param>
       <load-on-startup>  1  </load-on-startup>
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()) {
diff --git a/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
index ca7d6ea4d..207206381 100644
--- a/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -576,8 +576,6 @@
       <servlet-class> com.netscape.cms.servlet.base.CMSStartServlet  </servlet-class>
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  cfgPath     </param-name>
-                         <param-value> [PKI_INSTANCE_PATH]/conf/[PKI_SUBSYSTEM_DIR]CS.cfg  </param-value> </init-param>
              <init-param><param-name>  ID          </param-name>
                          <param-value> krastart    </param-value> </init-param>
       <load-on-startup>  1  </load-on-startup>
diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
index 1deadc9dc..a722123bb 100644
--- a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
@@ -96,8 +96,6 @@
       <servlet-class> com.netscape.cms.servlet.base.CMSStartServlet  </servlet-class>
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  cfgPath     </param-name>
-                         <param-value> [PKI_INSTANCE_PATH]/conf/[PKI_SUBSYSTEM_DIR]CS.cfg </param-value> </init-param>
              <init-param><param-name>  ID          </param-name>
                          <param-value> ocspstart   </param-value> </init-param>
       <load-on-startup>  1  </load-on-startup>
diff --git a/base/tks/shared/webapps/tks/WEB-INF/web.xml b/base/tks/shared/webapps/tks/WEB-INF/web.xml
index b1958c033..44884c16d 100644
--- a/base/tks/shared/webapps/tks/WEB-INF/web.xml
+++ b/base/tks/shared/webapps/tks/WEB-INF/web.xml
@@ -40,8 +40,6 @@
       <servlet-class> com.netscape.cms.servlet.base.CMSStartServlet  </servlet-class>
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  cfgPath     </param-name>
-                         <param-value> [PKI_INSTANCE_PATH]/conf/[PKI_SUBSYSTEM_DIR]CS.cfg </param-value> </init-param>
              <init-param><param-name>  ID          </param-name>
                          <param-value> tksstart    </param-value> </init-param>
       <load-on-startup>  1  </load-on-startup>
-- 
cgit