View | Details | Raw Unified | Return to bug 54239
Collapse All | Expand All

(-)compiler/Generator.java (-5 / +12 lines)
Lines 124-129 Link Here
124
    private GenBuffer charArrayBuffer;
124
    private GenBuffer charArrayBuffer;
125
    
125
    
126
    private final DateFormat timestampFormat;
126
    private final DateFormat timestampFormat;
127
    
128
    private ELInterpreter elInterpreter;
127
129
128
    /**
130
    /**
129
     * @param s
131
     * @param s
Lines 831-837 Link Here
831
                }
833
                }
832
                return v;
834
                return v;
833
            } else if (attr.isELInterpreterInput()) {
835
            } else if (attr.isELInterpreterInput()) {
834
                v = JspUtil.interpreterCall(this.isTagFile, v, expectedType,
836
                v = elInterpreter.interpreterCall(ctxt, this.isTagFile, v, expectedType,
835
                        attr.getEL().getMapName(), false);
837
                        attr.getEL().getMapName(), false);
836
                if (encode) {
838
                if (encode) {
837
                    return "org.apache.jasper.runtime.JspRuntimeLibrary.URLEncode("
839
                    return "org.apache.jasper.runtime.JspRuntimeLibrary.URLEncode("
Lines 917-923 Link Here
917
            n.setBeginJavaLine(out.getJavaLine());
919
            n.setBeginJavaLine(out.getJavaLine());
918
            if (!pageInfo.isELIgnored() && (n.getEL() != null)) {
920
            if (!pageInfo.isELIgnored() && (n.getEL() != null)) {
919
                out.printil("out.write("
921
                out.printil("out.write("
920
                        + JspUtil.interpreterCall(this.isTagFile, n.getType() +
922
                        + elInterpreter.interpreterCall(ctxt, this.isTagFile, n.getType() +
921
                                "{" + n.getText() + "}", String.class,
923
                                "{" + n.getText() + "}", String.class,
922
                                n.getEL().getMapName(), false) + ");");
924
                                n.getEL().getMapName(), false) + ");");
923
            } else {
925
            } else {
Lines 2977-2983 Link Here
2977
                    // run attrValue through the expression interpreter
2979
                    // run attrValue through the expression interpreter
2978
                    String mapName = (attr.getEL() != null) ? attr.getEL()
2980
                    String mapName = (attr.getEL() != null) ? attr.getEL()
2979
                            .getMapName() : null;
2981
                            .getMapName() : null;
2980
                    attrValue = JspUtil.interpreterCall(this.isTagFile, attrValue,
2982
                    attrValue = elInterpreter.interpreterCall(ctxt, this.isTagFile, attrValue,
2981
                            c[0], mapName, false);
2983
                            c[0], mapName, false);
2982
                }
2984
                }
2983
            } else {
2985
            } else {
Lines 3416-3422 Link Here
3416
    /**
3418
    /**
3417
     * Constructor.
3419
     * Constructor.
3418
     */
3420
     */
