costin 01/08/20 22:37:16
Modified: src/share/org/apache/tomcat/startup Tomcat.java
Added: src/share/org/apache/tomcat/startup Property.java
Log:
Tomcat.java is no longer used/needed, added deprecated mark. It still works, but
you should use the real beans ( tasks ) that perform the actions you need.
Revision Changes Path
1.64 +16 -71 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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Tomcat.java 2001/08/17 04:23:00 1.63
+++ Tomcat.java 2001/08/21 05:37:16 1.64
@@ -11,7 +11,6 @@
import org.apache.tomcat.modules.config.*;
import org.apache.tomcat.util.xml.*;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.log.*;
import org.xml.sax.*;
import org.apache.tomcat.util.collections.*;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -26,8 +25,9 @@
*
* It can be used in association with Main.java - in order to set the
* CLASSPATH.
- *
- * @author [EMAIL PROTECTED]
+ *
+ * @deprecated Use individual tasks instead: StopTomcat, EmbededTomcat,
EnableConfig, etc.
+ * @author Costin Manolache
*/
public class Tomcat {
@@ -40,7 +40,6 @@
static final String DEFAULT_CONFIG="conf/server.xml";
Hashtable attributes=new Hashtable();
- static Log log=Log.getLog( "tc_log", "Tomcat" );
public Tomcat() {
}
@@ -50,6 +49,7 @@
if( dL > 0 ) debug( "setHome " + home );
attributes.put( "home", home );
}
+
public void setH(String home) {
setHome( home );
}
@@ -110,6 +110,9 @@
// -------------------- execute --------------------
public void execute() throws Exception {
+ if( attributes.get("home")==null )
+ attributes.put("home", System.getProperty("tomcat.home"));
+
if( attributes.get("stop") != null ) {
stopTomcat();
} else if( attributes.get("enableAdmin") != null ){
@@ -148,49 +151,16 @@
}
public void startTomcat() throws TomcatException {
- if( tomcat==null ) tomcat=new EmbededTomcat();
- setTomcatProperties();
-
- if( ! tomcat.isInitialized() ) {
- long time1=System.currentTimeMillis();
- PathSetter pS=new PathSetter();
- tomcat.addInterceptor( pS );
-
- ServerXmlReader sxmlConf=new ServerXmlReader();
- if( null!=attributes.get( "config" ) )
- sxmlConf.setConfig( (String)attributes.get("config") );
- tomcat.addInterceptor( sxmlConf );
-
- tomcat.initContextManager();
-
- long time2=System.currentTimeMillis();
- tomcat.log("Init time " + (time2-time1));
+ try {
+ EmbededTomcat task= new EmbededTomcat();
+ task.setHome( (String)attributes.get("home") );
+ task.processArgs( (String[])attributes.get("args"));
+ task.execute();
+ } catch (Exception te) {
+ throw new TomcatException( te );
}
-
- long time3=System.currentTimeMillis();
- tomcat.start();
- long time4=System.currentTimeMillis();
- tomcat.log("Startup " + ( time4-time3 ));
- }
-
- private void setTomcatProperties() {
- if( attributes.get("home") != null )
- tomcat.setHome( (String)attributes.get("home"));
- if( attributes.get("install") != null )
- tomcat.setInstall( (String)attributes.get("install"));
- if( attributes.get("parentClassLoader") != null )
-
tomcat.setParentClassLoader((ClassLoader)attributes.get("parentClassLoader"));
- if( attributes.get("commonClassLoader") != null )
-
tomcat.setCommonClassLoader((ClassLoader)attributes.get("commonClassLoader"));
- if( attributes.get("appsClassLoader") != null )
- tomcat.setAppsClassLoader( (ClassLoader)attributes.get("appsClassLoader"));
- if( attributes.get("containerClassLoader") != null )
- tomcat.setContainerClassLoader(
(ClassLoader)attributes.get("containerClassLoader"));
- if( null!= attributes.get("sandbox"))
- tomcat.setSandbox( true );
}
-
// -------------------- Command-line args processing --------------------
public static void printUsage() {
@@ -210,34 +180,12 @@
System.out.println("In the absence of \"-enableAdmin\" and \"-stop\",
Tomcat will be started");
}
-
- static String options1[]= { "help", "stop", "sandbox", "security",
"enableAdmin" };
- static Hashtable optionAliases=new Hashtable();
- static Hashtable optionDescription=new Hashtable();
- static {
- optionAliases.put("h", "home");
- optionAliases.put("i", "install");
- optionAliases.put("f", "config");
- optionAliases.put("security", "sandbox");
- optionAliases.put("?", "help");
- }
-
-// public String[] getOptions1() {
-// return options1;
-// }
-// public Hashtable getOptionAliases() {
-// return optionAliases;
-// }
-
-
/** Process arguments - set object properties from the list of args.
*/
public boolean processArgs(String[] args) {
setArgs(args);
try {
return IntrospectionUtils.processArgs( this, args );
- //, args,getOptions1(),
- // null, getOptionAliases());
} catch( Exception ex ) {
ex.printStackTrace();
return false;
@@ -254,9 +202,6 @@
/** Called by Main to set non-string properties
*/
public void setAttribute(String s,Object o) {
- if( optionAliases.get( s ) !=null )
- s=(String)optionAliases.get( s );
-
if ( "args".equals(s) ) {
String args[]=(String[])o;
boolean ok=processArgs( args );
@@ -277,11 +222,11 @@
tomcat.processArgs( args );
tomcat.execute();
} catch(Exception ex ) {
- log.log(sm.getString("tomcat.fatal"), ex);
+ ex.printStackTrace();
System.exit(1);
}
}
-
+
private static int dL=0;
private void debug( String s ) {
System.out.println("Tomcat: " + s );
1.1 jakarta-tomcat/src/share/org/apache/tomcat/startup/Property.java
Index: Property.java
===================================================================
package org.apache.tomcat.startup;
import java.net.*;
import java.io.*;
import java.util.*;
/**
*
* @author Costin Manolache
*/
public class Property {
public Property() {
}
// --------------------
public void setName(String n ) {
}
public void setValue( String v ) {
}
}
