glenn 2002/12/31 06:00:36
Modified: jasper2/src/share/org/apache/jasper Tag: tomcat_4_branch
EmbededServletOptions.java JspC.java Options.java
jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Compiler.java
Log:
Implement new Ant javac fork option.
If set to true Ant forks a new process to compile JSP pages
and does it without synchronization. Default is false.
Revision Changes Path
No revision
No revision
1.8.2.2 +21 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- EmbededServletOptions.java 8 Sep 2002 05:45:59 -0000 1.8.2.1
+++ EmbededServletOptions.java 31 Dec 2002 14:00:36 -0000 1.8.2.2
@@ -89,6 +89,11 @@
public boolean development = true;
/**
+ * Should Ant fork its java compiles of JSP pages.
+ */
+ public boolean fork = false;
+
+ /**
* Do you want to keep the generated Java files around?
*/
public boolean keepGenerated = true;
@@ -279,6 +284,10 @@
return javaEncoding;
}
+ public boolean getFork() {
+ return fork;
+ }
+
/**
* Create an EmbededServletOptions object using data available from
* ServletConfig and ServletContext.
@@ -428,6 +437,15 @@
String javaEncoding = config.getInitParameter("javaEncoding");
if (javaEncoding != null) {
this.javaEncoding = javaEncoding;
+ }
+
+ String fork = config.getInitParameter("fork");
+ if (fork != null) {
+ if (fork.equalsIgnoreCase("true"))
+ this.fork = true;
+ else if (fork.equalsIgnoreCase("false"))
+ this.fork = false;
+ else Constants.message ("jsp.warning.fork", Logger.WARNING);
}
// Setup the global Tag Libraries location cache for this
1.12.2.3 +7 -3
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.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- JspC.java 7 Nov 2002 08:46:53 -0000 1.12.2.2
+++ JspC.java 31 Dec 2002 14:00:36 -0000 1.12.2.3
@@ -303,6 +303,10 @@
return "UTF-8";
}
+ public boolean getFork() {
+ return false;
+ }
+
public String getClassPath() {
if( classPath != null )
return classPath;
1.6.2.1 +8 -3
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.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Options.java 26 Jun 2002 16:50:38 -0000 1.6
+++ Options.java 31 Dec 2002 14:00:36 -0000 1.6.2.1
@@ -176,4 +176,9 @@
public String getJavaEncoding();
+ /**
+ * boolean flag to tell Ant whether to fork JSP page compilations.
+ */
+ public boolean getFork();
+
}
No revision
No revision
1.18.2.9 +9 -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.18.2.8
retrieving revision 1.18.2.9
diff -u -r1.18.2.8 -r1.18.2.9
--- Compiler.java 10 Dec 2002 21:29:59 -0000 1.18.2.8
+++ Compiler.java 31 Dec 2002 14:00:36 -0000 1.18.2.9
@@ -288,6 +288,7 @@
javac.setDebug(ctxt.getOptions().getClassDebugInfo());
javac.setSrcdir(srcPath);
javac.setOptimize(! ctxt.getOptions().getClassDebugInfo() );
+ javac.setFork(ctxt.getOptions().getFork());
info.append(" srcDir=" + srcPath + "\n" );
@@ -304,8 +305,12 @@
BuildException error=null;
try {
- synchronized(javacLock) {
+ if (ctxt.getOptions().getFork()) {
javac.execute();
+ } else {
+ synchronized(javacLock) {
+ javac.execute();
+ }
}
} catch (BuildException e) {
success = false;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
