tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java
Date Mon, 21 Mar 2005 15:59:26 GMT
remm        2005/03/21 07:59:26

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappClassLoader.java
  Log:
  - private -> protected (as the class is not final).
  
  Revision  Changes    Path
  1.47      +16 -16    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- WebappClassLoader.java	25 Jan 2005 13:16:32 -0000	1.46
  +++ WebappClassLoader.java	21 Mar 2005 15:59:26 -0000	1.47
  @@ -100,14 +100,14 @@
       implements Reloader, Lifecycle
    {
   
  -    private static org.apache.commons.logging.Log log=
  +    protected static org.apache.commons.logging.Log log=
           org.apache.commons.logging.LogFactory.getLog( WebappClassLoader.class );
   
       protected class PrivilegedFindResource
           implements PrivilegedAction {
   
  -        private File file;
  -        private String path;
  +        protected File file;
  +        protected String path;
   
           PrivilegedFindResource(File file, String path) {
               this.file = file;
  @@ -132,20 +132,20 @@
        * but where the corresponding JAR files are required to run on
        * earlier versions.
        */
  -    private static final String[] triggers = {
  +    protected static final String[] triggers = {
           "javax.servlet.Servlet"                     // Servlet API
       };
   
       /** 
        * Jdk Compatibility Support.
        */
  -    private static JdkCompat jdkCompat = JdkCompat.getJdkCompat();
  +    protected static JdkCompat jdkCompat = JdkCompat.getJdkCompat();
   
       /**
        * Set of package names which are not allowed to be loaded from a webapp
        * class loader without delegating first.
        */
  -    private static final String[] packageTriggers = {
  +    protected static final String[] packageTriggers = {
       };
   
   
  @@ -309,38 +309,38 @@
        * A list of read File and Jndi Permission's required if this loader
        * is for a web application context.
        */
  -    private ArrayList permissionList = new ArrayList();
  +    protected ArrayList permissionList = new ArrayList();
   
   
       /**
        * Path where resources loaded from JARs will be extracted.
        */
  -    private File loaderDir = null;
  +    protected File loaderDir = null;
   
   
       /**
        * The PermissionCollection for each CodeSource for a web
        * application context.
        */
  -    private HashMap loaderPC = new HashMap();
  +    protected HashMap loaderPC = new HashMap();
   
   
       /**
        * Instance of the SecurityManager installed.
        */
  -    private SecurityManager securityManager = null;
  +    protected SecurityManager securityManager = null;
   
   
       /**
        * The parent class loader.
        */
  -    private ClassLoader parent = null;
  +    protected ClassLoader parent = null;
   
   
       /**
        * The system class loader.
        */
  -    private ClassLoader system = null;
  +    protected ClassLoader system = null;
   
   
       /**
  @@ -358,7 +358,7 @@
       /**
        * All permission.
        */
  -    private Permission allPermission = new java.security.AllPermission();
  +    protected Permission allPermission = new java.security.AllPermission();
   
   
       // ------------------------------------------------------------- Properties
  @@ -1650,7 +1650,7 @@
        *
        * @return the loaded resource, or null if the resource isn't found
        */
  -    private ResourceEntry findResourceInternal(File file, String path){
  +    protected ResourceEntry findResourceInternal(File file, String path){
           ResourceEntry entry = new ResourceEntry();
           try {
               entry.source = getURI(new File(file, path));
  @@ -2038,7 +2038,7 @@
        *
        * @exception IOException if an input/output error occurs
        */
  -    private boolean validateJarFile(File jarfile)
  +    protected boolean validateJarFile(File jarfile)
           throws IOException {
   
           if (triggers == null)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message