Mercurial > jdk8-mips64-public > nashorn / file diff

     1.1 --- a/make/build.xml	Wed Jul 03 14:08:00 2013 +0530
     1.2 +++ b/make/build.xml	Wed Jul 03 12:39:28 2013 +0200
     1.3 @@ -235,44 +235,31 @@
     1.4    </target>
     1.5  
     1.6    <target name="generate-policy-file" depends="prepare">
     1.7 -    <!-- Generating nashorn.policy file -->
     1.8 +    <echo file="${build.dir}/nashorn.policy">
     1.9  
    1.10 -    <!-- nashorn internal tests jar requires AllPermission -->
    1.11 -    <echo message="grant codeBase &quot;file:/${basedir}/${nashorn.internal.tests.jar}&quot; {" file="${build.dir}/nashorn.policy"/>
    1.12 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.13 -    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.14 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.15 -    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.16 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.17 +grant codeBase "file:/${basedir}/${nashorn.internal.tests.jar}" {
    1.18 +    permission java.security.AllPermission;
    1.19 +};
    1.20  
    1.21 -    <!-- TestNG framework jar needs AllPermission -->
    1.22 -    <echo message="grant codeBase &quot;file:/${basedir}/${file.reference.testng.jar}&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.23 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.24 -    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.25 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.26 -    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.27 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.28 +grant codeBase "file:/${basedir}/${file.reference.testng.jar}" {
    1.29 +    permission java.security.AllPermission;
    1.30 +};
    1.31  
    1.32 -    <!-- AllPermission to test/script/trusted tests -->
    1.33 -    <echo message="grant codeBase &quot;file:/${basedir}/test/script/trusted/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.34 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.35 -    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
    1.36 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.37 -    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.38 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.39 +grant codeBase "file:/${basedir}/test/script/trusted/*" {
    1.40 +    permission java.security.AllPermission;
    1.41 +};
    1.42  
    1.43 -    <echo message="grant codeBase &quot;file:/${basedir}/test/script/basic/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.44 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.45 -    <!-- test/script/basic .js scripts load other script tests -->
    1.46 -    <echo message="    permission java.io.FilePermission &quot;${basedir}/test/script/-&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
    1.47 -    <echo message="    permission java.io.FilePermission &quot;user.dir&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
    1.48 -    <echo message="    permission java.util.PropertyPermission &quot;user.dir&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
    1.49 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.50 -    <!-- test/script/basic .js scripts can read nashorn.test.* properties -->
    1.51 -    <echo message="    permission java.util.PropertyPermission &quot;nashorn.test.*&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
    1.52 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.53 -    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.54 -    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.55 +grant codeBase "file:/${basedir}/test/script/basic/*" {
    1.56 +    permission java.io.FilePermission "${basedir}/test/script/-", "read";
    1.57 +    permission java.io.FilePermission "$${user.dir}", "read";
    1.58 +    permission java.util.PropertyPermission "user.dir", "read";
    1.59 +    permission java.util.PropertyPermission "nashorn.test.*", "read";
    1.60 +};
    1.61 +
    1.62 +grant codeBase "file:/${basedir}/test/script/basic/JDK-8010946-privileged.js" {
    1.63 +    permission java.util.PropertyPermission "java.security.policy", "read";
    1.64 +};
    1.65 +    </echo>
    1.66  
    1.67      <replace file="${build.dir}/nashorn.policy"><replacetoken>\</replacetoken><replacevalue>/</replacevalue></replace>    <!--hack for Windows - to make URLs with normal path separators -->
    1.68      <replace file="${build.dir}/nashorn.policy"><replacetoken>//</replacetoken><replacevalue>/</replacevalue></replace>   <!--hack for Unix - to avoid leading // in URLs -->