markt 2004/03/13 09:50:39
Modified: catalina/src/share/org/apache/naming/resources
WARDirContext.java
Log:
- Fix bug 17690. Display more helpful error message if docBase is invalid.
- Remove unused imports identified by Eclipse.
- Fix used of deprecated methods also identified by Eclipse.
Revision Changes Path
1.6 +6 -14
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java
Index: WARDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WARDirContext.java 28 Feb 2002 07:04:36 -0000 1.5
+++ WARDirContext.java 13 Mar 2004 17:50:39 -0000 1.6
@@ -71,27 +71,19 @@
import java.util.Enumeration;
import java.io.File;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipException;
-import javax.naming.Context;
import javax.naming.Name;
-import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.CompositeName;
-import javax.naming.NameParser;
import javax.naming.OperationNotSupportedException;
-import javax.naming.NameAlreadyBoundException;
import javax.naming.directory.DirContext;
import javax.naming.directory.Attributes;
-import javax.naming.directory.Attribute;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
-import org.apache.naming.StringManager;
-import org.apache.naming.NameParserImpl;
import org.apache.naming.NamingEntry;
import org.apache.naming.NamingContextBindingsEnumeration;
import org.apache.naming.NamingContextEnumeration;
@@ -178,7 +170,7 @@
// Validate that the document base is an existing directory
if (!base.exists() || !base.canRead() || base.isDirectory())
throw new IllegalArgumentException
- (sm.getString("warResources.notWar"));
+ (sm.getString("warResources.invalidWar", docBase));
try {
this.base = new ZipFile(base);
} catch (Exception e) {
@@ -503,7 +495,7 @@
if (!zipEntry.isDirectory())
attrs.setResourceType("");
attrs.setContentLength(zipEntry.getSize());
- attrs.setLastModified(new Date(zipEntry.getTime()));
+ attrs.setLastModified(zipEntry.getTime());
return attrs;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
