luehe 2004/10/19 09:17:35
Modified: jasper2/src/share/org/apache/jasper Options.java JspC.java
EmbeddedServletOptions.java
jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
catalina/src/conf web.xml
Log:
Removed redundant 'reloading' init param.
Now the convention is as follows:
development=true -> development mode, frequency of modification checks
specified by 'modificationTestInterval'
development=false -> deployment mode, background compilations enabled if
'checkInterval' greater than zero, in which case
background compilations are initiated every
'checkInterval' seconds if necessary
Revision Changes Path
1.26 +0 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Options.java 4 Oct 2004 17:39:45 -0000 1.25
+++ Options.java 19 Oct 2004 16:17:34 -0000 1.26
@@ -74,11 +74,6 @@
public boolean getDevelopment();
/**
- * JSP reloading check ?
- */
- public boolean getReloading();
-
- /**
* Is the generation of SMAP info for JSR45 debugging suppressed?
*/
public boolean isSmapSuppressed();
1.85 +0 -7
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.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- JspC.java 5 Oct 2004 01:46:00 -0000 1.84
+++ JspC.java 19 Oct 2004 16:17:34 -0000 1.85
@@ -387,13 +387,6 @@
}
/**
- * JSP reloading check ?
- */
- public boolean getReloading() {
- return true;
- }
-
- /**
* Is the generation of SMAP info for JSR45 debuggin suppressed?
*/
public boolean isSmapSuppressed() {
1.18 +0 -25
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EmbeddedServletOptions.java 5 Oct 2004 07:24:33 -0000 1.17
+++ EmbeddedServletOptions.java 19 Oct 2004 16:17:34 -0000 1.18
@@ -94,11 +94,6 @@
private int checkInterval = 300;
/**
- * JSP reloading check ?
- */
- private boolean reloading = false;
-
- /**
* Is the generation of SMAP info for JSR45 debuggin suppressed?
*/
private boolean isSmapSuppressed = false;
@@ -245,13 +240,6 @@
}
/**
- * JSP reloading check ?
- */
- public boolean getReloading() {
- return reloading;
- }
-
- /**
* Is the generation of SMAP info for JSR45 debuggin suppressed?
*/
public boolean isSmapSuppressed() {
@@ -482,19 +470,6 @@
} else {
if (log.isWarnEnabled()) {
log.warn(Localizer.getMessage("jsp.warning.development"));
- }
- }
- }
-
- String reloading = config.getInitParameter("reloading");
- if (reloading != null) {
- if (reloading.equalsIgnoreCase("true")) {
- this.reloading = true;
- } else if (reloading.equalsIgnoreCase("false")) {
- this.reloading = false;
- } else {
- if (log.isWarnEnabled()) {
- log.warn(Localizer.getMessage("jsp.warning.reloading"));
}
}
}
1.25 +8 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
Index: JspRuntimeContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JspRuntimeContext.java 23 Jul 2004 22:45:38 -0000 1.24
+++ JspRuntimeContext.java 19 Oct 2004 16:17:34 -0000 1.25
@@ -125,7 +125,7 @@
String appBase = context.getRealPath("/");
if (!options.getDevelopment()
&& appBase != null
- && options.getReloading() ) {
+ && options.getCheckInterval() > 0) {
if (appBase.endsWith(File.separator) ) {
appBase = appBase.substring(0,appBase.length()-1);
}
@@ -181,6 +181,7 @@
*/
public void addWrapper(String jspUri, JspServletWrapper jsw) {
jsps.remove(jspUri);
+System.out.println("XXXX ADDING WRAPPER" + jspUri + " " + this);
jsps.put(jspUri,jsw);
}
@@ -200,6 +201,7 @@
* @param jspUri JSP URI of JspServletWrapper to remove
*/
public void removeWrapper(String jspUri) {
+System.out.println("XXXX REMOVING WRAPPER" + jspUri);
jsps.remove(jspUri);
}
@@ -210,6 +212,7 @@
* @return The number of JSPs that have been loaded into the webapp
*/
public int getJspCount() {
+System.out.println("XXXXX CALLING GETJSPCOUNT: " + jsps.size() + " " + this);
return jsps.size();
}
@@ -262,6 +265,7 @@
* Increments the JSP reload counter.
*/
public synchronized void incrementJspReloadCount() {
+System.out.println("XXXX INCREMENTING");
jspReloadCount++;
}
@@ -446,6 +450,8 @@
* a background thread now
*/
protected void threadStart() {
+
+System.out.println("XXX STARTING THREAD");
// Has the background thread already been started?
if (thread != null) {
1.51 +5 -9 jakarta-tomcat-catalina/catalina/src/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- web.xml 19 Oct 2004 01:43:04 -0000 1.50
+++ web.xml 19 Oct 2004 16:17:34 -0000 1.51
@@ -106,10 +106,11 @@
<!-- following initialization parameters (default values are in square -->
<!-- brackets): -->
<!-- -->
- <!-- checkInterval If development is false and reloading is true, -->
- <!-- background compiles are enabled. checkInterval -->
- <!-- is the time in seconds between checks to see -->
- <!-- if a JSP page needs to be recompiled. [300] -->
+ <!-- checkInterval If development is false and checkInterval is -->
+ <!-- greater than zero, background compiles are -->
+ <!-- enabled. checkInterval is the time in seconds -->
+ <!-- between checks to see if a JSP page needs to -->
+ <!-- be recompiled. [300] -->
<!-- -->
<!-- modificationTestInterval -->
<!-- Causes a JSP (and its dependent files) to not -->
@@ -159,11 +160,6 @@
<!-- -->
<!-- trimSpaces Should white spaces in template text between -->
<!-- actions or directives be trimmed? [false] -->
- <!-- -->
- <!-- reloading Should Jasper check for and reload modified -->
- <!-- JSPs in deployment mode (development is set to -->
- <!-- false)? If true, background compiles are -->
- <!-- enabled every checkInterval seconds. [false] -->
<!-- -->
<!-- suppressSmap Should the generation of SMAP info for JSR45 -->
<!-- debugging be suppressed? [false] -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
