luehe 2003/07/21 14:52:51
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
JspDocumentParser.java PageInfo.java Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Forgive duplicate attribute values on static include
Revision Changes Path
1.191 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- Generator.java 21 Jul 2003 05:34:55 -0000 1.190
+++ Generator.java 21 Jul 2003 21:52:51 -0000 1.191
@@ -539,7 +539,7 @@
if (pageInfo.isSession())
out.printil("HttpSession session = null;");
- if (pageInfo.isIsErrorPage()) {
+ if (pageInfo.isErrorPage()) {
out.printil("Throwable exception =
org.apache.jasper.runtime.JspRuntimeLibrary.getThrowable(request);");
}
1.61 +4 -4
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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- JspDocumentParser.java 21 Jul 2003 20:44:20 -0000 1.60
+++ JspDocumentParser.java 21 Jul 2003 21:52:51 -0000 1.61
@@ -557,7 +557,7 @@
*/
public void startPrefixMapping(String prefix, String uri)
throws SAXException {
- // XXX
+ // XXX
}
/*
1.31 +257 -84
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PageInfo.java 21 Jul 2003 20:44:20 -0000 1.30
+++ PageInfo.java 21 Jul 2003 21:52:51 -0000 1.31
@@ -63,6 +63,7 @@
import java.util.*;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
import javax.servlet.jsp.tagext.TagLibraryInfo;
/**
@@ -83,17 +84,24 @@
private String language = "java";
private String xtends = Constants.JSP_SERVLET_BASE;
private String contentType = null;
- private boolean session = true;
+ private String session;
+ private boolean isSession = true;
+ private String bufferValue;
private int buffer = 8*1024; // XXX confirm
- private boolean autoFlush = true;
- private boolean threadSafe = true;
+ private String autoFlush;
+ private boolean isAutoFlush = true;
+ private String isThreadSafeValue;
+ private boolean isThreadSafe = true;
+ private String isErrorPageValue;
private boolean isErrorPage = false;
private String errorPage = null;
+ private String info;
private int maxTagNesting = 0;
private boolean scriptless = false;
private boolean scriptingInvalid = false;
- private boolean elIgnored = false;
+ private String isELIgnoredValue;
+ private boolean isELIgnored = false;
private boolean elIgnoredSpecified = false;
private String omitXmlDecl = null;
@@ -170,78 +178,6 @@
return beanRepository;
}
- public String getLanguage() {
- return language;
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-
- public String getExtends() {
- return xtends;
- }
-
- public void setExtends(String xtends) {
- this.xtends = xtends;
- }
-
- public String getContentType() {
- return contentType;
- }
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
-
- public String getErrorPage() {
- return errorPage;
- }
-
- public void setErrorPage(String errorPage) {
- this.errorPage = errorPage;
- }
-
- public int getBuffer() {
- return buffer;
- }
-
- public void setBuffer(int buffer) {
- this.buffer = buffer;
- }
-
- public boolean isSession() {
- return session;
- }
-
- public void setSession(boolean session) {
- this.session = session;
- }
-
- public boolean isAutoFlush() {
- return autoFlush;
- }
-
- public void setAutoFlush(boolean autoFlush) {
- this.autoFlush = autoFlush;
- }
-
- public boolean isThreadSafe() {
- return threadSafe;
- }
-
- public void setThreadSafe(boolean threadSafe) {
- this.threadSafe = threadSafe;
- }
-
- public boolean isIsErrorPage() {
- return isErrorPage;
- }
-
- public void setIsErrorPage(boolean isErrorPage) {
- this.isErrorPage = isErrorPage;
- }
-
public int getMaxTagNesting() {
return maxTagNesting;
}
@@ -266,14 +202,6 @@
return scriptingInvalid;
}
- public void setELIgnored(boolean s) {
- elIgnored = s;
- }
-
- public boolean isELIgnored() {
- return elIgnored;
- }
-
public void setELIgnoredSpecified(boolean s) {
elIgnoredSpecified = s;
}
@@ -431,4 +359,249 @@
return (String) prefixMapper.get(prefix);
}
+
+ /* Page/Tag directive attributes */
+
+ /*
+ * language
+ */
+ public void setLanguage(String value, Node n, ErrorDispatcher err,
+ boolean pagedir)
+ throws JasperException {
+
+ if (!"java".equalsIgnoreCase(value)) {
+ if (pagedir)
+ err.jspError(n, "jsp.error.page.language.nonjava");
+ else
+ err.jspError(n, "jsp.error.tag.language.nonjava");
+ }
+
+ language = value;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+
+ /*
+ * extends
+ */
+ public void setExtends(String value, Node.PageDirective n) {
+
+ xtends = value;
+
+ /*
+ * If page superclass is top level class (i.e. not in a package)
+ * explicitly import it. If this is not done, the compiler will assume
+ * the extended class is in the same pkg as the generated servlet.
+ */
+ if (value.indexOf('.') < 0)
+ n.addImport(value);
+ }
+
+ public String getExtends() {
+ return xtends;
+ }
+
+
+ /*
+ * contentType
+ */
+ public void setContentType(String value) {
+ contentType = value;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+
+ /*
+ * buffer
+ */
+ public void setBufferValue(String value, Node n, ErrorDispatcher err)
+ throws JasperException {
+
+ if ("none".equalsIgnoreCase(value))
+ buffer = 0;
+ else {
+ if (value == null || !value.endsWith("kb"))
+ err.jspError(n, "jsp.error.page.invalid.buffer");
+ try {
+ Integer k = new Integer(value.substring(0, value.length()-2));
+ buffer = k.intValue() * 1024;
+ } catch (NumberFormatException e) {
+ err.jspError(n, "jsp.error.page.invalid.buffer");
+ }
+ }
+
+ bufferValue = value;
+ }
+
+ public String getBufferValue() {
+ return bufferValue;
+ }
+
+ public int getBuffer() {
+ return buffer;
+ }
+
+
+ /*
+ * session
+ */
+ public void setSession(String value, Node n, ErrorDispatcher err)
+ throws JasperException {
+
+ if ("true".equalsIgnoreCase(value))
+ isSession = true;
+ else if ("false".equalsIgnoreCase(value))
+ isSession = false;
+ else
+ err.jspError(n, "jsp.error.page.invalid.session");
+
+ session = value;
+ }
+
+ public String getSession() {
+ return session;
+ }
+
+ public boolean isSession() {
+ return isSession;
+ }
+
+
+ /*
+ * autoFlush
+ */
+ public void setAutoFlush(String value, Node n, ErrorDispatcher err)
+ throws JasperException {
+
+ if ("true".equalsIgnoreCase(value))
+ isAutoFlush = true;
+ else if ("false".equalsIgnoreCase(value))
+ isAutoFlush = false;
+ else
+ err.jspError(n, "jsp.error.autoFlush.invalid");
+
+ autoFlush = value;
+ }
+
+ public String getAutoFlush() {
+ return autoFlush;
+ }
+
+ public boolean isAutoFlush() {
+ return isAutoFlush;
+ }
+
+
+ /*
+ * isThreadSafe
+ */
+ public void setIsThreadSafe(String value, Node n, ErrorDispatcher err)
+ throws JasperException {
+
+ if ("true".equalsIgnoreCase(value))
+ isThreadSafe = true;
+ else if ("false".equalsIgnoreCase(value))
+ isThreadSafe = false;
+ else
+ err.jspError(n, "jsp.error.page.invalid.isthreadsafe");
+
+ isThreadSafeValue = value;
+ }
+
+ public String getIsThreadSafe() {
+ return isThreadSafeValue;
+ }
+
+ public boolean isThreadSafe() {
+ return isThreadSafe;
+ }
+
+
+ /*
+ * info
+ */
+ public void setInfo(String value) {
+ info = value;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+
+ /*
+ * errorPage
+ */
+ public void setErrorPage(String value) {
+ errorPage = value;
+ }
+
+ public String getErrorPage() {
+ return errorPage;
+ }
+
+
+ /*
+ * isErrorPage
+ */
+ public void setIsErrorPage(String value, Node n, ErrorDispatcher err)
+ throws JasperException {
+
+ if ("true".equalsIgnoreCase(value))
+ isErrorPage = true;
+ else if ("false".equalsIgnoreCase(value))
+ isErrorPage = false;
+ else
+ err.jspError(n, "jsp.error.page.invalid.iserrorpage");
+
+ isErrorPageValue = value;
+ }
+
+ public String getIsErrorPage() {
+ return isErrorPageValue;
+ }
+
+ public boolean isErrorPage() {
+ return isErrorPage;
+ }
+
+
+ /*
+ * isELIgnored
+ */
+ public void setIsELIgnored(String value, Node n, ErrorDispatcher err,
+ boolean pagedir)
+ throws JasperException {
+
+ if ("true".equalsIgnoreCase(value))
+ isELIgnored = true;
+ else if ("false".equalsIgnoreCase(value))
+ isELIgnored = false;
+ else {
+ if (pagedir)
+ err.jspError(n, "jsp.error.page.invalid.iselignored");
+ else
+ err.jspError(n, "jsp.error.tag.invalid.iselignored");
+ }
+
+ isELIgnoredValue = value;
+ }
+
+ public void setELIgnored(boolean s) {
+ isELIgnored = s;
+ }
+
+ public String getIsELIgnored() {
+ return isELIgnoredValue;
+ }
+
+ public boolean isELIgnored() {
+ return isELIgnored;
+ }
}
1.110 +84 -117
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.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Validator.java 21 Jul 2003 20:44:20 -0000 1.109
+++ Validator.java 21 Jul 2003 21:52:51 -0000 1.110
@@ -114,16 +114,6 @@
new JspUtil.ValidAttribute("isELIgnored")
};
- private boolean languageSeen = false;
- private boolean extendsSeen = false;
- private boolean sessionSeen = false;
- private boolean bufferSeen = false;
- private boolean autoFlushSeen = false;
- private boolean isThreadSafeSeen = false;
- private boolean errorPageSeen = false;
- private boolean isErrorPageSeen = false;
- private boolean contentTypeSeen = false;
- private boolean infoSeen = false;
private boolean pageEncodingSeen = false;
/*
@@ -156,112 +146,89 @@
String value = attrs.getValue(i);
if ("language".equals(attr)) {
- if (languageSeen)
- err.jspError(n, "jsp.error.page.multiple.language");
- languageSeen = true;
- if (!"java".equalsIgnoreCase(value))
- err.jspError(n, "jsp.error.language.nonjava");
- pageInfo.setLanguage(value);
+ if (pageInfo.getLanguage() == null) {
+ pageInfo.setLanguage(value, n, err, true);
+ } else if (!pageInfo.getLanguage().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.language",
+ pageInfo.getLanguage(), value);
+ }
} else if ("extends".equals(attr)) {
- if (extendsSeen)
- err.jspError(n, "jsp.error.page.multiple.extends");
- extendsSeen = true;
- pageInfo.setExtends(value);
- /*
- * If page superclass is top level class (i.e. not in a
- * pkg) explicitly import it. If this is not done, the
- * compiler will assume the extended class is in the same
- * pkg as the generated servlet.
- */
- if (value.indexOf('.') < 0)
- n.addImport(value);
+ if (pageInfo.getExtends() == null) {
+ pageInfo.setExtends(value, n);
+ } else if (!pageInfo.getExtends().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.extends",
+ pageInfo.getExtends(), value);
+ }
} else if ("contentType".equals(attr)) {
- if (contentTypeSeen)
- err.jspError(n, "jsp.error.page.multiple.contenttypes");
- contentTypeSeen = true;
- pageInfo.setContentType(value);
+ if (pageInfo.getContentType() == null) {
+ pageInfo.setContentType(value);
+ } else if (!pageInfo.getContentType().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.contenttype",
+ pageInfo.getContentType(), value);
+ }
} else if ("session".equals(attr)) {
- if (sessionSeen)
- err.jspError(n, "jsp.error.session.multiple");
- sessionSeen = true;
- if ("true".equalsIgnoreCase(value))
- pageInfo.setSession(true);
- else if ("false".equalsIgnoreCase(value))
- pageInfo.setSession(false);
- else
- err.jspError(n, "jsp.error.session.invalid");
+ if (pageInfo.getSession() == null) {
+ pageInfo.setSession(value, n, err);
+ } else if (!pageInfo.getSession().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.session",
+ pageInfo.getSession(), value);
+ }
} else if ("buffer".equals(attr)) {
- if (bufferSeen)
- err.jspError(n, "jsp.error.page.multiple.buffer");
- bufferSeen = true;
-
- if ("none".equalsIgnoreCase(value))
- pageInfo.setBuffer(0);
- else {
- if (value == null || !value.endsWith("kb"))
- err.jspError(n, "jsp.error.buffer.invalid");
-
- try {
- Integer k = new Integer(
- value.substring(0, value.length()-2));
- pageInfo.setBuffer(k.intValue()*1024);
- } catch (NumberFormatException e) {
- err.jspError(n, "jsp.error.buffer.invalid");
- }
+ if (pageInfo.getBufferValue() == null) {
+ pageInfo.setBufferValue(value, n, err);
+ } else if (!pageInfo.getBufferValue().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.buffer",
+ pageInfo.getBufferValue(), value);
}
} else if ("autoFlush".equals(attr)) {
- if (autoFlushSeen)
- err.jspError(n, "jsp.error.page.multiple.autoflush");
- autoFlushSeen = true;
- if ("true".equalsIgnoreCase(value))
- pageInfo.setAutoFlush(true);
- else if ("false".equalsIgnoreCase(value))
- pageInfo.setAutoFlush(false);
- else
- err.jspError(n, "jsp.error.autoFlush.invalid");
+ if (pageInfo.getAutoFlush() == null) {
+ pageInfo.setAutoFlush(value, n, err);
+ } else if (!pageInfo.getAutoFlush().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.autoflush",
+ pageInfo.getAutoFlush(), value);
+ }
} else if ("isThreadSafe".equals(attr)) {
- if (isThreadSafeSeen)
- err.jspError(n, "jsp.error.page.multiple.threadsafe");
- isThreadSafeSeen = true;
- if ("true".equalsIgnoreCase(value))
- pageInfo.setThreadSafe(true);
- else if ("false".equalsIgnoreCase(value))
- pageInfo.setThreadSafe(false);
- else
- err.jspError(n, "jsp.error.isThreadSafe.invalid");
+ if (pageInfo.getIsThreadSafe() == null) {
+ pageInfo.setIsThreadSafe(value, n, err);
+ } else if (!pageInfo.getIsThreadSafe().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.isthreadsafe",
+ pageInfo.getIsThreadSafe(), value);
+ }
} else if ("isELIgnored".equals(attr)) {
- if (! pageInfo.isELIgnoredSpecified()) {
- // If specified in jsp-config, use it
- if ("true".equalsIgnoreCase(value))
- pageInfo.setELIgnored(true);
- else if ("false".equalsIgnoreCase(value))
- pageInfo.setELIgnored(false);
- else
- err.jspError(n, "jsp.error.isELIgnored.invalid");
+ if (pageInfo.getIsELIgnored() == null) {
+ if (!pageInfo.isELIgnoredSpecified()) {
+ // If specified in jsp-config, use it
+ pageInfo.setIsELIgnored(value, n, err, true);
+ }
+ } else if (!pageInfo.getIsELIgnored().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.iselignored",
+ pageInfo.getIsELIgnored(), value);
}
} else if ("isErrorPage".equals(attr)) {
- if (isErrorPageSeen)
- err.jspError(n, "jsp.error.page.multiple.iserrorpage");
- isErrorPageSeen = true;
- if ("true".equalsIgnoreCase(value))
- pageInfo.setIsErrorPage(true);
- else if ("false".equalsIgnoreCase(value))
- pageInfo.setIsErrorPage(false);
- else
- err.jspError(n, "jsp.error.isErrorPage.invalid");
+ if (pageInfo.getIsErrorPage() == null) {
+ pageInfo.setIsErrorPage(value, n, err);
+ } else if (!pageInfo.getIsErrorPage().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.iserrorpage",
+ pageInfo.getIsErrorPage(), value);
+ }
} else if ("errorPage".equals(attr)) {
- if (errorPageSeen)
- err.jspError(n, "jsp.error.page.multiple.errorpage");
- errorPageSeen = true;
- pageInfo.setErrorPage(value);
+ if (pageInfo.getErrorPage() == null) {
+ pageInfo.setErrorPage(value);
+ } else if (!pageInfo.getErrorPage().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.errorpage",
+ pageInfo.getErrorPage(), value);
+ }
} else if ("info".equals(attr)) {
- if (infoSeen)
- err.jspError(n, "jsp.error.info.multiple");
- infoSeen = true;
+ if (pageInfo.getInfo() == null) {
+ pageInfo.setInfo(value);
+ } else if (!pageInfo.getInfo().equals(value)) {
+ err.jspError(n, "jsp.error.page.conflict.info",
+ pageInfo.getInfo(), value);
+ }
} else if ("pageEncoding".equals(attr)) {
if (pageEncodingSeen)
- err.jspError(n,
- "jsp.error.page.multiple.pageencoding");
+ err.jspError(n, "jsp.error.page.multi.pageencoding");
+ // 'pageEncoding' can occur at most once per file
pageEncodingSeen = true;
/*
* Report any encoding conflict, treating "UTF-16",
@@ -293,25 +260,25 @@
String value = attrs.getValue(i);
if ("language".equals(attr)) {
- if (languageSeen)
- err.jspError(n, "jsp.error.page.multiple.language");
- languageSeen = true;
- if (!"java".equalsIgnoreCase(value))
- err.jspError(n, "jsp.error.language.nonjava");
- pageInfo.setLanguage(value);
+ if (pageInfo.getLanguage() == null) {
+ pageInfo.setLanguage(value, n, err, false);
+ } else if (!pageInfo.getLanguage().equals(value)) {
+ err.jspError(n, "jsp.error.tag.conflict.language",
+ pageInfo.getLanguage(), value);
+ }
} else if ("isELIgnored".equals(attr)) {
- if (! pageInfo.isELIgnoredSpecified()) {
- // If specified in jsp-config, use it
- if ("true".equalsIgnoreCase(value))
- pageInfo.setELIgnored(true);
- else if ("false".equalsIgnoreCase(value))
- pageInfo.setELIgnored(false);
- else
- err.jspError(n, "jsp.error.isELIgnored.invalid");
+ if (pageInfo.getIsELIgnored() == null) {
+ if (!pageInfo.isELIgnoredSpecified()) {
+ // If specified in jsp-config, use it
+ pageInfo.setIsELIgnored(value, n, err, false);
+ }
+ } else if (!pageInfo.getIsELIgnored().equals(value)) {
+ err.jspError(n, "jsp.error.tag.conflict.iselignored",
+ pageInfo.getIsELIgnored(), value);
}
} else if ("pageEncoding".equals(attr)) {
if (pageEncodingSeen)
- err.jspError(n, "jsp.error.page.multiple.pageencoding");
+ err.jspError(n, "jsp.error.tag.multi.pageencoding");
pageEncodingSeen = true;
n.getRoot().setPageEncoding(value);
}
1.124 +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.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- messages.properties 21 Jul 2003 21:02:57 -0000 1.123
+++ messages.properties 21 Jul 2003 21:52:51 -0000 1.124
@@ -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.conflict.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.conflict.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.conflict.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.conflict.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.conflict.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.conflict.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.conflict.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.conflict.errorpage=Page directive: illegal to have multiple
occurrences of 'errorPage' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.language=Page directive: illegal to have multiple
occurrences of 'language' with different values (old: {0}, new: {1})
+jsp.error.tag.conflict.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.conflict.extends=Page directive: illegal to have multiple
occurrences of 'extends' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.iselignored=Page directive: illegal to have multiple
occurrences of 'isELIgnored' with different values (old: {0}, new: {1})
+jsp.error.tag.conflict.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.41 +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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- messages_es.properties 21 Jul 2003 21:02:58 -0000 1.40
+++ messages_es.properties 21 Jul 2003 21:52:51 -0000 1.41
@@ -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.26 +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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- messages_fr.properties 21 Jul 2003 21:02:58 -0000 1.25
+++ messages_fr.properties 21 Jul 2003 21:52:51 -0000 1.26
@@ -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.42 +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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- messages_ja.properties 21 Jul 2003 21:02:58 -0000 1.41
+++ messages_ja.properties 21 Jul 2003 21:52:51 -0000 1.42
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
