Fix for #458337, port separation.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@98 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

2 files changed, 4 insertions, 2 deletions

diff --git a/pki/base/tks/shared/webapps/tks/WEB-INF/velocity.properties b/pki/base/tks/shared/webapps/tks/WEB-INF/velocity.properties
index e956f52e8..5cd0454cc 100644
--- a/pki/base/tks/shared/webapps/tks/WEB-INF/velocity.properties
+++ b/pki/base/tks/shared/webapps/tks/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/tks/shared/webapps/tks/WEB-INF/web.xml b/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
index cc12a6e80..92dc6a879 100644
--- a/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
+++ b/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
@@ -330,11 +330,13 @@
       <servlet-name>  tksregistry  </servlet-name>
       <url-pattern>   /registry  </url-pattern>
    </servlet-mapping>
-                                                                                
+                      
+[PKI_OPEN_SEPARATE_PORTS_COMMENT]                                                          
    <servlet-mapping>
       <servlet-name>  tksauths  </servlet-name>
       <url-pattern>   /auths  </url-pattern>
    </servlet-mapping>
+[PKI_CLOSE_SEPARATE_PORTS_COMMENT]
                                                                                 
    <servlet-mapping>
       <servlet-name>  tksjobsScheduler  </servlet-name>