yoavs 2004/09/21 12:45:09
Modified: webapps/docs Tag: TOMCAT_5_0 changelog.xml
jasper2/src/share/org/apache/jasper/compiler Tag: TOMCAT_5_0
Compiler.java
Log:
Bugzilla 31257: specification of endorsed dirs for compiler.
Revision Changes Path
No revision
No revision
1.70.2.39 +4 -1 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.70.2.38
retrieving revision 1.70.2.39
diff -u -r1.70.2.38 -r1.70.2.39
--- changelog.xml 20 Sep 2004 18:29:05 -0000 1.70.2.38
+++ changelog.xml 21 Sep 2004 19:45:08 -0000 1.70.2.39
@@ -104,7 +104,10 @@
</fix>
<fix>
<bug>31171</bug>: Wrap to avoid ClassCastException in PageContextImpl.
(yoavs)
- </fix>
+ </fix>
+ <fix>
+ <bug>31257</bug>: Added specification of endorsed dirs if forking. (yoavs)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
No revision
No revision
1.88.2.3 +14 -0
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.88.2.2
retrieving revision 1.88.2.3
diff -u -r1.88.2.2 -r1.88.2.3
--- Compiler.java 12 Sep 2004 20:46:23 -0000 1.88.2.2
+++ Compiler.java 21 Sep 2004 19:45:09 -0000 1.88.2.3
@@ -351,6 +351,20 @@
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);
javac.setClasspath(path);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
