summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2008-08-08 01:37:42 +0000
committerjmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2008-08-08 01:37:42 +0000
commit87f3c9efcf27675994ff9bf4322167b320f26733 (patch)
treee7d81d96b3329fb010bf31f03a1d4f03aea0d6a8
parentc128fff4f2356100195f70638269f0eeea2d9742 (diff)
Fix for #458337, port separation.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@102 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties2
-rw-r--r--pki/base/kra/shared/webapps/kra/WEB-INF/web.xml3
2 files changed, 3 insertions, 2 deletions
diff --git a/pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties b/pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties
index 0f4b375f3..2dfae4bca 100644
--- a/pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties
+++ b/pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties
@@ -1,6 +1,6 @@
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/kra/shared/webapps/kra/WEB-INF/web.xml b/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
index 924ce6aae..4c6dbf844 100644
--- a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -848,11 +848,12 @@
<url-pattern> /acl </url-pattern>
</servlet-mapping>
-
+[PKI_OPEN_SEPARATE_PORTS_COMMENT]
<servlet-mapping>
<servlet-name> kraauths </servlet-name>
<url-pattern> /auths </url-pattern>
</servlet-mapping>
+[PKI_CLOSE_SEPARATE_PORTS_COMMENT]
<servlet-mapping>
<servlet-name> krajobsScheduler </servlet-name>