svn commit: r1846022 - in /db/derby/code/trunk: java/org.apache.derby.engine/org/apache/derby/security/securityPolicies.xml java/org.apache.derby.server/org/apache/derby/drda/template.policy tools/release/build.xml

[rh...@apache.org]

Author: rhillegas
Date: Wed Nov  7 14:07:07 2018
New Revision: 1846022

URL: http://svn.apache.org/viewvc?rev=1846022&view=rev
Log:
DERBY-3547: Replace source template.policy with four, more specific template policies; commit derby-3547-03-aa-removeTemplatePolicy.diff.

Removed:
    db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/template.policy
Modified:
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/securityPolicies.xml
    db/derby/code/trunk/tools/release/build.xml

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/securityPolicies.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/securityPolicies.xml?rev=1846022&r1=1846021&r2=1846022&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/securityPolicies.xml (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/securityPolicies.xml Wed Nov  7 14:07:07 2018
@@ -328,6 +328,19 @@ API, or with the property derby.drda.por
 
   </policy>
 
+  <!-- template server policy -->
+
+  <policy>
+    <name>serverTemplate</name>
+    <include>basicServer</include>
+    <include>optionalEngine</include>
+    <output>
+      <file>generated/java/org.apache.derby.engine/org/apache/derby/security/serverTemplate.policy</file>
+      <properties>securityProduct.properties</properties>
+    </output>
+
+  </policy>
+
   <!-- org.apache.derby.client -->
 
   <policy>
@@ -1805,8 +1818,7 @@ abort physical connections.</comment>
 
   <policy>
     <name>basicServerDoc</name>
-    <include>basicServer</include>
-    <include>optionalEngine</include>
+    <include>serverTemplate</include>
     <output>
       <file>generated/java/org.apache.derby.engine/org/apache/derby/security/rsecbasicserver.dita</file>
       <properties>securityProduct.properties</properties>

Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/build.xml?rev=1846022&r1=1846021&r2=1846022&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Wed Nov  7 14:07:07 2018
@@ -196,8 +196,14 @@
                   fullpath="${derby.bin}/demo/programs/toursdb/toursdb_readme.html"/>
       <zipfileset file="${derby.demo.src.dir}/scores/build.xml"
                   fullpath="${derby.bin}/demo/programs/scores/build.xml"/>
-      <zipfileset file="${derby.drda.dir}/drda/template.policy"
-                  fullpath="${derby.bin}/demo/templates/server.policy"/>
+      <zipfileset file="${generated.src.engine.dir}/${derby.dir}/security/clientTemplate.policy"
+                  fullpath="${derby.bin}/demo/templates/clientTemplate.policy"/>
+      <zipfileset file="${generated.src.engine.dir}/${derby.dir}/security/engineTemplate.policy"
+                  fullpath="${derby.bin}/demo/templates/engineTemplate.policy"/>
+      <zipfileset file="${generated.src.engine.dir}/${derby.dir}/security/serverTemplate.policy"
+                  fullpath="${derby.bin}/demo/templates/serverTemplate.policy"/>
+      <zipfileset file="${generated.src.engine.dir}/${derby.dir}/security/toolsTemplate.policy"
+                  fullpath="${derby.bin}/demo/templates/toolsTemplate.policy"/>
       <zipfileset dir="${basedir}/classes" includes="SimpleApp.class"
                   prefix="${derby.bin}/demo/programs/simple"/>
       <zipfileset dir="${basedir}/classes" includes="SimpleNetwork*.class"
@@ -251,8 +257,14 @@
                   fullpath="${derby.bin}/demo/programs/toursdb/toursdb_readme.html"/>
       <tarfileset file="${derby.demo.src.dir}/scores/build.xml"
                   fullpath="${derby.bin}/demo/programs/scores/build.xml"/>
-      <tarfileset file="${derby.drda.dir}/drda/template.policy"
-                  fullpath="${derby.bin}/demo/templates/server.policy"/>
+      <tarfileset file="${generated.src.engine.dir}/${derby.dir}/security/clientTemplate.policy"
+                  fullpath="${derby.bin}/demo/templates/clientTemplate.policy"/>
+      <tarfileset file="${generated.src.engine.dir}/${derby.dir}/security/engineTemplate.policy"
+                  fullpath="${derby.bin}/demo/templates/engineTemplate.policy"/>
+      <tarfileset file="${generated.src.engine.dir}/${derby.dir}/security/serverTemplate.policy"
+                  fullpath="${derby.bin}/demo/templates/serverTemplate.policy"/>
+      <tarfileset file="${generated.src.engine.dir}/${derby.dir}/security/toolsTemplate.policy"
+                  fullpath="${derby.bin}/demo/templates/toolsTemplate.policy"/>
       <tarfileset dir="${basedir}/classes" includes="SimpleApp.class"
                   prefix="${derby.bin}/demo/programs/simple"/>
       <tarfileset dir="${basedir}/classes" includes="SimpleMobileApp.class"