costin 01/08/20 22:35:26
Modified: src/share/org/apache/tomcat/startup StopTomcat.java
EnableAdmin.java
Log:
Few fixes.
Revision Changes Path
1.10 +17 -1
jakarta-tomcat/src/share/org/apache/tomcat/startup/StopTomcat.java
Index: StopTomcat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/StopTomcat.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StopTomcat.java 2001/08/17 04:23:00 1.9
+++ StopTomcat.java 2001/08/21 05:35:26 1.10
@@ -84,6 +84,7 @@
// explicit command line params ( for port, host or secret )
boolean commandLineParams=false;
String secretFile=null;
+ String args[];
public StopTomcat()
{
@@ -134,10 +135,25 @@
secret=s;
commandLineParams=true;
}
+
+ // Generic properties / attributes
+
+ public void setAttribute(String s, Object o ) {
+ }
+
+ public void setProperty( String name, String v ) {
+
+ }
+
+ public void setArgs( String args[] ) {
+ this.args=args;
+ }
// -------------------- Ant execute --------------------
public void execute() throws Exception {
+ if( args!=null )
+ processArgs( args );
System.out.println(sm.getString("tomcat.stop"));
try {
stopTomcat(); // stop serving
@@ -304,7 +320,7 @@
public static void main(String args[] ) {
try {
StopTomcat tomcat=new StopTomcat();
- tomcat.processArgs( args );
+ tomcat.setArgs( args );
tomcat.execute();
} catch(Exception ex ) {
System.out.println(sm.getString("tomcat.fatal"));
1.2 +12 -15
jakarta-tomcat/src/share/org/apache/tomcat/startup/EnableAdmin.java
Index: EnableAdmin.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EnableAdmin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnableAdmin.java 2001/08/17 04:23:00 1.1
+++ EnableAdmin.java 2001/08/21 05:35:26 1.2
@@ -8,9 +8,7 @@
import java.util.*;
import java.net.*;
import org.apache.tomcat.util.res.StringManager;
-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.*;
@@ -25,7 +23,8 @@
public class EnableAdmin {
Hashtable attributes=new Hashtable();
-
+ String args[];
+
public EnableAdmin() {
}
@@ -41,6 +40,7 @@
public void setArgs(String args[]) {
attributes.put("args", args);
+ this.args=args;
}
public void setConfig( String s ) {
@@ -84,6 +84,14 @@
public void execute() throws Exception
{
+ if( args!=null ) {
+ boolean ok=processArgs( args );
+ if ( ! ok ) {
+ printUsage();
+ return;
+ }
+ }
+
System.out.println("Overriding apps-admin settings ");
String home=(String)attributes.get("home");
if( home==null) home=(String)attributes.get("install");
@@ -127,7 +135,6 @@
*/
public boolean processArgs(String[] args) {
try {
- setArgs(args);
return IntrospectionUtils.processArgs( this, args,getOptions1(),
null, getOptionAliases());
} catch( Exception ex ) {
@@ -139,8 +146,6 @@
/** Callback from argument processing
*/
public void setProperty(String s,Object v) {
- if( getOptionAliases().get( s ) !=null )
- s=(String)getOptionAliases().get( s );
if ( dL > 0 ) debug( "Generic property " + s );
attributes.put(s,v);
}
@@ -148,16 +153,8 @@
/** Called by Main to set non-string properties
*/
public void setAttribute(String s,Object o) {
- if( getOptionAliases().get( s ) !=null )
- s=(String)getOptionAliases().get( s );
-
if ( "args".equals(s) ) {
String args[]=(String[])o;
- boolean ok=processArgs( args );
- if ( ! ok ) {
- printUsage();
- return;
- }
}
@@ -169,7 +166,7 @@
public static void main(String args[] ) {
try {
EnableAdmin task=new EnableAdmin();
- task.processArgs( args );
+ task.setArgs(args);
task.execute();
} catch(Exception ex ) {
ex.printStackTrace();
