tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@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 Mon, 24 Feb 2003 19:39:39 GMT
kinman      2003/02/24 11:39:39

  Modified:    jasper2/src/share/org/apache/jasper
                        EmbededServletOptions.java JspC.java Options.java
               jasper2/src/share/org/apache/jasper/compiler Compiler.java
               jasper2/src/share/org/apache/jasper/resources
                        messages.properties messages_es.properties
                        messages_fr.properties messages_ja.properties
  Log:
  - Add option to suppress the generation of Smap.  Defaulted to false for
    Embedded compilation, and to true for Jspc.
  
  Revision  Changes    Path
  1.19      +28 -3     jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- EmbededServletOptions.java	22 Jan 2003 20:08:23 -0000	1.18
  +++ EmbededServletOptions.java	24 Feb 2003 19:39:38 -0000	1.19
  @@ -152,6 +152,11 @@
       private boolean reloading = true;
   
       /**
  +     * Is the generation of SMAP info for JSR45 debuggin suppressed?
  +     */
  +    private boolean suppressSmap = false;
  +
  +    /**
        * I want to see my generated servlets. Which directory are they
        * in?
        */
  @@ -271,6 +276,13 @@
       }
   
       /**
  +     * Is the generation of SMAP info for JSR45 debuggin suppressed?
  +     */
  +    public boolean suppressSmap() {
  +        return suppressSmap;
  +    }
  +
  +    /**
        * Class ID for use in the plugin tag when the browser is IE. 
        */
       public String getIeClassId() {
  @@ -484,6 +496,19 @@
   		    log.warn(Localizer.getMessage("jsp.warning.reloading"));
   		}
   	    }
  +        }
  +
  +        String suppressSmap = config.getInitParameter("suppressSmap");
  +        if (suppressSmap != null) {
  +            if (suppressSmap.equalsIgnoreCase("true")) {
  +                this.suppressSmap = true;
  +            } else if (suppressSmap.equalsIgnoreCase("false")) {
  +                this.suppressSmap = false;
  +            } else {
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.suppressSmap"));
  +                }
  +            }
           }
   
           String ieClassId = config.getInitParameter("ieClassId");
  
  
  
  1.32      +10 -3     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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- JspC.java	23 Feb 2003 22:25:53 -0000	1.31
  +++ JspC.java	24 Feb 2003 19:39:38 -0000	1.32
  @@ -273,6 +273,13 @@
           return true;
       }
   
  +    /**
  +     * Is the generation of SMAP info for JSR45 debuggin suppressed?
  +     */
  +    public boolean suppressSmap() {
  +	return true;
  +    }
  +
       public String getIeClassId() {
           return ieClassId;
       }
  
  
  
  1.12      +8 -3      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java
  
  Index: Options.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Options.java	31 Dec 2002 14:01:17 -0000	1.11
  +++ Options.java	24 Feb 2003 19:39:38 -0000	1.12
  @@ -130,6 +130,11 @@
       public boolean getReloading();
   
       /**
  +     * Is the generation of SMAP info for JSR45 debuggin suppressed?
  +     */
  +    public boolean suppressSmap();
  +
  +    /**
        * Class ID for use in the plugin tag when the browser is IE. 
        */
       public String getIeClassId();
  
  
  
  1.54      +6 -2      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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Compiler.java	17 Feb 2003 22:36:00 -0000	1.53
  +++ Compiler.java	24 Feb 2003 19:39:39 -0000	1.54
  @@ -288,7 +288,9 @@
           }
           
           //JSR45 Support - note this needs to be checked by a JSR45 guru
  -	SmapUtil.generateSmap(ctxt, pageNodes, true);
  +        if (! options.suppressSmap()) {
  +            SmapUtil.generateSmap(ctxt, pageNodes, true);
  +        }
   
   	// If any proto type .java and .class files was generated,
   	// the prototype .java may have been replaced by the current
  @@ -412,7 +414,9 @@
   	}
   
           //JSR45 Support - note this needs to be checked by a JSR45 guru
  -	SmapUtil.installSmap(ctxt);
  +        if (! options.suppressSmap()) {
  +            SmapUtil.installSmap(ctxt);
  +        }
       }
   
       /** 
  
  
  
  1.96      +2 -1      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- messages.properties	24 Feb 2003 18:09:38 -0000	1.95
  +++ messages.properties	24 Feb 2003 19:39:39 -0000	1.96
  @@ -136,6 +136,7 @@
   jsp.warning.development=Warning: Invalid value for the initParam development. Will use
the default value of \"true\"
   jsp.warning.fork=Warning: Invalid value for the initParam fork. Will use the default value
of \"true\"
   jsp.warning.reloading=Warning: Invalid value for the initParam reloading. Will use the
default value of \"true\"
  +jsp.warning.suppressSmap=Warning: Invalid value for the initParam suppressSmap. Will use
the default value of \"false\"
   jsp.error.badtaglib=Unable to open taglibrary {0} : {1}
   jsp.error.badGetReader=Cannot create a reader when the stream is not buffered
   jsp.warning.unknown.element.in.taglib=Unknown element ({0}) in taglib
  
  
  
  1.34      +2 -1      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
  
  Index: messages_es.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- messages_es.properties	3 Feb 2003 20:33:36 -0000	1.33
  +++ messages_es.properties	24 Feb 2003 19:39:39 -0000	1.34
  @@ -98,6 +98,7 @@
   jsp.warning.largeFile=Aviso: valor incorrecto para el initParam largeFile. se usara el
valor por defecto de \"true\"
   jsp.warning.enablePooling=Aviso: valor incorrecto para el initParam enablePooling. se usara
el valor por defecto de \"true\"
   jsp.warning.mappedFile=Aviso: valor incorrecto para the initParam mappedFile. se usara
el valor por defecto de \"false\"
  +jsp.warning.reloading=
   jsp.warning.sendErrToClient=Aviso: valor incorrecto para the initParam sendErrToClient.
se usara el valor por defecto de \"false\"
   jsp.warning.classDebugInfo=Aviso: valor incorrecto para the initParam classdebuginfo. se
usara el valor por defecto de \"false\"
   jsp.error.badtaglib=No se puede abrir la libreria de tags {0} : {1}
  
  
  
  1.18      +2 -1      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
  
  Index: messages_fr.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- messages_fr.properties	3 Feb 2003 20:33:36 -0000	1.17
  +++ messages_fr.properties	24 Feb 2003 19:39:39 -0000	1.18
  @@ -123,6 +123,7 @@
   jsp.warning.checkInterval=Attention: Valeur incorrecte pour le initParam checkInterval.
Utilisation de la valeur par défaut \"300\" secondes
   jsp.warning.development=Attention: Valeur incorrecte pour le initParam development. Utilisation
de la valeur par défaut \"true\"
   jsp.warning.reloading=Attention: Valeur incorrecte pour le initParam reloading. Utilisation
de la valeur par défaut \"true\"
  +jsp.warning.reloading=
   jsp.error.badtaglib=Impossible d''ouvrir le taglibrary {0} : {1}
   jsp.error.badGetReader=Impossible de créer un lecteur (reader) quand le flux n''utilse
pas des tampons (not buffered)
   jsp.warning.unknown.element.in.TLD=Attention: Elément inconnu {0} dans le TLD
  
  
  
  1.34      +2 -1      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
  
  Index: messages_ja.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- messages_ja.properties	3 Feb 2003 20:33:36 -0000	1.33
  +++ messages_ja.properties	24 Feb 2003 19:39:39 -0000	1.34
  @@ -110,6 +110,7 @@
   jsp.warning.largeFile=\u8b66\u544a: initParam largeFile\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024
\"true\" \u3092\u4f7f\u7528\u3057\u307e\u3059
   jsp.warning.enablePooling=\u8b66\u544a: initParam enablePooling\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024
\"true\" \u3092\u4f7f\u7528\u3057\u307e\u3059
   jsp.warning.mappedFile=\u8b66\u544a: initParam mappedFile\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024
\"false\" \u3092\u4f7f\u7528\u3057\u307e\u3059
  +jsp.warning.reloading=
   jsp.warning.sendErrToClient=\u8b66\u544a: initParam sendErrToClient\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024
\"false\" \u3092\u4f7f\u7528\u3057\u307e\u3059
   jsp.warning.classDebugInfo=\u8b66\u544a: initParam classdebuginfo\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024
\"false\"\u3092\u4f7f\u7528\u3057\u307e\u3059
   jsp.error.badtaglib=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {0} \u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093:
{1}
  
  
  

---------------------------------------------------------------------
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