yoavs 2004/09/21 12:36:12
Modified: webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/compiler
AntCompiler.java
Log:
Bugzilla 31257: added specification of endorsed dirs when forking the Ant compiler.
No modification made to JDT compiler at this time.
Revision Changes Path
1.113 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- changelog.xml 20 Sep 2004 18:25:42 -0000 1.112
+++ changelog.xml 21 Sep 2004 19:36:11 -0000 1.113
@@ -64,6 +64,9 @@
<fix>
<bug>31171</bug>: Wrap to avoid ClassCastException in PageContextImpl.
(yoavs)
</fix>
+ <fix>
+ <bug>31257</bug>: Added specification of endorsed dirs if forking. Note
that this is fairly useless for now in 5.5 since it uses JDT and not javac by default.
(yoavs)
+ </fix>
</changelog>
</subsection>
1.4 +14 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java
Index: AntCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntCompiler.java 12 Sep 2004 20:47:27 -0000 1.3
+++ AntCompiler.java 21 Sep 2004 19:36:12 -0000 1.4
@@ -155,6 +155,20 @@
javac.setExtdirs(extdirs);
info.append(" extension dir=" + exts + "\n");
}
+
+ // Add endorsed directories if any are specified and we're forking
+ // See Bugzilla 31257
+ if(ctxt.getOptions().getFork()) {
+ String endorsed = System.getProperty("java.endorsed.dirs");
+ if(endorsed != null) {
+ Javac.ImplementationSpecificArgument endorsedArg =
+ javac.createCompilerArg();
+ endorsedArg.setLine("-J-Djava.endorsed.dirs="+endorsed);
+ info.append(" endorsed dir=" + endorsed + "\n");
+ } else {
+ info.append(" no endorsed dirs specified\n");
+ }
+ }
// Configure the compiler object
javac.setEncoding(javaEncoding);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
