glenn 2002/12/31 06:01:17
Modified: jasper2/src/share/org/apache/jasper
EmbededServletOptions.java JspC.java Options.java
jasper2/src/share/org/apache/jasper/compiler 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
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- EmbededServletOptions.java 8 Dec 2002 13:42:52 -0000 1.15
+++ EmbededServletOptions.java 31 Dec 2002 14:01:17 -0000 1.16
@@ -91,6 +91,11 @@
private 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?
*/
private boolean keepGenerated = true;
@@ -303,6 +308,10 @@
return javaEncoding;
}
+ public boolean getFork() {
+ return fork;
+ }
+
public JspConfig getJspConfig() {
return jspConfig;
}
@@ -479,6 +488,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.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JspC.java 4 Dec 2002 00:48:42 -0000 1.19
+++ JspC.java 31 Dec 2002 14:01:17 -0000 1.20
@@ -311,6 +311,10 @@
return "UTF-8";
}
+ public boolean getFork() {
+ return false;
+ }
+
public String getClassPath() {
if( classPath != null )
return classPath;
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Options.java 4 Dec 2002 00:48:42 -0000 1.10
+++ Options.java 31 Dec 2002 14:01:17 -0000 1.11
@@ -170,6 +170,11 @@
public String getJavaEncoding();
/**
+ * boolean flag to tell Ant whether to fork JSP page compilations.
+ */
+ public boolean getFork();
+
+ /**
* Obtain JSP configuration informantion specified in web.xml.
*/
public JspConfig getJspConfig();
1.45 +6 -1
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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Compiler.java 11 Dec 2002 07:51:20 -0000 1.44
+++ Compiler.java 31 Dec 2002 14:01:17 -0000 1.45
@@ -357,6 +357,7 @@
javac.setDebug(ctxt.getOptions().getClassDebugInfo());
javac.setSrcdir(srcPath);
javac.setOptimize(! ctxt.getOptions().getClassDebugInfo() );
+ javac.setFork(ctxt.getOptions().getFork());
info.append(" srcDir=" + srcPath + "\n" );
// Set the Java compiler to use
@@ -372,8 +373,12 @@
info.append(" include="+ ctxt.getJspPath() + "\n" );
try {
- synchronized(javacLock) {
+ if (ctxt.getOptions().getFork()) {
javac.execute();
+ } else {
+ synchronized(javacLock) {
+ javac.execute();
+ }
}
} catch (BuildException e) {
log.error( "Javac execption ", e);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
