From ec985a5ec4f5a4f95a2f522428fa176d8b23100d Mon Sep 17 00:00:00 2001
From: jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Fri, 8 Aug 2008 01:35:55 +0000
Subject: Fix for #458337, port separation.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@100 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties | 2 +-
 pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml             | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties b/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
index e956f52e8..5cd0454cc 100644
--- a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
+++ b/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
@@ -5,7 +5,7 @@
 #
 resource.loader = file
 file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = [PKI_INSTANCE_PATH]/webapps/[PKI_SUBSYSTEM_TYPE]
+file.resource.loader.path = [PKI_INSTANCE_PATH]/[PKI_WEBAPPS_NAME]/[PKI_SUBSYSTEM_TYPE]
 file.resource.loader.cache = true
 file.resource.loader.modificationCheckInterval = 2
 input.encoding=UTF-8
diff --git a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
index 823b47c61..c89dc9ff5 100644
--- a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
@@ -131,6 +131,7 @@
              <init-param><param-name>  AuthzMgr    </param-name>
                          <param-value> BasicAclAuthz </param-value> </init-param>
    </servlet>
+
    <servlet>
       <servlet-name>  ocspauths  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.admin.AuthAdminServlet  </servlet-class>
@@ -481,11 +482,13 @@
       <servlet-name>  ocsplog  </servlet-name>
       <url-pattern>   /log  </url-pattern>
    </servlet-mapping>
-                                                                                
+                      
+[PKI_OPEN_SEPARATE_PORTS_COMMENT]                                                          
    <servlet-mapping>
       <servlet-name>  ocspauths  </servlet-name>
       <url-pattern>   /auths  </url-pattern>
    </servlet-mapping>
+[PKI_CLOSE_SEPARATE_PORTS_COMMENT]
                                                                                 
    <servlet-mapping>
       <servlet-name>  ocspstart  </servlet-name>
-- 
cgit