Author: markt
Date: Tue Jun 14 11:27:38 2011
New Revision: 1135491
URL: http://svn.apache.org/viewvc?rev=1135491&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50854
Allow shared manager app when running under a security manager
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/catalina.policy
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1135491&r1=1135490&r2=1135491&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 11:27:38 2011
@@ -97,12 +97,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50854
- Allow shared manager app when running under a security manager
- https://issues.apache.org/bugzilla/attachment.cgi?id=26758
- +1: markt, kkolinko, rjung
- -1:
-
* Add additional configuration options to the DIGEST authenticator
http://people.apache.org/~markt/patches/2011-04-01-digest-tc6.patch
+1: markt
Modified: tomcat/tc6.0.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.policy?rev=1135491&r1=1135490&r2=1135491&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc6.0.x/trunk/conf/catalina.policy Tue Jun 14 11:27:38 2011
@@ -172,12 +172,21 @@ grant {
// The Manager application needs access to the following packages to support
the
-// session display functionality
+// session display functionality. These settings support the following
+// configurations:
+// - default CATALINA_HOME == CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
+// - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME
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";
};
+grant codeBase "file:${catalina.home}/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";
+};
// You can assign additional permissions to particular web applications by
// adding additional "grant" entries here, based on the code base for that
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1135491&r1=1135490&r2=1135491&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 14 11:27:38 2011
@@ -211,6 +211,11 @@
Clarify error messages in *.sh files to mention that if a script is
not found it might be because execute permission is needed. (kkolinko)
</update>
+ <fix>
+ <bug>50854</bug>: Add additional entries to the default catalina.policy
+ file to support running the manager web application from CATALINA_HOME
+ or CATALINA_BASE. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
