luehe 2004/10/04 18:46:00
Modified: jasper2/src/share/org/apache/jasper/resources
LocalStrings.properties
jasper2/src/share/org/apache/jasper
EmbeddedServletOptions.java JspC.java
jasper2/src/share/org/apache/jasper/compiler Compiler.java
webapps/docs jasper-howto.xml
Log:
Changed default of modificationTestInterval to 0, so that by default we continue to
check for last modification date on each access in development mode.
Remy, let me know if you have any issues w/ this.
Revision Changes Path
1.3 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings.properties 4 Oct 2004 17:39:45 -0000 1.2
+++ LocalStrings.properties 5 Oct 2004 01:46:00 -0000 1.3
@@ -143,7 +143,7 @@
jsp.warning.sendErrToClient=Warning: Invalid value for the initParam
sendErrToClient. Will use the default value of \"false\"
jsp.warning.classDebugInfo=Warning: Invalid value for the initParam classdebuginfo.
Will use the default value of \"false\"
jsp.warning.checkInterval=Warning: Invalid value for the initParam checkInterval.
Will use the default value of \"300\" seconds
-jsp.warning.modificationTestInterval=Warning: Invalid value for the initParam
modificationTestInterval. Will use the default value of \"4000\" milliseconds
+jsp.warning.modificationTestInterval=Warning: Invalid value for the initParam
modificationTestInterval. Will use the default value of \"0\" milliseconds
jsp.warning.development=Warning: Invalid value for the initParam development. Will
use the default value of \"true\"
jsp.warning.fork=Warning: Invalid value for the initParam fork. Will use the
default value of \"true\"
jsp.warning.reloading=Warning: Invalid value for the initParam reloading. Will use
the default value of \"true\"
1.15 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
Index: EmbeddedServletOptions.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- EmbeddedServletOptions.java 4 Oct 2004 17:39:45 -0000 1.14
+++ EmbeddedServletOptions.java 5 Oct 2004 01:46:00 -0000 1.15
@@ -167,7 +167,7 @@
/**
* Modification test interval.
*/
- public int modificationTestInterval = 4000;
+ private int modificationTestInterval = 0;
/**
* Is generation of X-Powered-By response header enabled/disabled?
1.84 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- JspC.java 4 Oct 2004 17:39:45 -0000 1.83
+++ JspC.java 5 Oct 2004 01:46:00 -0000 1.84
@@ -376,7 +376,7 @@
* Modification test interval.
*/
public int getModificationTestInterval() {
- return 4000;
+ return 0;
}
/**
1.94 +6 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Compiler.java 4 Oct 2004 17:39:46 -0000 1.93
+++ Compiler.java 5 Oct 2004 01:46:00 -0000 1.94
@@ -83,7 +83,7 @@
* null otherwise
*/
protected String[] generateJava() throws Exception {
-
+
String[] smapStr = null;
long t1=System.currentTimeMillis();
@@ -321,9 +321,11 @@
boolean outDated = false;
String jsp = ctxt.getJspFile();
- if ((jsw != null) && ((jsw.getLastModificationTest()
- + ctxt.getOptions().getModificationTestInterval())
- > System.currentTimeMillis())) {
+ if ((jsw != null)
+ && (ctxt.getOptions().getModificationTestInterval() > 0)
+ && ((jsw.getLastModificationTest()
+ + ctxt.getOptions().getModificationTestInterval())
+ > System.currentTimeMillis())) {
return false;
}
1.18 +1 -2 jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml
Index: jasper-howto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/jasper-howto.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jasper-howto.xml 4 Oct 2004 17:39:46 -0000 1.17
+++ jasper-howto.xml 5 Oct 2004 01:46:00 -0000 1.18
@@ -119,8 +119,7 @@
<li><strong>modificationTestInterval</strong> - Checks for modification for a given
JSP file (and all its dependent files) will be performed only once every specified
amount
-of milliseconds. Setting this to -1 will cause the JSP to be checked on every
access.
-Default is <code>4000</code> milliseconds.</li>
+of milliseconds. Setting this to a value <=0 will cause the JSP to be checked on
every access, which is the default.</li>
<li><strong>reloading</strong> - Should Jasper check for modified JSPs?
<code>true</code> or <code>false</code>, default <code>false</code>.</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
