Return-Path: 
 <tomcat-dev-return-25919-apmail-jakarta-tomcat-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org
Received: (qmail 53326 invoked by uid 500); 11 Aug 2001 03:34:33 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:tomcat-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:tomcat-dev@jakarta.apache.org>
Reply-To: tomcat-dev@jakarta.apache.org
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 53317 invoked by uid 500); 11 Aug 2001 03:34:33 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Date: 11 Aug 2001 03:32:06 -0000
Message-ID: <20010811033206.70626.qmail@icarus.apache.org>
From: larryi@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup
 Tomcat.java
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

larryi      01/08/10 20:32:06

  Modified:    src/share/org/apache/tomcat/startup Tomcat.java
  Log:
  Update processArgs() to accept "-ajpid file" to support starting and stopping
  multiple instances of Tomcat out of the same home directory.  Also removed
  handling for -g and -generateConfigs parameter which is no longer used.
  
  Update contents written to apps-admin.xml to better match original contents.
  
  Update usage information.
  
  Revision  Changes    Path
  1.62      +21 -12    jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
  
  Index: Tomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- Tomcat.java	2001/06/09 03:36:42	1.61
  +++ Tomcat.java	2001/08/11 03:32:06	1.62
  @@ -17,7 +17,7 @@
   
   /**
    * Main entry point to several Tomcat functions. Uses EmbededTomcat to
  - * start and init tomcat, and special functiosn to stop, configure, etc.
  + * start and init tomcat, and special functions to stop, configure, etc.
    * 
    * It is intended as a replacement for the shell command - EmbededTomcat
    * is the "real" tomcat-specific object that deals with tomcat internals,
  @@ -130,19 +130,19 @@
   				      "conf" + File.separator +
   				      "apps-admin.xml" );
   	PrintWriter pw=new PrintWriter( fw );
  +        pw.println( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>");
   	pw.println( "<webapps>" );
  -	pw.println( "  <Context path=\"/admin\"");
  -	pw.println( "           docBase=\"webapps/admin\"");
  -	pw.println( "           trusted=\"true\">");
  -	pw.println( "    <SimpleRealm");
  -        pw.println( "      filename=\"conf/users/admin-users.xml\" />");
  -	pw.println( "  </Context>");
  +        pw.println( "    <!-- Special rules for the admin webapplication -->");
  +	pw.println( "    <Context path=\"/admin\"");
  +	pw.println( "             docBase=\"webapps/admin\"");
  +	pw.println( "             trusted=\"true\">");
  +	pw.println( "            <SimpleRealm filename=\"conf/users/admin-users.xml\" />");
  +	pw.println( "    </Context>");
   	pw.println( "</webapps>" );
   	pw.close();
       }
   	
       public void stopTomcat() throws TomcatException {
  -	System.out.println(sm.getString("tomcat.stop"));
   	try {
   	    StopTomcat task=
   		new  StopTomcat();
  @@ -193,11 +193,17 @@
   	//System.out.println(sm.getString("tomcat.usage"));
   	System.out.println("Usage: java org.apache.tomcat.startup.Tomcat {options}");
   	System.out.println("  Options are:");
  -	System.out.println("    -config file (or -f file)  Use this fileinstead of server.xml");
  +        System.out.println("    -ajpid file                Use this file instead of conf/ajp12.id");
  +        System.out.println("                                 Use with -stop option");
  +	System.out.println("    -config file (or -f file)  Use this file instead of server.xml");
  +        System.out.println("    -enableAdmin               Updates admin webapp config to \"trusted\"");
   	System.out.println("    -help (or help)            Show this usage report");
   	System.out.println("    -home dir (or -h dir)      Use this directory as tomcat.home");
   	System.out.println("    -install dir (or -i dir)   Use this directory as tomcat.install");
  +        System.out.println("    -sandbox                   Enable security manager (includes java.policy)");
   	System.out.println("    -stop                      Shut down currently running Tomcat");
  +        System.out.println();
  +        System.out.println("In the absence of \"-enableAdmin\" and \"-stop\", Tomcat will be started");
       }
   
       /** Process arguments - set object properties from the list of args.
  @@ -219,8 +225,6 @@
   		fastStart=true;
   	    } else if (arg.equals("-enableAdmin")) {
   		action="enableAdmin";
  -	    } else if (arg.equals("-g") || arg.equals("-generateConfigs")) {
  -		// config generation is now a module. //doGenerate=true;
   	    } else if (arg.equals("-f") || arg.equals("-config")) {
   		i++;
   		if( i < args.length )
  @@ -239,7 +243,12 @@
   		    setInstall( args[i] );
   		else
   		    return false;
  -	    }
  +	    } else if (arg.equalsIgnoreCase("-ajpid") ) {
  +                // accept this argument so it can pass through to StopTomcat
  +		i++;
  +		if (i >= args.length) 
  +		    return false;
  +            }
   	}
   	return true;
       }