Author: johnemb
Date: Mon May  5 02:57:36 2008
New Revision: 653396

URL: http://svn.apache.org/viewvc?rev=653396&view=rev
Log:
DERBY-3657: Removed outdated comment regarding JMX in default and template security policy files.
Also added a commented out permission to template policy for allowing the ping operation of
NetworkServerMBean.

john DOT embretsen AT sun DOT com

Modified:
    db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy
    db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy

Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy?rev=653396&r1=653395&r2=653396&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy (original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/server.policy Mon May  5 02:57:36 2008
@@ -40,7 +40,6 @@
 //
 // Permissions needed for JMX based management and monitoring, which is only
 // available for JVMs supporting "platform management", that is J2SE 5.0 or better.
-// JMX management of Derby is NOT enabled by default; see also DERBY-1387.
 //
 // Allows this code to create an MBeanServer:
 //

Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy?rev=653396&r1=653395&r2=653396&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy (original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/drda/template.policy Mon May  5 02:57:36 2008
@@ -38,7 +38,6 @@
 //
 // Permissions needed for JMX based management and monitoring, which is only
 // available for JVMs supporting "platform management", that is J2SE 5.0 or better.
-// JMX management of Derby is NOT enabled by default; see also DERBY-1387.
 //
 // Allows this code to create an MBeanServer:
 //
@@ -81,6 +80,12 @@
   permission java.io.FilePermission "${derby.drda.traceDirectory}${/}-", "read,write,delete";
 
 //
+// 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
 // check the existence of jars on the classpath. You can
 // limit this permission to just the locations which hold