3419
    Generator(ServletWriter out, Compiler compiler) {
3421
    Generator(ServletWriter out, Compiler compiler) throws JasperException{
3420
        this.out = out;
3422
        this.out = out;
3421
        methodsBuffered = new ArrayList<GenBuffer>();
3423
        methodsBuffered = new ArrayList<GenBuffer>();
3422
        charArrayBuffer = null;
3424
        charArrayBuffer = null;
Lines 3424-3430 Link Here
3424
        ctxt = compiler.getCompilationContext();
3426
        ctxt = compiler.getCompilationContext();
3425
        fragmentHelperClass = new FragmentHelperClass("Helper");
3427
        fragmentHelperClass = new FragmentHelperClass("Helper");
3426
        pageInfo = compiler.getPageInfo();
3428
        pageInfo = compiler.getPageInfo();
3427
3429
        try {
3430
			elInterpreter = ELInterpreterFactory.getELInterpreter(compiler.getCompilationContext().getServletContext());
3431
		} catch (Exception e) {
3432
			err.jspError("jsp.error.el_interpreter_class.instantiation", e.getMessage());
3433
		}
3434
        
3428
        /*
3435
        /*
3429
         * Temporary hack. If a JSP page uses the "extends" attribute of the
3436
         * Temporary hack. If a JSP page uses the "extends" attribute of the
3430
         * page directive, the _jspInit() method of the generated servlet class
3437
         * page directive, the _jspInit() method of the generated servlet class
(-)resources/LocalStrings.properties (+4 lines)
Lines 492-494 Link Here
492
492
493
jsp.tldCache.noTldInJar=No TLD files were found in [{0}]. Consider adding the JAR to the tomcat.util.scan.DefaultJarScanner.jarsToSkip or org.apache.catalina.startup.TldConfig.jarsToSkip property in CATALINA_BASE/conf/catalina.properties file.
493
jsp.tldCache.noTldInJar=No TLD files were found in [{0}]. Consider adding the JAR to the tomcat.util.scan.DefaultJarScanner.jarsToSkip or org.apache.catalina.startup.TldConfig.jarsToSkip property in CATALINA_BASE/conf/catalina.properties file.
494
jsp.tldCache.noTldSummary=At least one JAR was scanned for TLDs yet contained no TLDs. Enable debug logging for this logger for a complete list of JARs that were scanned but no TLDs were found in them. Skipping unneeded JARs during scanning can improve startup time and JSP compilation time.
494
jsp.tldCache.noTldSummary=At least one JAR was scanned for TLDs yet contained no TLDs. Enable debug logging for this logger for a complete list of JARs that were scanned but no TLDs were found in them. Skipping unneeded JARs during scanning can improve startup time and JSP compilation time.
495
496
497
#ELInterpreter
498
jsp.error.el_interpreter_class.instantiation=Failed to load or instantiate ELInterpreter class: {0}
(-)resources/LocalStrings_es.properties (+3 lines)
Lines 480-482 Link Here
480
xmlParser.skipBomFail = No pude saltar BOM al analizar flujo de entrada XML 
480
xmlParser.skipBomFail = No pude saltar BOM al analizar flujo de entrada XML 
481
jsp.tldCache.noTldInJar = No se han hallado ficheros TLD en [{0}]. Considera a\u00F1adir el JAR a la propiedad tomcat.util.scan.DefaultJarScanner.jarsToSkip en el fichero  CATALINA_BASE/conf/catalina.propeperties.
481
jsp.tldCache.noTldInJar = No se han hallado ficheros TLD en [{0}]. Considera a\u00F1adir el JAR a la propiedad tomcat.util.scan.DefaultJarScanner.jarsToSkip en el fichero  CATALINA_BASE/conf/catalina.propeperties.
482
jsp.tldCache.noTldSummary = Al menos un JAR, que se ha explorado buscando TLDs, a\u00FAn no conten\u00EDa TLDs. Activar historial de depuraci\u00F3n para este historiador para una completa lista de los JARs que fueron explorados y de los que nos se hall\u00F3 TLDs. Saltarse JARs no necesarios durante la exploraci\u00F3n puede dar lugar a una mejora de tiempo significativa en el arranque y compilaci\u00F3n de JSP .
482
jsp.tldCache.noTldSummary = Al menos un JAR, que se ha explorado buscando TLDs, a\u00FAn no conten\u00EDa TLDs. Activar historial de depuraci\u00F3n para este historiador para una completa lista de los JARs que fueron explorados y de los que nos se hall\u00F3 TLDs. Saltarse JARs no necesarios durante la exploraci\u00F3n puede dar lugar a una mejora de tiempo significativa en el arranque y compilaci\u00F3n de JSP .
483
484
#ELInterpreter
485
jsp.error.el_interpreter_class.instantiation=No se puede cargar la clase ELInterpreter llamada\: {0}
(-)resources/LocalStrings_fr.properties (+3 lines)
Lines 314-316 Link Here
314
#jsp.error.jspoutput.nonemptybody=
314
#jsp.error.jspoutput.nonemptybody=
315
#jsp.error.jspoutput.invalidUse=
315
#jsp.error.jspoutput.invalidUse=
316
#jsp.error.invalid.bean=
316
#jsp.error.invalid.bean=
317
318
#ELInterpreter
319
jsp.error.el_interpreter_class.instantiation=Impossible de charger ou d''instancier la classe ELInterpreter: {0}
(-)resources/LocalStrings_ja.properties (+2 lines)
Lines 415-417 Link Here
415
jsp.error.invalid.bean=useBean\u306e\u30af\u30e9\u30b9\u5c5e\u6027 {0} \u306e\u5024\u304c\u7121\u52b9\u3067\u3059
415
jsp.error.invalid.bean=useBean\u306e\u30af\u30e9\u30b9\u5c5e\u6027 {0} \u306e\u5024\u304c\u7121\u52b9\u3067\u3059
416
jsp.error.prefix.use_before_dcl=\u3053\u306e\u30bf\u30b0\u6307\u793a\u5b50\u3067\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d7\u30ea\u30d5\u30a3\u30c3\u30af\u30b9 {0} \u306f\u3001\u3059\u3067\u306b\u30d5\u30a1\u30a4\u30eb {1} \u306e {2} \u884c\u76ee\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3067\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059
416
jsp.error.prefix.use_before_dcl=\u3053\u306e\u30bf\u30b0\u6307\u793a\u5b50\u3067\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d7\u30ea\u30d5\u30a3\u30c3\u30af\u30b9 {0} \u306f\u3001\u3059\u3067\u306b\u30d5\u30a1\u30a4\u30eb {1} \u306e {2} \u884c\u76ee\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3067\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059
417
417
418
#ELInterpreter
419
jsp.error.el_interpreter_class.instantiation=ELInterpreter class\u306e\u30ed\u30fc\u30c9\u53c8\u306f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}

Return to bug 54239