remm 2005/04/29 10:18:22
Modified: webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper JspC.java
Log:
- 34652: Allow setting smap related options in jspc.
Revision Changes Path
1.295 +4 -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.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- changelog.xml 28 Apr 2005 18:55:57 -0000 1.294
+++ changelog.xml 29 Apr 2005 17:18:21 -0000 1.295
@@ -154,6 +154,10 @@
<update>
Java 5 will be the source and target for JSPs when running on Java 5
(remm)
</update>
+ <update>
+ <bug>34652</bug>: Add the ability to get SMAPs when precompiling,
submitted by
+ Daryl Robbins (remm)
+ </update>
</changelog>
</subsection>
1.96 +26 -2
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.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- JspC.java 29 Mar 2005 21:43:37 -0000 1.95
+++ JspC.java 29 Apr 2005 17:18:22 -0000 1.96
@@ -114,6 +114,8 @@
private static final String SWITCH_DIE = "-die";
private static final String SWITCH_POOLING = "-poolingEnabled";
private static final String SWITCH_ENCODING = "-javaEncoding";
+ private static final String SWITCH_SMAP = "-smap";
+ private static final String SWITCH_DUMP_SMAP = "-dumpsmap";
private static final String SHOW_SUCCESS ="-s";
private static final String LIST_ERRORS = "-l";
@@ -147,6 +149,8 @@
private int dieLevel;
private boolean helpNeeded = false;
private boolean compile = false;
+ private boolean smapSuppressed = true;
+ private boolean smapDumped = false;
private String compiler = null;
@@ -293,6 +297,10 @@
setCompilerSourceVM(nextArg());
} else if (tok.equals(SWITCH_TARGET)) {
setCompilerTargetVM(nextArg());
+ } else if (tok.equals(SWITCH_SMAP)) {
+ smapSuppressed = false;
+ } else if (tok.equals(SWITCH_DUMP_SMAP)) {
+ smapDumped = true;
} else {
if (tok.startsWith("-")) {
throw new JasperException("Unrecognized option: " + tok +
@@ -406,16 +414,32 @@
* Is the generation of SMAP info for JSR45 debuggin suppressed?
*/
public boolean isSmapSuppressed() {
- return true;
+ return smapSuppressed;
+ }
+
+ /**
+ * Set smapSuppressed flag.
+ */
+ public void setSmapSuppressed(boolean smapSuppressed) {
+ this.smapSuppressed = smapSuppressed;
}
+
/**
* Should SMAP info for JSR45 debugging be dumped to a file?
*/
public boolean isSmapDumped() {
- return false;
+ return smapDumped;
+ }
+
+ /**
+ * Set smapSuppressed flag.
+ */
+ public void setSmapDumped(boolean smapDumped) {
+ this.smapDumped = smapDumped;
}
+
/**
* Determines whether text strings are to be generated as char arrays,
* which improves performance in some cases.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
