svn commit: r1483503 - in /db/derby/docs/branches/10.10/src/adminguide: tadminnetservbasic.dita tadminnetservcustom.dita

[ch...@apache.org]

Author: chaase3
Date: Thu May 16 18:46:08 2013
New Revision: 1483503

URL: http://svn.apache.org/r1483503
Log:
DERBY-6160  Fixes needed to documentation topics on security policy permissions 

Merged patch DERBY-6160-5.diff to 10.10 doc branch from trunk revision 1483488.

Modified:
    db/derby/docs/branches/10.10/src/adminguide/tadminnetservbasic.dita
    db/derby/docs/branches/10.10/src/adminguide/tadminnetservcustom.dita

Modified: db/derby/docs/branches/10.10/src/adminguide/tadminnetservbasic.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/tadminnetservbasic.dita?rev=1483503&r1=1483502&r2=1483503&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/tadminnetservbasic.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/tadminnetservbasic.dita Thu May 16 18:46:08 2013
@@ -69,6 +69,7 @@ grant codeBase "${derby.install.url}derb
 
   // The next two properties are used to determine if the VM is 32 or 64
   // bit.
+  //
   permission java.util.PropertyPermission "sun.arch.data.model", "read";
   permission java.util.PropertyPermission "os.arch", "read";
 
@@ -93,9 +94,7 @@ grant codeBase "${derby.install.url}derb
   permission java.io.FilePermission "<<ALL FILES>>",
       "read,write,delete";
 
-  // Permissions needed for JMX based management and monitoring, which is
-  // only available for JVMs supporting "platform management", that is
-  // Java SE 5.0 or better.
+  // Permissions needed for JMX based management and monitoring.
   //
   // Allows this code to create an MBeanServer:
   //
@@ -120,6 +119,7 @@ grant codeBase "${derby.install.url}derb
 
   // getProtectionDomain is an optional permission needed for printing
   // classpath information to derby.log
+  //
   permission java.lang.RuntimePermission "getProtectionDomain";
 
   // The following permission must be granted for
@@ -129,6 +129,7 @@ grant codeBase "${derby.install.url}derb
   permission java.sql.SQLPermission "callAbort";
 
   // Needed by file permissions restriction system:
+  //
   permission java.lang.RuntimePermission "accessUserInformation";
   permission java.lang.RuntimePermission "getFileStoreAttributes";
 };
@@ -145,6 +146,7 @@ grant codeBase "${derby.install.url}derb
   // or via the property derby.drda.host; the default is localhost.
   // You may want to restrict allowed hosts, e.g. to hosts in a specific
   // subdomain, e.g. "*.example.com".
+  //
   permission java.net.SocketPermission "*", "accept"; 
 
   // Needed for server tracing.
@@ -161,6 +163,7 @@ grant codeBase "${derby.install.url}derb
 
   // JMX: Uncomment this permission to allow the ping operation of the 
   //      NetworkServerMBean to connect to the Network Server.
+  //
   //permission java.net.SocketPermission "*", "connect,resolve";
 
   // Needed by sysinfo. The file permission is needed to

Modified: db/derby/docs/branches/10.10/src/adminguide/tadminnetservcustom.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/adminguide/tadminnetservcustom.dita?rev=1483503&r1=1483502&r2=1483503&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/adminguide/tadminnetservcustom.dita (original)
+++ db/derby/docs/branches/10.10/src/adminguide/tadminnetservcustom.dita Thu May 16 18:46:08 2013
@@ -162,6 +162,7 @@ grant codeBase "file:/usr/local/share/sw
   // documentation for derby.storage.useDefaultFilePermissions in the
   // Reference Manual). Consider restricting the database file-level
   // permissions for security.
+  //
   permission java.lang.RuntimePermission "accessUserInformation";
   permission java.lang.RuntimePermission "getFileStoreAttributes";
 };