tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@hyperreal.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util XMLTree.java
Date Sat, 30 Oct 1999 05:36:32 GMT
gonzo       99/10/29 22:36:32

  Modified:    src/share/org/apache/tomcat/core Tag: TOMCAT_J2EE_10F_102199
                        Context.java DefaultServlet.java Request.java
                        RequestImpl.java
               src/share/org/apache/tomcat/deployment Tag:
                        TOMCAT_J2EE_10F_102199
                        WebApplicationDescriptor.java
                        WebApplicationDescriptorImpl.java
               src/share/org/apache/tomcat/shell Tag:
                        TOMCAT_J2EE_10F_102199 LocalStrings.properties
               src/share/org/apache/tomcat/util Tag: TOMCAT_J2EE_10F_102199
                        XMLTree.java
  Log:
  empty welcome-file list - j2ee
  
  	note: i believe a rd.forward/qs problem still exists
  	which i will be addressing in a moment.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.3   +17 -19    jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
  
  Index: Context.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- Context.java	1999/10/28 01:04:19	1.5.2.2
  +++ Context.java	1999/10/30 05:36:21	1.5.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v 1.5.2.2
1999/10/28 01:04:19 gonzo Exp $
  - * $Revision: 1.5.2.2 $
  - * $Date: 1999/10/28 01:04:19 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v 1.5.2.3
