You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by lu...@apache.org on 2003/07/21 22:44:21 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime HttpJspBase.java
luehe 2003/07/21 13:44:21
Modified: jasper2 build.xml
jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java PageInfo.java Parser.java
Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
jasper2/src/share/org/apache/jasper/runtime HttpJspBase.java
Log:
Hide all taglib and XML namespace management in PageInfo
Revision Changes Path
1.24 +3 -3 jakarta-tomcat-jasper/jasper2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 23 Jun 2003 19:35:59 -0000 1.23
+++ build.xml 21 Jul 2003 20:44:20 -0000 1.24
@@ -19,9 +19,8 @@
<property name="test.runner" value="junit.textui.TestRunner"/>
<property name="tools.jar" value="${java.home}/lib/tools.jar"/>
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
- <property name="servlet-api.jar" value="${api.home}/jsr154/dist/lib/servlet-api.jar"/>
- <property name="jsp-api.jar" value="${api.home}/jsr152/dist/lib/jsp-api.jar"/>
-
+ <property name="servlet-api.jar" value="${api.home}/servlet-api-2.4/lib/servlet-api.jar"/>
+ <property name="jsp-api.jar" value="${api.home}/jsp-api-2.0/lib/jsp-api.jar"/>
<!-- Construct Jasper classpath -->
<path id="jasper.classpath">
@@ -36,6 +35,7 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-daemon-launcher.jar}"/>
+ <pathelement location="${jasper.build}/shared/classes"/>
<pathelement location="${jasper.build}/shared/classes"/>
</path>
1.60 +22 -10 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- JspDocumentParser.java 11 May 2003 22:54:47 -0000 1.59
+++ JspDocumentParser.java 21 Jul 2003 20:44:20 -0000 1.60
@@ -102,8 +102,6 @@
// Document locator
private Locator locator;
- private HashMap taglibs;
-
// Flag indicating whether we are inside DTD declarations
private boolean inDTD;
@@ -123,7 +121,6 @@
this.parserController = pc;
this.ctxt = pc.getJspCompilationContext();
this.pageInfo = pc.getCompiler().getPageInfo();
- this.taglibs = this.pageInfo.getTagLibraries();
this.err = pc.getCompiler().getErrorDispatcher();
this.path = path;
this.inputSource = new InputSource(inStream);
@@ -268,7 +265,7 @@
isTaglib = true;
} else {
String attrUri = attrs.getValue(i);
- if (!taglibs.containsKey(attrUri)) {
+ if (!pageInfo.hasTaglib(attrUri)) {
TagLibraryInfo tagLibInfo = null;
try {
tagLibInfo = getTaglibInfo(attrQName, attrUri);
@@ -280,7 +277,7 @@
if (tagLibInfo != null) {
isTaglib = true;
}
- taglibs.put(attrUri, tagLibInfo);
+ pageInfo.addTaglib(attrUri, tagLibInfo);
}
}
if (isTaglib) {
@@ -555,7 +552,22 @@
throw e;
}
-
+ /*
+ * Receives notification of the start of a Namespace mapping.
+ */
+ public void startPrefixMapping(String prefix, String uri)
+ throws SAXException {
+ // XXX
+ }
+
+ /*
+ * Receives notification of the end of a Namespace mapping.
+ */
+ public void endPrefixMapping(String prefix) throws SAXException {
+ // XXX
+ }
+
+
//*********************************************************************
// Private utility methods
@@ -732,7 +744,7 @@
Node parent) throws SAXException {
// Check if this is a user-defined (custom) tag
- TagLibraryInfo tagLibInfo = (TagLibraryInfo) taglibs.get(uri);
+ TagLibraryInfo tagLibInfo = pageInfo.getTaglib(uri);
if (tagLibInfo == null) {
return null;
}
1.30 +70 -14 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
Index: PageInfo.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- PageInfo.java 9 Apr 2003 00:23:51 -0000 1.29
+++ PageInfo.java 21 Jul 2003 20:44:20 -0000 1.30
@@ -63,6 +63,7 @@
import java.util.*;
import org.apache.jasper.Constants;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
/**
* A repository for various info about the translation unit under compilation.
@@ -169,17 +170,6 @@
return beanRepository;
}
- public HashMap getTagLibraries() {
- return taglibsMap;
- }
-
- /*
- * Returns the prefix-to-URI mapper.
- */
- public Hashtable getPrefixMapper() {
- return prefixMapper;
- }
-
public String getLanguage() {
return language;
}
@@ -348,6 +338,9 @@
omitXmlDecl = omit;
}
+
+ /* Tag library and XML namespace management methods */
+
public void setIsJspPrefixHijacked(boolean isHijacked) {
isJspPrefixHijacked = isHijacked;
}
@@ -369,10 +362,73 @@
* Checks to see if this translation unit contains the given prefix.
*
* @param prefix The prefix to check
+ *
* @return true if this translation unit contains the given prefix, false
* otherwise
*/
public boolean containsPrefix(String prefix) {
return prefixes.contains(prefix);
}
+
+ /*
+ * Maps the given URI to the given tag library.
+ *
+ * @param uri The URI to map
+ * @param info The tag library to be associated with the given URI
+ */
+ public void addTaglib(String uri, TagLibraryInfo info) {
+ taglibsMap.put(uri, info);
+ }
+
+ /*
+ * Gets the tag library corresponding to the given URI.
+ *
+ * @return Tag library corresponding to the given URI
+ */
+ public TagLibraryInfo getTaglib(String uri) {
+ return (TagLibraryInfo) taglibsMap.get(uri);
+ }
+
+ /*
+ * Gets the collection of tag libraries that are associated with a URI
+ *
+ * @return Collection of tag libraries that are associated with a URI
+ */
+ public Collection getTaglibs() {
+ return taglibsMap.values();
+ }
+
+ /*
+ * Checks to see if the given URI is mapped to a tag library.
+ *
+ * @param uri The URI to map
+ *
+ * @return true if the given URI is mapped to a tag library, false
+ * otherwise
+ */
+ public boolean hasTaglib(String uri) {
+ return taglibsMap.containsKey(uri);
+ }
+
+ /*
+ * Maps the given prefix to the given URI.
+ *
+ * @param prefix The prefix to map
+ * @param uri The URI to be associated with the given prefix
+ */
+ public void addPrefixToURIMapping(String prefix, String uri) {
+ prefixMapper.put(prefix, uri);
+ }
+
+ /*
+ * Maps the given prefix to its URI.
+ *
+ * @param prefix The prefix to map
+ *
+ * @return The URI to which the given prefix maps
+ */
+ public String getURI(String prefix) {
+ return (String) prefixMapper.get(prefix);
+ }
+
}
1.76 +26 -24 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Parser.java 30 May 2003 20:16:19 -0000 1.75
+++ Parser.java 21 Jul 2003 20:44:20 -0000 1.76
@@ -96,13 +96,12 @@
private JspReader reader;
private String currentFile;
private Mark start;
- private HashMap taglibs;
- private Hashtable prefixMapper;
private ErrorDispatcher err;
private int scriptlessCount;
private boolean isTagFile;
private boolean directivesOnly;
private URL jarFileUrl;
+ private PageInfo pageInfo;
// Virtual body content types, to make parsing a little easier.
// These are not accessible from outside the parser.
@@ -120,8 +119,7 @@
boolean directivesOnly, URL jarFileUrl) {
this.parserController = pc;
this.ctxt = pc.getJspCompilationContext();
- this.taglibs = pc.getCompiler().getPageInfo().getTagLibraries();
- this.prefixMapper = pc.getCompiler().getPageInfo().getPrefixMapper();
+ this.pageInfo = pc.getCompiler().getPageInfo();
this.err = pc.getCompiler().getErrorDispatcher();
this.reader = reader;
this.currentFile = reader.mark().getFile();
@@ -228,7 +226,7 @@
int index = qName.indexOf(':');
if (index != -1) {
String prefix = qName.substring(0, index);
- uri = (String) prefixMapper.get(prefix);
+ uri = pageInfo.getURI(prefix);
if (uri == null) {
err.jspError(reader.mark(),
"jsp.error.attribute.invalidPrefix", prefix);
@@ -451,27 +449,31 @@
String prefix = attrs.getValue("prefix");
if (prefix != null) {
if (uri != null) {
- if (taglibs.get(uri) == null) {
+ if (pageInfo.getTaglib(uri) == null) {
String[] location = ctxt.getTldLocation(uri);
- taglibs.put(uri,
- new TagLibraryInfoImpl(ctxt, parserController,
- prefix, uri, location,
- err));
+ pageInfo.addTaglib(uri,
+ new TagLibraryInfoImpl(ctxt,
+ parserController,
+ prefix,
+ uri,
+ location,
+ err));
}
- prefixMapper.put(prefix, uri);
+ pageInfo.addPrefixToURIMapping(prefix, uri);
} else {
String tagdir = attrs.getValue("tagdir");
if (tagdir != null) {
String urnTagdir = URN_JSPTAGDIR + tagdir;
- if (taglibs.get(urnTagdir) == null) {
- taglibs.put(urnTagdir,
- new ImplicitTagLibraryInfo(ctxt,
- parserController,
- prefix,
- tagdir,
- err));
+ if (pageInfo.getTaglib(urnTagdir) == null) {
+ pageInfo.addTaglib(urnTagdir,
+ new ImplicitTagLibraryInfo(
+ ctxt,
+ parserController,
+ prefix,
+ tagdir,
+ err));
}
- prefixMapper.put(prefix, urnTagdir);
+ pageInfo.addPrefixToURIMapping(prefix, urnTagdir);
}
}
}
@@ -1327,13 +1329,13 @@
String shortTagName = tagName.substring(i+1);
// Check if this is a user-defined tag.
- String uri = (String) prefixMapper.get(prefix);
+ String uri = pageInfo.getURI(prefix);
if (uri == null) {
reader.reset(start);
return false;
}
- TagLibraryInfo tagLibInfo = (TagLibraryInfo) taglibs.get(uri);
+ TagLibraryInfo tagLibInfo = pageInfo.getTaglib(uri);
TagInfo tagInfo = tagLibInfo.getTag(shortTagName);
TagFileInfo tagFileInfo = tagLibInfo.getTagFile(shortTagName);
if (tagInfo == null && tagFileInfo == null) {
1.109 +15 -18 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- Validator.java 19 Jun 2003 21:06:30 -0000 1.108
+++ Validator.java 21 Jul 2003 20:44:20 -0000 1.109
@@ -66,6 +66,7 @@
import java.util.Hashtable;
import java.util.HashMap;
import java.util.Enumeration;
+import java.util.Iterator;
import javax.servlet.jsp.tagext.*;
import javax.servlet.jsp.el.FunctionMapper;
@@ -375,7 +376,6 @@
private ErrorDispatcher err;
private TagInfo tagInfo;
private ClassLoader loader;
- private HashMap taglibs;
private static final JspUtil.ValidAttribute[] jspRootAttrs = {
new JspUtil.ValidAttribute("version", true) };
@@ -454,7 +454,6 @@
*/
ValidateVisitor(Compiler compiler) {
this.pageInfo = compiler.getPageInfo();
- this.taglibs = pageInfo.getTagLibraries();
this.err = compiler.getErrorDispatcher();
this.tagInfo = compiler.getCompilationContext().getTagInfo();
this.loader = compiler.getCompilationContext().getClassLoader();
@@ -1247,8 +1246,7 @@
if (n.getRoot().isXmlSyntax()) {
uri = findUri(prefix, n);
} else if (prefix != null) {
- Hashtable prefixMapper = pageInfo.getPrefixMapper();
- uri = (String) prefixMapper.get(prefix);
+ uri = pageInfo.getURI(prefix);
}
if (uri == null) {
@@ -1261,7 +1259,7 @@
"jsp.error.attribute.invalidPrefix", prefix);
}
}
- TagLibraryInfo taglib = (TagLibraryInfo) taglibs.get(uri);
+ TagLibraryInfo taglib = pageInfo.getTaglib(uri);
FunctionInfo funcInfo = null;
if (taglib != null) {
funcInfo = taglib.getFunction(function);
@@ -1526,14 +1524,13 @@
StringBuffer errMsg = null;
ErrorDispatcher errDisp = compiler.getErrorDispatcher();
- Object[] objs
- = compiler.getPageInfo().getTagLibraries().values().toArray();
+ for (Iterator iter=compiler.getPageInfo().getTaglibs().iterator();
+ iter.hasNext(); ) {
- for (int i=0; i<objs.length; i++) {
-
- if (!(objs[i] instanceof TagLibraryInfoImpl))
+ Object o = iter.next();
+ if (!(o instanceof TagLibraryInfoImpl))
continue;
- TagLibraryInfoImpl tli = (TagLibraryInfoImpl) objs[i];
+ TagLibraryInfoImpl tli = (TagLibraryInfoImpl) o;
ValidationMessage[] errors = tli.validate(xmlView);
if ((errors != null) && (errors.length != 0)) {
@@ -1544,12 +1541,12 @@
errMsg.append(Localizer.getMessage("jsp.error.tlv.invalid.page",
tli.getShortName()));
errMsg.append("</h3>");
- for (int j=0; j<errors.length; j++) {
- if (errors[j] != null) {
+ for (int i=0; i<errors.length; i++) {
+ if (errors[i] != null) {
errMsg.append("<p>");
- errMsg.append(errors[j].getId());
+ errMsg.append(errors[i].getId());
errMsg.append(": ");
- errMsg.append(errors[j].getMessage());
+ errMsg.append(errors[i].getMessage());
errMsg.append("</p>");
}
}
1.122 +22 -15 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.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- messages.properties 16 Jul 2003 15:46:38 -0000 1.121
+++ messages.properties 21 Jul 2003 20:44:20 -0000 1.122
@@ -39,26 +39,35 @@
jsp.error.classname=Can't determine classname from .class file
jsp.warning.bad.type=Warning: bad type in .class file
jsp.error.data.file.write=Error while writing data file
-jsp.error.page.multiple.contenttypes=Page directive: can't have multiple occurrences of contentType
-#Page directive: invalid value for pageEncoding
+jsp.error.page.invalid.buffer=Page directive: invalid buffer size
+jsp.error.page.change.contenttype=Page directive: illegal to have multiple occurrences of 'contentType' with different values (old: {0}, new: {1})
jsp.error.page.invalid.contenttype=Page directive: invalid value for contentType
-jsp.error.page.multiple.session=Page directive: can't have multiple occurrences of session
+jsp.error.page.change.session=Page directive: illegal to have multiple occurrences of 'session' with different values (old: {0}, new: {1})
jsp.error.page.invalid.session=Page directive: invalid value for session
-jsp.error.page.multiple.buffer=Page directive: can't have multiple occurrences of buffer
+jsp.error.page.change.buffer=Page directive: illegal to have multiple occurrences of 'buffer' with different values (old: {0}, new: {1})
jsp.error.page.invalid.buffer=Page directive: invalid value for buffer
-jsp.error.page.multiple.autoflush=Page directive: can't have multiple occurrences of autoFlush
+jsp.error.page.change.autoflush=Page directive: illegal to have multiple occurrences of 'autoFlush' with different values (old: {0}, new: {1})
jsp.error.page.invalid.autoflush=Page directive: invalid value for autoFlush
-jsp.error.page.multiple.threadsafe=Page directive: can't have multiple occurrences of isThreadSafe
-jsp.error.page.invalid.threadsafe=Page directive: invalid value for isThreadSafe
-jsp.error.page.multiple.info=Page directive: can't have multiple occurrences of info
+jsp.error.page.change.isthreadsafe=Page directive: illegal to have multiple occurrences of 'isThreadSafe' with different values (old: {0}, new: {1})
+jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for isThreadSafe
+jsp.error.page.change.info=Page directive: illegal to have multiple occurrences of 'info' with different values (old: {0}, new: {1})
jsp.error.page.invalid.info=Page directive: invalid value for info
-jsp.error.page.multiple.iserrorpage=Page directive: can't have multiple occurrences of isErrorPage
+jsp.error.page.change.iserrorpage=Page directive: illegal to have multiple occurrences of 'isErrorPage' with different values (old: {0}, new: {1})
jsp.error.page.invalid.iserrorpage=Page directive: invalid value for isErrorPage
-jsp.error.page.multiple.errorpage=Page directive: can't have multiple occurrences of errorPage
-jsp.error.page.multiple.language=Page directive: can't have multiple occurrences of language
+jsp.error.page.change.errorpage=Page directive: illegal to have multiple occurrences of 'errorPage' with different values (old: {0}, new: {1})
+jsp.error.page.change.language=Page directive: illegal to have multiple occurrences of 'language' with different values (old: {0}, new: {1})
+jsp.error.tag.change.language=Tag directive: illegal to have multiple occurrences of 'language' with different values (old: {0}, new: {1})
+jsp.error.page.language.nonjava=Page directive: invalid language attribute
+jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
jsp.error.page.defafteruse.language=Page directive: can't define language after a scriptlet
jsp.error.page.nomapping.language=Page directive: No mapping for language:
-jsp.error.page.multiple.extends=Page directive: can't have multiple occurrences of extends
+jsp.error.page.change.extends=Page directive: illegal to have multiple occurrences of 'extends' with different values (old: {0}, new: {1})
+jsp.error.page.change.iselignored=Page directive: illegal to have multiple occurrences of 'isELIgnored' with different values (old: {0}, new: {1})
+jsp.error.tag.change.iselignored=Tag directive: illegal to have multiple occurrences of 'isELIgnored' with different values (old: {0}, new: {1})
+jsp.error.page.invalid.iselignored=Page directive: invalid value for isELIgnored
+jsp.error.tag.invalid.iselignored=Tag directive: invalid value for isELIgnored
+jsp.error.page.multi.pageencoding=Page directive must not have multiple occurrences of pageencoding
+jsp.error.tag.multi.pageencoding=Tag directive must not have multiple occurrences of pageencoding
jsp.error.page.bad_b_and_a_combo=Page directive: Illegal combination of buffer=\"none\" && autoFlush=\"false\"
jsp.error.not.impl.taglib=Internal error: Tag extensions not implemented
jsp.error.include.missing.file=Missing file argument to include
@@ -156,7 +165,6 @@
jsp.error.parse.error.in.TLD=Parse Error in the tag library descriptor: {0}
jsp.error.unable.to.open.TLD=Unable to open the tag library descriptor: {0}
jsp.buffer.size.zero=Buffer size <= 0
-jsp.error.buffer.invalid=Invalid buffer size
jsp.error.file.not.found=File \"{0}\" not found
jsp.message.copyinguri=Copying {0} into {1}
jsp.message.htmlcomment=\nStripping Comment: \t{0}
@@ -265,7 +273,6 @@
jsp.error.internal.evaluator_not_found=Internal error: unable to load expression evaluator
jsp.error.parse.xml.invalidPublicId=Invalid PUBLIC ID: {0}
jsp.error.include.flush.invalid.value=Invalid value for the flush attribute: {0}
-jsp.error.page.invalid.pageencoding=Page directive: invalid value for pageEncoding
jsp.error.unsupported.encoding=Unsupported encoding: {0}
tld.error.variableNotAllowed=It is an error for a tag that has one or more variable subelements to have a TagExtraInfo class that returns a non-null object.
jsp.error.tldInWebDotXmlNotFound=Could not locate TLD {1} for URI {0} specified in web.xml
1.39 +2 -12 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- messages_es.properties 16 Jul 2003 15:46:46 -0000 1.38
+++ messages_es.properties 21 Jul 2003 20:44:20 -0000 1.39
@@ -25,25 +25,15 @@
jsp.error.classname=No puede determinar el nombre de clase desde el fichero .class
jsp.warning.bad.type=Aviso: typo no valido en archivo .class
jsp.error.data.file.write=Error mientras escribia el archivo de datos
-jsp.error.page.multiple.contenttypes=Directiva Page: no puede haber multiples ocurrencias de contentType
jsp.error.page.invalid.contenttype=Directiva Page: valor incorrecto para contentType
-jsp.error.page.multiple.session=Directiva Page: no puede haber multiples ocurrencias de session
jsp.error.page.invalid.session=Directiva Page: valor incorrecto para session
-jsp.error.page.multiple.buffer=Directiva Page: no puede haber multiples ocurrencias de buffer
jsp.error.page.invalid.buffer=Directiva Page: valor incorrecto para buffer
-jsp.error.page.multiple.autoflush=Directiva Page: no puede haber multiples ocurrencias de autoFlush
jsp.error.page.invalid.autoflush==Directiva Page: valor incorrecto para autoFlush
-jsp.error.page.multiple.threadsafe=Directiva Page: no puede haber multiples ocurrencias de isThreadSafe
-jsp.error.page.invalid.threadsafe==Directiva Page: valor incorrecto para isThreadSafe
-jsp.error.page.multiple.info=Directiva Page: no puede haber multiples ocurrencias de info
+jsp.error.page.invalid.isthreadsafe==Directiva Page: valor incorrecto para isThreadSafe
jsp.error.page.invalid.info==Directiva Page: valor incorrecto para info
-jsp.error.page.multiple.iserrorpage=Directiva Page: no puede haber multiples ocurrencias de isErrorPage
jsp.error.page.invalid.iserrorpage==Directiva Page: valor incorrecto para isErrorPage
-jsp.error.page.multiple.errorpage=Directiva Page: no puede haber multiples ocurrencias de errorPage
-jsp.error.page.multiple.language=Directiva Page: no puede haber multiples ocurrencias de language
jsp.error.page.defafterusar.language=Directiva Page: No puede define language after a scriptlet
jsp.error.page.nomapping.language=Directiva Page: No hay mapeado para language:
-jsp.error.page.multiple.extends=Directiva Page: no puede haber multiples ocurrencias de extends
jsp.error.page.bad_b_and_a_combo=Directiva Page: Combinacion ilegal de buffer=\"none\" y autoFlush=\"false\"
jsp.error.not.impl.taglib=Error Interno: Tag extensions no implementado
jsp.error.include.missing.file=No tiene argumento de nombre de fichero
1.24 +2 -13 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- messages_fr.properties 16 Jul 2003 15:46:47 -0000 1.23
+++ messages_fr.properties 21 Jul 2003 20:44:20 -0000 1.24
@@ -34,26 +34,16 @@
jsp.error.classname=Impossible de d�terminer le nom de classe d''apr�s le fichier .class
jsp.warning.bad.type=Attention: mauvais type dans le fichier .class
jsp.error.data.file.write=Erreur lors de l''�criture du fichier de donn�es
-jsp.error.page.multiple.contenttypes=Directive de page: on ne peut avoir plusieurs occurrences du contentType
#Directive de Page: valeur incorrecte pour pageEncoding
jsp.error.page.invalid.contenttype=Directive de Page: valeur incorrecte pour contentType
-jsp.error.page.multiple.session=Directive de Page: on ne peut avoir plusieurs occurrences de session
jsp.error.page.invalid.session=Directive de Page: valeur incorrecte pour session
-jsp.error.page.multiple.buffer=Directive de Page: on ne peut avoir plusieurs occurrences de "buffer"
jsp.error.page.invalid.buffer=Directive de Page: valeur incorrecte pour "buffer"
-jsp.error.page.multiple.autoflush=Directive de Page: on ne peut avoir plusieurs occurrences d''autoFlush
jsp.error.page.invalid.autoflush=Directive de Page: valeur incorrecte pour autoFlush
-jsp.error.page.multiple.threadsafe=Directive de Page: on ne peut avoir plusieurs occurrences d''isThreadSafe
-jsp.error.page.invalid.threadsafe=Directive de Page: valeur incorrecte pour isThreadSafe
-jsp.error.page.multiple.info=Directive de Page: on ne peut avoir plusieurs occurrences d''info
+jsp.error.page.invalid.isthreadsafe=Directive de Page: valeur incorrecte pour isThreadSafe
jsp.error.page.invalid.info=Directive de Page: valeur incorrecte pour info
-jsp.error.page.multiple.iserrorpage=Directive de Page: on ne peut avoir plusieurs occurrences d''isErrorPage
jsp.error.page.invalid.iserrorpage=Directive de Page: valeur incorrecte pour isErrorPage
-jsp.error.page.multiple.errorpage=Directive de Page: on ne peut avoir plusieurs occurrences d''errorPage
-jsp.error.page.multiple.language=Directive de Page: on ne peut avoir plusieurs occurrences de language
jsp.error.page.defafteruse.language=Directive de Page: on ne peut d�finir language apr�s un scriptlet
jsp.error.page.nomapping.language=Directive de Page: Pas de correspondance pour language:
-jsp.error.page.multiple.extends=Directive de Page: on ne peut avoir plusieurs occurrences d''extends
jsp.error.page.bad_b_and_a_combo=Directive de Page: combinaison ill�gale de buffer=\"none\" && autoFlush=\"false\"
jsp.error.not.impl.taglib=Internal error: Tag extensions non impl�ment�s
jsp.error.include.missing.file=l''argument fichier (file) pour l''inclusion (include) est absent
@@ -239,7 +229,6 @@
jsp.error.internal.evaluator_not_found=Erreur interne: Impossible de charger l''�valuateur d''expression
jsp.error.parse.xml.invalidPublicId=PUBLIC ID invalide: {0}
jsp.error.include.flush.invalid.value=Valeur incorrecte pour l''attribut flush: {0}
-jsp.error.page.invalid.pageencoding=Directive de Page: valeur incorrecte pour pageEncoding
jsp.error.unsupported.encoding=Encodage non support�: {0}
jsp.warning.unknown.element.in.variable=Attention: Element inconnu {0} dans la variable
tld.error.variableNotAllowed=Ceci est une erreur pour le tag qui poss�de une ou plusieurs variables subelements pour avoir une classe TagExtraInfo qui retourne un objet non-nul.
1.40 +2 -13 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- messages_ja.properties 16 Jul 2003 15:46:47 -0000 1.39
+++ messages_ja.properties 21 Jul 2003 20:44:20 -0000 1.40
@@ -33,26 +33,16 @@
jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.warning.bad.type=\u8b66\u544a: .class\u30d5\u30a1\u30a4\u30eb\u4e2d\u306e\u578b\u304c\u9055\u3044\u307e\u3059
jsp.error.data.file.write=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
-jsp.error.page.multiple.contenttypes=Page\u6307\u793a\u5b50: contentType\u3092\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
#Page directive: invalid value for pageEncoding
jsp.error.page.invalid.contenttype=Page\u6307\u793a\u5b50: contentType\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.multiple.session=Page\u6307\u793a\u5b50: session\u5c5e\u6027\u3092\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.page.invalid.session=Page\u6307\u793a\u5b50: session\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.multiple.buffer=Page\u6307\u793a\u5b50: buffer\u5c5e\u6027\u306f\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.page.invalid.buffer=Page\u6307\u793a\u5b50: buffer\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.multiple.autoflush=Page\u6307\u793a\u5b50: autoFlush\u5c5e\u6027\u3092\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.page.invalid.autoflush=Page\u6307\u793a\u5b50: autoFlush\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.multiple.threadsafe=Page\u6307\u793a\u5b50: isThreadsafe\u5c5e\u6027\u3092\u8907\u6570\u56de\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
-jsp.error.page.invalid.threadsafe=Page\u6307\u793a\u5b50: isThreadSafe\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.multiple.info=Page\u6307\u793a\u5b50: info\u5c5e\u6027\u3092\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
+jsp.error.page.invalid.isthreadsafe=Page\u6307\u793a\u5b50: isThreadSafe\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
jsp.error.page.invalid.info=Page\u6307\u793a\u5b50: info\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.multiple.iserrorpage=Page\u6307\u793a\u5b50: isErrorPage\u5c5e\u6027\u3092\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.page.invalid.iserrorpage=Page\u6307\u793a\u5b50: isErrorPage\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.multiple.errorpage=Page\u6307\u793a\u5b50: errorPage\u5c5e\u6027\u3092\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
-jsp.error.page.multiple.language=Page\u6307\u793a\u5b50: language\u5c5e\u6027\u3092\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.page.defafteruse.language=Page\u6307\u793a\u5b50: scriptlet\u306e\u5f8c\u3067language\u5c5e\u6027\u3092\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.page.nomapping.language=Page\u6307\u793a\u5b50 language\u5c5e\u6027\u306e\u30de\u30c3\u30d4\u30f3\u30b0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093:
-jsp.error.page.multiple.extends=Page\u6307\u793a\u5b50: extends\u5c5e\u6027\u3092\u8907\u6570\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.page.bad_b_and_a_combo=Page\u6307\u793a\u5b50: buffer=\"none\"\u3068autoFlush=\"false\"\u3092\u540c\u6642\u306b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
jsp.error.not.impl.taglib=\u5185\u90e8\u30a8\u30e9\u30fc: \u30bf\u30b0\u62e1\u5f35\u5b50\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.include.missing.file=\u53d6\u308a\u8fbc\u3080\u30d5\u30a1\u30a4\u30eb\u5f15\u6570\u304c\u3042\u308a\u307e\u305b\u3093
@@ -254,7 +244,6 @@
jsp.error.internal.evaluator_not_found=\u5185\u90e8\u30a8\u30e9\u30fc: \u5f0f\u691c\u8a3c\u5668\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
jsp.error.parse.xml.invalidPublicId=\u7121\u52b9\u306aPUBLIC ID: {0}
jsp.error.include.flush.invalid.value=flush\u5c5e\u6027\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059: {0}
-jsp.error.page.invalid.pageencoding=Page\u6307\u793a\u5b50: pageEncoding\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
jsp.error.unsupported.encoding=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3067\u3059: {0}
tld.error.variableNotAllowed=null\u3067\u306a\u3044\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u8fd4\u3059TagExtraInfo\u3092\u6301\u3064\u4e00\u3064\u4ee5\u4e0a\u306e\u5909\u6570\u526f\u8981\u7d20\u3092\u6301\u3064\u30bf\u30b0\u306f\u30a8\u30e9\u30fc\u3067\u3059\u3002
jsp.error.tldInWebDotXmlNotFound=web.xml\u3067\u6307\u5b9a\u3055\u308c\u305fURI {0} \u306bTLD\u3092\u914d\u7f6e\u3067\u304d\u307e\u305b\u3093
1.11 +5 -0 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java
Index: HttpJspBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpJspBase.java 22 Jan 2003 20:52:21 -0000 1.10
+++ HttpJspBase.java 21 Jul 2003 20:44:20 -0000 1.11
@@ -133,6 +133,11 @@
public final void service(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
{
+ /*
+ if (getServletContext().isXPoweredByEnabled()) {
+ response.addHeader("X-Powered-By", "JSP/2.0");
+ }
+ */
_jspService(request, response);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime
HttpJspBase.java
Posted by Remy Maucherat <re...@apache.org>.
luehe@apache.org wrote:
> luehe 2003/07/21 13:44:21
>
> Modified: jasper2 build.xml
> jasper2/src/share/org/apache/jasper/compiler
> JspDocumentParser.java PageInfo.java Parser.java
> Validator.java
> jasper2/src/share/org/apache/jasper/resources
> messages.properties messages_es.properties
> messages_fr.properties messages_ja.properties
> jasper2/src/share/org/apache/jasper/runtime HttpJspBase.java
> Log:
> Hide all taglib and XML namespace management in PageInfo
There seem to be tabs in there. I'd start running now if I were you: the
tab police takes no prisoners ;-)
Remy
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org