You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2001/02/04 01:51:57 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java

glenn       01/02/03 16:51:57

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  Implement SecurityManager
  
  Revision  Changes    Path
  1.15      +7 -5      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Catalina.java	2001/01/29 01:02:52	1.14
  +++ Catalina.java	2001/02/04 00:51:57	1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.14 2001/01/29 01:02:52 jon Exp $
  - * $Revision: 1.14 $
  - * $Date: 2001/01/29 01:02:52 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.15 2001/02/04 00:51:57 glenn Exp $
  + * $Revision: 1.15 $
  + * $Date: 2001/02/04 00:51:57 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.14 $ $Date: 2001/01/29 01:02:52 $
  + * @version $Revision: 1.15 $ $Date: 2001/02/04 00:51:57 $
    */
   
   public class Catalina {
  @@ -659,7 +659,9 @@
   	    else
   		definition = "sun.,";
   	    Security.setProperty("package.definition",
  -		"java.,javax.,org.apache.catalina.,org.apache.jasper.");
  +		// FIX ME package "javax." was removed to prevent HotSpot
  +		// fatal internal errors
  +		definition + "java.,org.apache.catalina.,org.apache.jasper.");
   	}
   
   	// Start the new server