Author: kkolinko
Date: Sat Mar 23 20:17:29 2013
New Revision: 1460221

URL: http://svn.apache.org/r1460221
Log:
Merged revision 1460115 from tomcat/trunk:
Remove read permissions for UserDataHelper properties from "tomcat-juli.jar" 
section of catalina.policy.
The class using them was moved in r1242371 and is now in tomcat-coyote.jar.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/conf/catalina.policy
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1460115

Modified: tomcat/tc7.0.x/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.policy?rev=1460221&r1=1460220&r2=1460221&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.policy Sat Mar 23 20:17:29 2013
@@ -85,10 +85,6 @@ grant codeBase "file:${catalina.home}/bi
         permission java.util.PropertyPermission 
"java.util.logging.config.class", "read";
         permission java.util.PropertyPermission 
"java.util.logging.config.file", "read";
         permission java.util.PropertyPermission "catalina.base", "read";
-        permission java.util.PropertyPermission
-         "org.apache.juli.logging.UserDataHelper.CONFIG", "read";
-        permission java.util.PropertyPermission
-         "org.apache.juli.logging.UserDataHelper.SUPPRESSION_TIME", "read";
 
         // Note: To enable per context logging configuration, permit read 
access to
         // the appropriate file. Be sure that the logging configuration is

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1460221&r1=1460220&r2=1460221&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Mar 23 20:17:29 2013
@@ -77,6 +77,11 @@
         Convert remaining unit tests to JUnit 4 and enable Checkstyle rule
         that forbids use of methods from JUnit 3. (markt/kkolinko)
       </update>
+      <fix>
+        Remove unneeded permissions for reading UserDataHelper properties
+        from <code>catalina.policy</code> file. The class that needed those
+        was moved in 7.0.26. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to