glenn       2002/10/15 13:33:19

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
                        CatalinaService.java
  Log:
  Add two new package restrictions
  
  Revision  Changes    Path
  1.49      +8 -6      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Catalina.java     23 May 2002 17:22:37 -0000      1.48
  +++ Catalina.java     15 Oct 2002 20:33:19 -0000      1.49
  @@ -484,7 +484,8 @@
               else
                   access = "sun.,";
               Security.setProperty("package.access",
  -                access + "org.apache.catalina.,org.apache.jasper.");
  +                access + 
  +                
"org.apache.catalina.,org.apache.jasper.,org.apache.coyote.,org.apache.util.");
               String definition = Security.getProperty("package.definition");
               if( definition != null && definition.length() > 0 )
                   definition += ",";
  @@ -493,7 +494,8 @@
               Security.setProperty("package.definition",
                   // FIX ME package "javax." was removed to prevent HotSpot
                   // fatal internal errors
  -                definition + "java.,org.apache.catalina.,org.apache.jasper.");
  +                definition + 
  +                
"java.,org.apache.catalina.,org.apache.jasper.,org.apache.coyote.,org.apache.util.");
           }
   
           // Replace System.out and System.err with a custom PrintStream
  
  
  
  1.8       +8 -6      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaService.java
  
  Index: CatalinaService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaService.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CatalinaService.java      9 Jul 2002 10:46:16 -0000       1.7
  +++ CatalinaService.java      15 Oct 2002 20:33:19 -0000      1.8
  @@ -216,7 +216,8 @@
               else
                   access = "sun.,";
               Security.setProperty("package.access",
  -                access + "org.apache.catalina.,org.apache.jasper.");
  +                access +
  +               
"org.apache.catalina.,org.apache.jasper.,org.apache.coyote.,org.apache.util.");
               String definition = Security.getProperty("package.definition");
               if( definition != null && definition.length() > 0 )
                   definition += ",";
  @@ -225,7 +226,8 @@
               Security.setProperty("package.definition",
                   // FIX ME package "javax." was removed to prevent HotSpot
                   // fatal internal errors
  -                definition + "java.,org.apache.catalina.,org.apache.jasper.");
  +                definition +
  +                
"java.,org.apache.catalina.,org.apache.jasper.,org.apache.coyote.,org.apache.util.");
           }
   
           // Start the new server
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to