1999/10/30 05:36:21 gonzo Exp $
  + * $Revision: 1.5.2.3 $
  + * $Date: 1999/10/30 05:36:21 $
    *
    * ====================================================================
    *
  @@ -662,27 +662,25 @@
       private void clearDir(File dir) {
           String[] files = dir.list();
   
  -        if (files == null) {
  -            return;
  -        }
  -
  -	for (int i = 0; i < files.length; i++) {
  -	    File f = new File(dir, files[i]);
  -
  -	    if (f.isDirectory()) {
  -		clearDir(f);
  +        if (files != null) {
  +	    for (int i = 0; i < files.length; i++) {
  +	        File f = new File(dir, files[i]);
  +
  +	        if (f.isDirectory()) {
  +		    clearDir(f);
  +	        }
  +
  +	        try {
  +	            f.delete();
  +	        } catch (Exception e) {
  +	        }
   	    }
   
   	    try {
  -	        f.delete();
  +	        dir.delete();
   	    } catch (Exception e) {
   	    }
  -	}
  -
  -	try {
  -	    dir.delete();
  -	} catch (Exception e) {
  -	}
  +        }
       }
   
       private void processWebApp(InputStream is) {
  
  
  
  1.3.2.4   +11 -7     jakarta-tomcat/src/share/org/apache/tomcat/core/DefaultServlet.java
  
  Index: DefaultServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/DefaultServlet.java,v
  retrieving revision 1.3.2.3
  retrieving revision 1.3.2.4
  diff -u -r1.3.2.3 -r1.3.2.4
  --- DefaultServlet.java	1999/10/30 03:23:12	1.3.2.3
  +++ DefaultServlet.java	1999/10/30 05:36:22	1.3.2.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/DefaultServlet.java,v
1.3.2.3 1999/10/30 03:23:12 harishp Exp $
  - * $Revision: 1.3.2.3 $
  - * $Date: 1999/10/30 03:23:12 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/DefaultServlet.java,v
1.3.2.4 1999/10/30 05:36:22 gonzo Exp $
  + * $Revision: 1.3.2.4 $
  + * $Date: 1999/10/30 05:36:22 $
    *
    * ====================================================================
    *
  @@ -283,12 +283,16 @@
   
   	while (enum.hasMoreElements()) {
   	    String fileName = (String)enum.nextElement();
  -	    File f = new File(file, fileName);
   
  -	    if (f.exists()) {
  -	        welcomeFile = fileName;
  +            if (fileName != null &&
  +                fileName.trim().length() > 0) {
  +	        File f = new File(file, fileName);
   
  -		break;
  +	        if (f.exists()) {
  +	            welcomeFile = fileName;
  +
  +		    break;
  +                }
   	    }
   	}
   
  
  
  
  1.1.2.2   +5 -8      jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- Request.java	1999/10/28 22:54:54	1.1.2.1
  +++ Request.java	1999/10/30 05:36:23	1.1.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v 1.1.2.1
1999/10/28 22:54:54 gonzo Exp $
  - * $Revision: 1.1.2.1 $
  - * $Date: 1999/10/28 22:54:54 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v 1.1.2.2
1999/10/30 05:36:23 gonzo Exp $
  + * $Revision: 1.1.2.2 $
  + * $Date: 1999/10/30 05:36:23 $
    *
    * ====================================================================
    *
  @@ -381,16 +381,13 @@
       public void setQueryString(String queryString) {
           this.queryString = queryString;
   
  -        Hashtable parameters = null;
  -
           // catch any parse exceptions
   
           try {
  -            parameters = HttpUtils.parseQueryString(queryString);
  +            this.parameters = HttpUtils.parseQueryString(queryString);
           } catch (Exception e) {
  +            this.parameters.clear();
           }
  -
  -        this.parameters = parameters;
       }
       
       public String getRemoteUser() {
  
  
  
  1.1.2.4   +8 -9      jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/RequestImpl.java
  
  Index: RequestImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/RequestImpl.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- RequestImpl.java	1999/10/28 01:04:19	1.1.2.3
  +++ RequestImpl.java	1999/10/30 05:36:23	1.1.2.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/RequestImpl.java,v
1.1.2.3 1999/10/28 01:04:19 gonzo Exp $
  - * $Revision: 1.1.2.3 $
  - * $Date: 1999/10/28 01:04:19 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/RequestImpl.java,v
1.1.2.4 1999/10/30 05:36:23 gonzo Exp $
  + * $Revision: 1.1.2.4 $
  + * $Date: 1999/10/30 05:36:23 $
    *
    * ====================================================================
    *
  @@ -348,20 +348,19 @@
       public void setQueryString(String queryString) {
           this.queryString = queryString;
   
  -        Hashtable parameters = null;
  -
           // catch any parse exceptions
   
   	try {
  -            parameters = HttpUtils.parseQueryString(queryString);
  +            setParameters(HttpUtils.parseQueryString(queryString));
   	} catch (Exception e) {
  +            this.parameters.clear();
           }
  -
  -        setParameters(parameters);
       }
   
       public void setParameters(Hashtable parameters) {
  -	this.parameters = parameters;
  +        if (parameters != null) {
  +	    this.parameters = parameters;
  +        }
       }
   
       public void setContentLength( int  len ) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.1 +7 -4      jakarta-tomcat/src/share/org/apache/tomcat/deployment/WebApplicationDescriptor.java
  
  Index: WebApplicationDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/WebApplicationDescriptor.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- WebApplicationDescriptor.java	1999/10/09 00:20:46	1.1.1.1
  +++ WebApplicationDescriptor.java	1999/10/30 05:36:25	1.1.1.1.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/WebApplicationDescriptor.java,v
1.1.1.1 1999/10/09 00:20:46 duncan Exp $
  - * $Revision: 1.1.1.1 $
  - * $Date: 1999/10/09 00:20:46 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/WebApplicationDescriptor.java,v
1.1.1.1.2.1 1999/10/30 05:36:25 gonzo Exp $
  + * $Revision: 1.1.1.1.2.1 $
  + * $Date: 1999/10/30 05:36:25 $
    *
    * ====================================================================
    *
  @@ -114,8 +114,11 @@
       
       public LoginConfiguration getLoginConfiguration();
       public void setLoginConfiguration(LoginConfiguration loginConfiguration);
  -    // XXXX missing from DTD ?
  +    // XXX
  +    // commented out in anticipation they'll eventually be supported
  +/*
       public Enumeration getLocalizedContentDescriptors();
       public void addLocalizedContentDescriptor(LocalizedContentDescriptor localizedContentDescriptor);
  +*/
   }
   
  
  
  
  1.1.1.1.2.1 +16 -3     jakarta-tomcat/src/share/org/apache/tomcat/deployment/WebApplicationDescriptorImpl.java
  
  Index: WebApplicationDescriptorImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/WebApplicationDescriptorImpl.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- WebApplicationDescriptorImpl.java	1999/10/09 00:20:46	1.1.1.1
  +++ WebApplicationDescriptorImpl.java	1999/10/30 05:36:26	1.1.1.1.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/WebApplicationDescriptorImpl.java,v
1.1.1.1 1999/10/09 00:20:46 duncan Exp $
  - * $Revision: 1.1.1.1 $
  - * $Date: 1999/10/09 00:20:46 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/WebApplicationDescriptorImpl.java,v
1.1.1.1.2.1 1999/10/30 05:36:26 gonzo Exp $
  + * $Revision: 1.1.1.1.2.1 $
  + * $Date: 1999/10/30 05:36:26 $
    *
    * ====================================================================
    *
  @@ -86,7 +86,11 @@
       private Vector resourceReferences = new Vector();
       private Vector securityRoles = new Vector();
       private Vector securityConstraints = new Vector();
  +    // XXX
  +    // commented out in anticipation they'll eventually be supported 
  +/*
       private Vector localizedContentDescriptors = new Vector();
  +*/
       private LoginConfiguration loginConfiguration;
       private Vector environmentEntries;
       
  @@ -180,6 +184,9 @@
           securityConstraints.addElement(securityConstraint);
       }
       
  +    // XXX
  +    // commented out in anticipation they'll eventually be supported 
  +/*
       public Enumeration getLocalizedContentDescriptors() {
   	return localizedContentDescriptors.elements();
       }
  @@ -189,6 +196,7 @@
   	this.localizedContentDescriptors.addElement(
   	    localizedContentDescriptor);
       }
  +*/
       
       public LoginConfiguration getLoginConfiguration() {
   	return this.loginConfiguration;
  @@ -226,7 +234,12 @@
   	s = s + " \n resourceReferences" + resourceReferences;
   	s = s + " \n securityRoles" + securityRoles;
   	s = s + " \n securityConstraints" + securityConstraints;
  +
  +      // XXX
  +      // commented out in anticipation they'll eventually be supported 
  +/*
   	s = s + " \n localizedContentDescriptors" + localizedContentDescriptors;
  +*/
   	s = s + " \n loginConfiguration " + loginConfiguration;
   	s = s + " \n environmentEntries " + environmentEntries;
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -2      jakarta-tomcat/src/share/org/apache/tomcat/shell/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/shell/LocalStrings.properties,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- LocalStrings.properties	1999/10/15 00:34:35	1.3
  +++ LocalStrings.properties	1999/10/30 05:36:29	1.3.2.1
  @@ -1,4 +1,4 @@
  -# $Id: LocalStrings.properties,v 1.3 1999/10/15 00:34:35 akv Exp $
  +# $Id: LocalStrings.properties,v 1.3.2.1 1999/10/30 05:36:29 gonzo Exp $
   #
   
   # Localized strings for package org.apache.tomcat.shell
  @@ -60,7 +60,7 @@
   \tfor jdk 1.2.x on unix:\n\
   \t% CLASSPATH=[jdkHome]/lib/tools.jar:$CLASSPATH; export CLASSPATH\n\
   \n\
  -\tfor jdk 2.1.x on windows:\n\
  +\tfor jdk 1.2.x on windows:\n\
   \t% CLASSPATH=[jdkHome]\\lib\\tools.jar;%CLASSPATH%\n\
   \n\
   \tfor jdk 1.1.x on unix:\n\
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.1 +10 -10    jakarta-tomcat/src/share/org/apache/tomcat/util/XMLTree.java
  
  Index: XMLTree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/XMLTree.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- XMLTree.java	1999/10/09 00:20:56	1.1.1.1
  +++ XMLTree.java	1999/10/30 05:36:31	1.1.1.1.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/XMLTree.java,v 1.1.1.1
1999/10/09 00:20:56 duncan Exp $
  - * $Revision: 1.1.1.1 $
  - * $Date: 1999/10/09 00:20:56 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/XMLTree.java,v 1.1.1.1.2.1
1999/10/30 05:36:31 gonzo Exp $
  + * $Revision: 1.1.1.1.2.1 $
  + * $Date: 1999/10/30 05:36:31 $
    *
    * ====================================================================
    *
  @@ -74,8 +74,8 @@
    */
   
   public class XMLTree {
  -    private String name = null;
  -    private String value = null;
  +    private String name = "";
  +    private String value = "";
       private Hashtable attributes = new Hashtable();
       private Vector elements = new Vector();
   
  @@ -95,11 +95,11 @@
       }
   
       public void setValue(String value) {
  -	if (value != null) {
  -	    this.value = value.trim();
  -	} else {
  -	    this.value = value;
  -	}
  +	if (value == null) {
  +            value = "";
  +        }
  +
  +	this.value = value.trim();
       }
   
       public Object getAttribute(Object key) {
  
  
  

Mime
View raw message