Index: gnu/java/security/PolicyFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/PolicyFile.java,v
retrieving revision 1.6
diff -u -B -b -r1.6 PolicyFile.java
--- gnu/java/security/PolicyFile.java	12 Aug 2005 16:11:31 -0000	1.6
+++ gnu/java/security/PolicyFile.java	15 Aug 2005 03:32:49 -0000
@@ -154,7 +154,7 @@
     SystemProperties.getProperty("java.home")
     + SystemProperties.getProperty("file.separator") + "lib"
     + SystemProperties.getProperty("file.separator") + "security"
-    + SystemProperties.getProperty("file.separator") + "java.policy";
+    + SystemProperties.getProperty("file.separator") + "classpath.policy";
   private static final String DEFAULT_USER_POLICY =
     SystemProperties.getProperty ("user.home") +
     SystemProperties.getProperty ("file.separator") + ".java.policy";
Index: java/security/Policy.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/Policy.java,v
retrieving revision 1.13
diff -u -B -b -r1.13 Policy.java
--- java/security/Policy.java	2 Jul 2005 20:32:40 -0000	1.13
+++ java/security/Policy.java	15 Aug 2005 03:32:49 -0000
@@ -197,7 +197,7 @@
 	    }
 
         if (currentPolicy == null)
-          currentPolicy = new gnu.java.security.provider.DefaultPolicy();
+          currentPolicy = new gnu.java.security.PolicyFile();
       }
     return currentPolicy;
   }
Index: resource/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/resource/Makefile.am,v
retrieving revision 1.6
diff -u -B -b -r1.6 Makefile.am
--- resource/Makefile.am	8 Jan 2005 10:02:02 -0000	1.6
+++ resource/Makefile.am	15 Aug 2005 03:32:49 -0000
@@ -4,5 +4,6 @@
 		orp-1.0.8.patch \
 		orp-1.0.9.patch
 
-security_DATA = java/security/classpath.security
+security_DATA = java/security/classpath.security \
+	java/security/classpath.policy
 securitydir = $(libdir)/security