tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
Date Fri, 19 Nov 2004 14:37:48 GMT
yoavs       2004/11/19 06:37:48

  Modified:    webapps/docs Tag: TOMCAT_5_0 changelog.xml
               jasper2/src/share/org/apache/jasper Tag: TOMCAT_5_0
                        JspC.java
               jasper2/src/share/org/apache/jasper/resources Tag:
                        TOMCAT_5_0 messages.properties
                        messages_es.properties messages_fr.properties
                        messages_ja.properties
  Log:
  Undoing my fix allowing for customizable extensions, after tomcat-dev discussion.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.70.2.76 +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.70.2.75
  retrieving revision 1.70.2.76
  diff -u -r1.70.2.75 -r1.70.2.76
  --- changelog.xml	18 Nov 2004 22:22:02 -0000	1.70.2.75
  +++ changelog.xml	19 Nov 2004 14:37:47 -0000	1.70.2.76
  @@ -87,9 +87,6 @@
           Exposed compilerSourceVM and compilerTargetVM options to JspC. (yoavs)
         </update>
         <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>
  
  
  
  No                   revision
  No                   revision
  1.80.2.5  +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.80.2.4
  retrieving revision 1.80.2.5
  diff -u -r1.80.2.4 -r1.80.2.5
  --- JspC.java	18 Nov 2004 14:38:16 -0000	1.80.2.4
  +++ JspC.java	19 Nov 2004 14:37:47 -0000	1.80.2.5
  @@ -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";
  @@ -293,8 +292,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 +
  @@ -566,7 +563,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(); 
  
  
  
  No                   revision
  No                   revision
  1.146.2.2 +1 -2      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages.properties,v
  retrieving revision 1.146.2.1
  retrieving revision 1.146.2.2
  diff -u -r1.146.2.1 -r1.146.2.2
  --- messages.properties	18 Nov 2004 14:38:16 -0000	1.146.2.1
  +++ messages.properties	19 Nov 2004 14:37:47 -0000	1.146.2.2
  @@ -230,7 +230,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.50.2.2  +1 -2      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages_es.properties
  
  Index: messages_es.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages_es.properties,v
  retrieving revision 1.50.2.1
  retrieving revision 1.50.2.2
  diff -u -r1.50.2.1 -r1.50.2.2
  --- messages_es.properties	18 Nov 2004 14:38:16 -0000	1.50.2.1
  +++ messages_es.properties	19 Nov 2004 14:37:48 -0000	1.50.2.2
  @@ -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.33.2.2  +1 -2      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages_fr.properties
  
  Index: messages_fr.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages_fr.properties,v
  retrieving revision 1.33.2.1
  retrieving revision 1.33.2.2
  diff -u -r1.33.2.1 -r1.33.2.2
  --- messages_fr.properties	18 Nov 2004 14:38:16 -0000	1.33.2.1
  +++ messages_fr.properties	19 Nov 2004 14:37:48 -0000	1.33.2.2
  @@ -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.53.2.3  +1 -2      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages_ja.properties
  
  Index: messages_ja.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages_ja.properties,v
  retrieving revision 1.53.2.2
  retrieving revision 1.53.2.3
  diff -u -r1.53.2.2 -r1.53.2.3
  --- messages_ja.properties	18 Nov 2004 14:38:16 -0000	1.53.2.2
  +++ messages_ja.properties	19 Nov 2004 14:37:48 -0000	1.53.2.3
  @@ -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: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message