Author: rhillegas
Date: Wed Feb  7 11:39:25 2007
New Revision: 504661

URL: http://svn.apache.org/viewvc?view=rev&rev=504661
Log:
DERBY-2196: Commit derby-2196-01-print-03.diff, introducing a template Basic policy file for the network server and exposing it in the release in demo/templates.

Added:
    db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy   (with props)
Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml
    db/derby/code/trunk/tools/release/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?view=diff&rev=504661&r1=504660&r2=504661
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Feb  7 11:39:25 2007
@@ -1262,7 +1262,8 @@
       <fileset dir="${out.dir}"
                includes="org/apache/derby/loc/drda/**,
                          org/apache/derby/loc/sysinfoMessages.properties,
-                         org/apache/derby/info/net.properties"/>
+                         org/apache/derby/info/net.properties,
+                         org/apache/derby/drda/server.policy"/>
       <fileset dir="${derby.jar.dir}/lists"
                includes="META-INF/**"/>
     </jar>

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml?view=diff&rev=504661&r1=504660&r2=504661
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml Wed Feb  7 11:39:25 2007
@@ -33,7 +33,14 @@
   <property file="${properties.dir}/compilepath.properties"/>
 
 <!-- Targets -->
-  <target name="drda" depends="compile,servlet"/>
+  <target name="drda" depends="compile,servlet,copyfiles"/>
+
+  <target name="copyfiles">
+    <copy
+       todir="${out.dir}/${derby.dir}/drda/"
+       file="${derby.drda.dir}/drda/server.policy"
+    />
+  </target>
 
   <target name="compile">
     <javac

Added: db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy?view=auto&rev=504661
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy (added)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy Wed Feb  7 11:39:25 2007
@@ -0,0 +1,30 @@
+grant codeBase "${derby.derby.jar}"
+{
+//
+// These permissions are needed for everyday, embedded Derby usage.
+//
+  permission java.lang.RuntimePermission "createClassLoader";
+  permission java.util.PropertyPermission "derby.*", "read";
+  permission java.io.FilePermission "${derby.system.home}","read";
+  permission java.io.FilePermission "${derby.system.home}${/}-", "read,write,delete";
+
+//
+// This permission lets you backup and restore databases
+// to and from arbitrary locations in your file system.
+//
+// This permission also lets you import/export data to and from
+// arbitrary locations in your file system.
+//
+// You may want to restrict this access to specific directories.
+//
+  permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
+};
+
+grant codeBase "${derby.derbynet.jar}"
+{
+//
+// This permission lets the Network Server manage connections from clients.
+//
+  permission java.net.SocketPermission "${derby.drda.host}:*", "accept"; 
+};
+

Propchange: db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/build.xml?view=diff&rev=504661&r1=504660&r2=504661
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Wed Feb  7 11:39:25 2007
@@ -94,6 +94,8 @@
                   fullpath="${derby.bin}/demo/programs/toursdb/build.xml"/>
       <zipfileset file="${derby.demo.src.dir}/toursdb/toursdb_readme.html"
                   fullpath="${derby.bin}/demo/programs/toursdb/toursdb_readme.html"/>
+      <zipfileset file="${derby.drda.dir}/drda/server.policy"
+                  fullpath="${derby.bin}/demo/templates/server.policy"/>
       <zipfileset dir="${basedir}/classes" includes="SimpleApp.class"
                   prefix="${derby.bin}/demo/programs/simple"/>
       <zipfileset dir="${basedir}/classes" includes="SimpleNetwork*.class"
@@ -144,6 +146,8 @@
                   fullpath="${derby.bin}/demo/programs/toursdb/build.xml"/>
       <tarfileset file="${derby.demo.src.dir}/toursdb/toursdb_readme.html"
                   fullpath="${derby.bin}/demo/programs/toursdb/toursdb_readme.html"/>
+      <tarfileset file="${derby.drda.dir}/drda/server.policy"
+                  fullpath="${derby.bin}/demo/templates/server.policy"/>
       <tarfileset dir="${basedir}/classes" includes="SimpleApp.class"
                   prefix="${derby.bin}/demo/programs/simple"/>
       <tarfileset dir="${basedir}/classes" includes="SimpleNetwork*.class"