yoavs 2004/11/19 06:30:22
Modified: webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper JspC.java
jasper2/src/share/org/apache/jasper/resources
LocalStrings.properties LocalStrings_es.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
Log:
Undoing my fix allowing for customizable extensions, after tomcat-dev
discussion.
Revision Changes Path
1.172 +0 -3 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.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- changelog.xml 18 Nov 2004 14:51:35 -0000 1.171
+++ changelog.xml 19 Nov 2004 14:30:21 -0000 1.172
@@ -58,9 +58,6 @@
<subsection name="Jasper">
<changelog>
<update>
- <bug>32257</bug>: Added ability to customize JSP file extensions in
JspC. (yoavs)
- </update>
- <update>
Updated JspC usage messages to include recently added configurable
parameters. (yoavs)
</update>
</changelog>
1.89 +1 -4
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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- JspC.java 18 Nov 2004 14:23:55 -0000 1.88
+++ JspC.java 19 Nov 2004 14:30:22 -0000 1.89
@@ -114,7 +114,6 @@
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_ADD_EXTENSION = "-addExtension";
private static final String SHOW_SUCCESS ="-s";
private static final String LIST_ERRORS = "-l";
@@ -294,8 +293,6 @@
setCompilerSourceVM(nextArg());
} else if (tok.equals(SWITCH_TARGET)) {
setCompilerTargetVM(nextArg());
- } else if (tok.equals(SWITCH_ADD_EXTENSION)) {
- addExtension(nextArg());
} else {
if (tok.startsWith("-")) {
throw new JasperException("Unrecognized option: " + tok +
@@ -564,7 +561,7 @@
*
* @param extension The extension to add, e.g. "myjsp"
*/
- public void addExtension(final String extension) {
+ protected void addExtension(final String extension) {
if(extension != null) {
if(extensions == null) {
extensions = new Vector();
1.7 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocalStrings.properties 18 Nov 2004 14:23:55 -0000 1.6
+++ LocalStrings.properties 19 Nov 2004 14:30:22 -0000 1.7
@@ -231,7 +231,6 @@
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
\ -source <version> Set the -source argument to the compiler (default
1.4)\n\
\ -target <version> Set the -target argument to the compiler (default
1.4)\n\
-\ -addExtension <ext> Add a file extension for JSP processing, e.g
"myjsp"\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
1.4 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties
Index: LocalStrings_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings_es.properties 18 Nov 2004 14:41:20 -0000 1.3
+++ LocalStrings_es.properties 19 Nov 2004 14:30:22 -0000 1.4
@@ -231,7 +231,6 @@
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
\ -source <version> Set the -source argument to the compiler (default
1.4)\n\
\ -target <version> Set the -target argument to the compiler (default
1.4)\n\
-\ -addExtension <ext> Add a file extension for JSP processing, e.g
"myjsp"\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
1.4 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings_fr.properties 18 Nov 2004 14:41:20 -0000 1.3
+++ LocalStrings_fr.properties 19 Nov 2004 14:30:22 -0000 1.4
@@ -185,7 +185,6 @@
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
\ -source <version> Set the -source argument to the compiler (default
1.4)\n\
\ -target <version> Set the -target argument to the compiler (default
1.4)\n\
-\ -addExtension <ext> Add a file extension for JSP processing, e.g
"myjsp"\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
1.4 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings_ja.properties 18 Nov 2004 14:41:20 -0000 1.3
+++ LocalStrings_ja.properties 19 Nov 2004 14:30:22 -0000 1.4
@@ -228,7 +228,6 @@
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
\ -source <version> Set the -source argument to the compiler (default
1.4)\n\
\ -target <version> Set the -target argument to the compiler (default
1.4)\n\
-\ -addExtension <ext> Add a file extension for JSP processing, e.g
"myjsp"\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
