cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup Main.java

[costin]

costin      01/03/03 19:36:52

  Modified:    src/share/org/apache/tomcat/startup Main.java
  Log:
  The new lib structure - change the Main for that.
  
  Also: classes/ are no longer included ( the build is generating the right
  jars, having the expanded classes may affect the testing in build
  versus dist )
  
  Revision  Changes    Path
  1.27      +7 -7      jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Main.java 2001/02/26 09:42:30     1.26
  +++ Main.java 2001/03/04 03:36:52     1.27
  @@ -1,4 +1,4 @@
  -/* $Id: Main.java,v 1.26 2001/02/26 09:42:30 nacho Exp $
  +/* $Id: Main.java,v 1.27 2001/03/04 03:36:52 costin Exp $
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
  @@ -102,7 +102,7 @@
        @author Costin Manolache
        @author Ignacio J. Ortega
        @author Mel Martinez [EMAIL PROTECTED]
  -     @version $Revision: 1.26 $ $Date: 2001/02/26 09:42:30 $
  +     @version $Revision: 1.27 $ $Date: 2001/03/04 03:36:52 $
    */
   public class Main {
   
  @@ -227,9 +227,9 @@
               return libBase;
           }
           if( homeDir!=null ){
  -            libBase=checkDir( homeDir + "/lib");
  +            libBase=checkDir( homeDir + "/lib/container");
           }else{
  -            libBase=checkDir("./lib");
  +            libBase=checkDir("./lib/container");
           }
           return libBase;
       }
  @@ -239,9 +239,9 @@
               return serverBase;
           }
           if( homeDir!=null ){
  -            serverBase=checkDir( homeDir + "/lib/shared");
  +            serverBase=checkDir( homeDir + "/lib/apps");
           }else{
  -            serverBase=checkDir("./lib/shared");
  +            serverBase=checkDir("./lib/apps");
           }
           return serverBase;
       }
  @@ -271,7 +271,7 @@
               // the server classloader loads from classes dir too and from tools.jar
   
               Vector serverJars=new Vector();
  -            serverJars.addElement( getURL(  getServerDir() ,"../classes/" ));
  +            //serverJars.addElement( getURL(  getServerDir() ,"../classes/" ));
               Vector serverUrlV =getClassPathV(getServerDir());
               for(int i=0; i < serverUrlV.size();i++){
                   serverJars.addElement(serverUrlV.elementAt(i));
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]