From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 17 Jun 2010 16:04:28 +0000 (+0000)
Subject: Strictly speaking, the webapps are in ${catalina.base}, not .home,
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a5cd3bbd36128b89d7460b4e1c4f77e4fc5cec69;p=tomcat7.0

Strictly speaking, the webapps are in ${catalina.base}, not .home,
as well as it is shown by examples below those lines in the policy file.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@955655 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/conf/catalina.policy b/conf/catalina.policy
index d65e13f6e..511e8645c 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -188,7 +188,7 @@ grant {
 
 // The Manager application needs access to the following packages to support the
 // session display functionality
-grant codeBase "file:${catalina.home}/webapps/manager/-" {
+grant codeBase "file:${catalina.base}/webapps/manager/-" {
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina";
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager";
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util";
diff --git a/webapps/docs/security-manager-howto.xml b/webapps/docs/security-manager-howto.xml
index c8f71307e..c60086165 100644
--- a/webapps/docs/security-manager-howto.xml
+++ b/webapps/docs/security-manager-howto.xml
@@ -354,7 +354,7 @@ grant {
 
 // The Manager application needs access to the following packages to support the
 // session display functionality
-grant codeBase "file:${catalina.home}/webapps/manager/-" {
+grant codeBase "file:${catalina.base}/webapps/manager/-" {
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina";
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager";
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util";