cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources DirContextURLConnection.java

[glenn]

glenn       01/06/22 13:18:24

  Modified:    catalina/src/share/org/apache/naming/resources
                        DirContextURLConnection.java
  Log:
  Add support for JndiPermission
  
  Revision  Changes    Path
  1.12      +8 -7      
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java
  
  Index: DirContextURLConnection.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DirContextURLConnection.java      2001/06/03 19:52:00     1.11
  +++ DirContextURLConnection.java      2001/06/22 20:18:24     1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v
 1.11 2001/06/03 19:52:00 remm Exp $
  - * $Revision: 1.11 $
  - * $Date: 2001/06/03 19:52:00 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v
 1.12 2001/06/22 20:18:24 glenn Exp $
  + * $Revision: 1.12 $
  + * $Date: 2001/06/22 20:18:24 $
    *
    * ====================================================================
    *
  @@ -68,7 +68,6 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.FileNotFoundException;
  -import java.io.FilePermission;
   import java.security.Permission;
   import java.util.Date;
   import java.util.Enumeration;
  @@ -79,6 +78,7 @@
   import javax.naming.directory.DirContext;
   import javax.naming.directory.Attribute;
   import javax.naming.directory.Attributes;
  +import org.apache.naming.JndiPermission;
   import org.apache.naming.resources.Resource;
   import org.apache.naming.resources.ResourceAttributes;
   
  @@ -91,7 +91,7 @@
    * content is directly returned.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public class DirContextURLConnection 
       extends URLConnection {
  @@ -105,8 +105,9 @@
           if (context == null)
               throw new IllegalArgumentException
                   ("Directory context can't be null");
  -        if (System.getSecurityManager() != null)
  -            this.permission = new FilePermission(url.toString(), "read");
  +        if (System.getSecurityManager() != null) {
  +            this.permission = new JndiPermission(url.toString());
  +     }
           this.context = context;
       }