cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources ResourceAttributes.java
yoavs 2004/08/29 09:46:15 Modified:catalina/src/share/org/apache/catalina Valve.java catalina/src/share/org/apache/catalina/ant JMXQueryTask.java catalina/src/share/org/apache/catalina/authenticator AuthenticatorBase.java SingleSignOn.java catalina/src/share/org/apache/catalina/connector Connector.java CoyoteAdapter.java InputBuffer.java Response.java catalina/src/share/org/apache/catalina/core StandardContext.java StandardServer.java catalina/src/share/org/apache/catalina/deploy NamingResources.java catalina/src/share/org/apache/catalina/launcher CatalinaLaunchFilter.java catalina/src/share/org/apache/catalina/loader WebappClassLoader.java catalina/src/share/org/apache/catalina/mbeans DefaultContextMBean.java MBeanFactory.java MBeanUtils.java NamingResourcesMBean.java StandardContextMBean.java catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java catalina/src/share/org/apache/catalina/servlets CGIServlet.java DefaultServlet.java WebdavServlet.java catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java catalina/src/share/org/apache/catalina/startup Embedded.java SetNextNamingRule.java catalina/src/share/org/apache/catalina/users AbstractGroup.java AbstractUser.java MemoryGroup.java MemoryRole.java MemoryUser.java catalina/src/share/org/apache/catalina/util Base64.java CGIProcessEnvironment.java CharsetMapper.java InstanceSupport.java Strftime.java catalina/src/share/org/apache/catalina/valves AccessLogValve.java ErrorReportValve.java ExtendedAccessLogValve.java JDBCAccessLogValve.java PersistentValve.java RemoteAddrValve.java RemoteHostValve.java RequestDumperValve.java RequestFilterValve.java ValveBase.java catalina/src/share/org/apache/naming ContextAccessController.java JndiPermission.java NamingContext.java ResourceEnvRef.java TransactionRef.java catalina/src/share/org/apache/naming/resources ResourceAttributes.java Log: JavaDoc fixes. Revision ChangesPath 1.4 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Valve.java Index: Valve.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Valve.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Valve.java23 Jun 2004 08:24:59 - 1.3 +++ Valve.java29 Aug 2004 16:46:08 - 1.4 @@ -111,8 +111,6 @@ * * @param request The servlet request to be processed * @param response The servlet response to be created - * @param context The valve context used to invoke the next valve - * in the current processing pipeline * * @exception IOException if an input/output error occurs, or is thrown * by a subsequently invoked Valve, Filter, or Servlet 1.4 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXQueryTask.java Index: JMXQueryTask.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXQueryTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JMXQueryTask.java 27 Feb 2004 14:58:40 - 1.3 +++ JMXQueryTask.java 29 Aug 2004 16:46:09 - 1.4 @@ -34,7 +34,7 @@ /** * The JMX query string - * @see setQuery() + * @see #setQuery(String) */ protected String query = null; 1.24 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java Index: AuthenticatorBase.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- AuthenticatorBase.java7 Jul 2004 16:39:46 -
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources ResourceAttributes.java ProxyDirContext.java
remm2004/07/13 02:40:48
Modified:catalina/src/share/org/apache/naming/resources
ResourceAttributes.java ProxyDirContext.java
Log:
- Expose cache lookup and cache entries. The standard lookup methods will work as
usual.
- Add extra fields in the attributes.
Revision ChangesPath
1.4 +75 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ResourceAttributes.java
Index: ResourceAttributes.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ResourceAttributes.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceAttributes.java 27 Feb 2004 14:58:54 - 1.3
+++ ResourceAttributes.java 13 Jul 2004 09:40:47 - 1.4
@@ -20,6 +20,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
+import java.util.TimeZone;
import java.util.Vector;
import javax.naming.NamingEnumeration;
@@ -138,12 +139,28 @@
*/
protected static final SimpleDateFormat formats[] = {
new SimpleDateFormat("EEE, dd MMM HH:mm:ss zzz", Locale.US),
-new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz ", Locale.US),
new SimpleDateFormat("EE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
new SimpleDateFormat("EEE d HH:mm:ss ", Locale.US)
};
+protected final static TimeZone gmtZone = TimeZone.getTimeZone("GMT");
+
+
+/**
+ * GMT timezone - all HTTP dates are on GMT
+ */
+static {
+
+format.setTimeZone(gmtZone);
+
+formats[0].setTimeZone(gmtZone);
+formats[1].setTimeZone(gmtZone);
+formats[2].setTimeZone(gmtZone);
+
+}
+
+
// --- Constructors
@@ -200,6 +217,18 @@
*/
protected Date lastModifiedDate = null;
+
+/**
+ * Last modified date in HTTP format.
+ */
+protected String lastModifiedHttp = null;
+
+
+/**
+ * MIME type.
+ */
+protected String mimeType = null;
+
/**
* Name.
@@ -553,6 +582,50 @@
attributes.put(LAST_MODIFIED, lastModifiedDate);
}
+
+/**
+ * @return Returns the lastModifiedHttp.
+ */
+public String getLastModifiedHttp() {
+if (lastModifiedHttp != null)
+return lastModifiedHttp;
+Date modifiedDate = getLastModifiedDate();
+if (modifiedDate == null) {
+modifiedDate = getCreationDate();
+}
+if (modifiedDate == null) {
+modifiedDate = new Date();
+}
+synchronized (format) {
+lastModifiedHttp = format.format(modifiedDate);
+}
+return lastModifiedHttp;
+}
+
+
+/**
+ * @param lastModifiedHttp The lastModifiedHttp to set.
+ */
+public void setLastModifiedHttp(String lastModifiedHttp) {
+this.lastModifiedHttp = lastModifiedHttp;
+}
+
+
+/**
+ * @return Returns the mimeType.
+ */
+public String getMimeType() {
+return mimeType;
+}
+
+
+/**
+ * @param mimeType The mimeType to set.
+ */
+public void setMimeType(String mimeType) {
+this.mimeType = mimeType;
+}
+
/**
* Get name.
1.16 +53 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Index: ProxyDirContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ProxyDirContext.java 27 Feb 2004 14:58:54 - 1.15
+++ ProxyDirContext.java 13 Jul 2004 09:40:47 - 1.16
@@ -252,6 +252,9 @@
throws NamingException {
CacheEntry entry = cacheLookup(name.toString());
if (entry != null) {
+if (!entry.exists) {
+throw notFoundException;
+}
if (entry.resource != null) {
// Check content caching.
return entry.resource;
@@ -278,6 +281,9 @@
throws NamingException {
CacheEntry entry = cacheLookup(name);
if (entry != null) {
+if (!entry.exists) {
+throw notFoundException;
+}
if (entry.resource != null) {
return entry.resource;
} else {
@@ -796,6 +802,9 @@
throws Naming
