craigmcc 01/08/15 17:57:18
Modified: catalina/src/share/org/apache/naming/resources
FileDirContext.java
Log:
Sort the directory listing returned when there is no welcome page (and
directory listings are not suppressed) for webapps that are unpacked into
a real directory. Still have to look at how to do this for webapps that
are executed directly from a WAR.
Revision Changes Path
1.7 +6 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Index: FileDirContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileDirContext.java 2001/07/23 06:40:46 1.6
+++ FileDirContext.java 2001/08/16 00:57:18 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v 1.6 2001/07/23 06:40:46 remm Exp $
- * $Revision: 1.6 $
- * $Date: 2001/07/23 06:40:46 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v 1.7 2001/08/16 00:57:18 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/08/16 00:57:18 $
*
* ====================================================================
*
@@ -64,6 +64,7 @@
package org.apache.naming.resources;
+import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;
import java.util.Date;
@@ -98,7 +99,7 @@
* Filesystem Directory Context implementation helper class.
*
* @author Remy Maucherat
- * @version $Revision: 1.6 $ $Date: 2001/07/23 06:40:46 $
+ * @version $Revision: 1.7 $ $Date: 2001/08/16 00:57:18 $
*/
public class FileDirContext extends BaseDirContext {
@@ -896,6 +897,7 @@
if (!file.isDirectory())
return entries;
String[] names = file.list();
+ Arrays.sort(names); // Sort alphabetically
if (names == null)
return entries;
NamingEntry entry = null;