Re: [Fwd: svn commit: r378514 - /incubator/harmony/enhanced/classlib/trunk/make/build-java.xml]

[Stepan Mishura]

Geir,

As far as you deleted drl.policy minor adjustments should be made for java.security file and ant script files. (I don't know whether you keep this in mind or not, so please take this as friend reminder. Also I attached  a patch file to fix some places I've noticed)
 

Thanks,
Stepan Mishura
Intel Middleware Products Division

 

On 2/17/06, Tim Ellison <[EMAIL PROTECTED]> wrote:

> (I need to go back and make sure the content from
> modules/security drl.policy that I removed is represented
> in depends/files )

yeah it is, I did that already.

Regards,
Tim



-------- Original Message --------
Subject: svn commit: r378514 -
/incubator/harmony/enhanced/classlib/trunk/make/build- java.xml
Date: Fri, 17 Feb 2006 14:02:31 -0000
From: [EMAIL PROTECTED]
Reply-To: harmony-dev@incubator.apache.org
To: [EMAIL PROTECTED]

Author: geirm
Date: Fri Feb 17 06:02:29 2006
New Revision: 378514

URL: http://svn.apache.org/viewcvs?rev=378514&view=rev
Log:
restore taking java.policy from depends/files since it spans the
whole classlib

(I need to go back and make sure the content from modules/security
drl.policy
that I removed is represented in depends/files )


Modified:
   incubator/harmony/enhanced/classlib/trunk/make/build-java.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build- java.xml
URL:
http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=378514&r1=378513&r2=378514&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build- java.xml Fri
Feb 17 06:02:29 2006
@@ -265,7 +265,12 @@
            </fileset>
        </copy>

-
+        <copy todir="${target.output}/jre/lib/security" overwrite="yes">
+             <fileset dir="${depends.files}">
+                 <include name="java.policy" />
+             </fileset>
+         </copy>
+
        <copy todir="${ target.output}/jre/lib/security" overwrite="yes">
            <fileset dir="../modules/security/src/java.home/lib/security/">
                <include name="drl.policy" />




--

Tim Ellison ([EMAIL PROTECTED])
IBM Java technology centre, UK.

Index: 
C:/projects/Apache/Harmony/modules/security/src/java.home/lib/security/java.security
===================================================================
--- 
C:/projects/Apache/Harmony/modules/security/src/java.home/lib/security/java.security
        (revision 379019)
+++ 
C:/projects/Apache/Harmony/modules/security/src/java.home/lib/security/java.security
        (working copy)
@@ -36,8 +36,8 @@
 # and an optional policy file in the user's home directory.
 # It is possible to specify any number of policy files, via policy.url.n keys.
 # See also: "JavaTM 2 Platform Security Architecture.", chapter 3. Permissions 
and Security Policy
-policy.url.1=file:/${java.home}/lib/security/drl.policy
-policy.url.2=file:/${user.home}/.drl.policy
+policy.url.1=file:/${java.home}/lib/security/java.policy
+policy.url.2=file:/${user.home}/.java.policy
 
 
 # Flag to enable/disable properties expansion (${...}) in policy files. 
Index: C:/projects/Apache/Harmony/modules/security/make/build.xml
===================================================================
--- C:/projects/Apache/Harmony/modules/security/make/build.xml  (revision 
379019)
+++ C:/projects/Apache/Harmony/modules/security/make/build.xml  (working copy)
@@ -503,8 +503,6 @@
             
             <jvmarg 
value="-Xbootclasspath/a:${build.path}/tests${path.separator}${env.CLASSPATH}"/>
 
-               <jvmarg 
value="-Djava.security.properties==${build.lib.path}/security/java.security"/>
-            <jvmarg 
value="-Djava.security.policy==${build.lib.path}/security/drl.policy"/>
                <jvmarg value="-DTEST_SRC_DIR=${src.tst.common}/unit"/>
 
             <formatter type="xml" />
Index: C:/projects/Apache/Harmony/make/build-java.xml
===================================================================
--- C:/projects/Apache/Harmony/make/build-java.xml      (revision 379019)
+++ C:/projects/Apache/Harmony/make/build-java.xml      (working copy)
@@ -273,7 +273,6 @@
        
         <copy todir="${target.output}/jre/lib/security" overwrite="yes">
             <fileset dir="../modules/security/src/java.home/lib/security/">
-                <include name="drl.policy" />
                 <include name="java.security" />
             </fileset>
         </copy>