yoavs 2005/07/21 13:50:56
Modified: catalina/src/share/org/apache/catalina/startup
HostConfig.java
webapps/docs changelog.xml
jasper2/src/share/org/apache/jasper/compiler
BeanRepository.java Validator.java
jasper2/src/share/org/apache/jasper/resources
LocalStrings.properties
Log:
Bugzilla 35386: http://issues.apache.org/bugzilla/show_bug.cgi?id=35386
Revision Changes Path
1.62 +8 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- HostConfig.java 15 May 2005 16:29:24 -0000 1.61
+++ HostConfig.java 21 Jul 2005 20:50:56 -0000 1.62
@@ -547,14 +547,17 @@
* @param file
*/
protected void deployDescriptor(String contextPath, File contextXml,
String file) {
- DeployedApplication deployedApp = new
DeployedApplication(contextPath);
-
- if (deploymentExists(contextPath))
+ if (deploymentExists(contextPath)) {
return;
+ }
+
+ DeployedApplication deployedApp = new
DeployedApplication(contextPath);
// Assume this is a configuration descriptor and deploy it
- if(log.isDebugEnabled())
+ if(log.isDebugEnabled()) {
log.debug(sm.getString("hostConfig.deployDescriptor", file));
+ }
+
Context context = null;
try {
synchronized (digester) {
1.327 +3 -0 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.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- changelog.xml 21 Jul 2005 20:14:57 -0000 1.326
+++ changelog.xml 21 Jul 2005 20:50:56 -0000 1.327
@@ -249,6 +249,9 @@
<bug>35696</bug>: Make certain that release is called for custom
tags
when tag-pooling is disabled. (billbarker)
</fix>
+ <fix>
+ <bug>35386</bug>: Make useBean resources use consistent spelling,
from Kurt Huwig. (yoavs)
+ </fix>
</changelog>
</subsection>
1.5 +1 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/BeanRepository.java
Index: BeanRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/BeanRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BeanRepository.java 17 Mar 2004 19:23:03 -0000 1.4
+++ BeanRepository.java 21 Jul 2005 20:50:56 -0000 1.5
@@ -63,7 +63,7 @@
} else if (scope.equals("application")) {
appBeans.addElement(s);
} else {
- errDispatcher.jspError(n, "jsp.error.useBean.badScope");
+ errDispatcher.jspError(n, "jsp.error.usebean.badScope");
}
putBeanType(s, type);
1.120 +4 -4
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.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- Validator.java 25 Jun 2004 19:05:05 -0000 1.119
+++ Validator.java 21 Jul 2005 20:50:56 -0000 1.120
@@ -510,13 +510,13 @@
BeanRepository beanInfo = pageInfo.getBeanRepository();
if (className == null && type == null)
- err.jspError(n, "jsp.error.useBean.missingType");
+ err.jspError(n, "jsp.error.usebean.missingType");
if (beanInfo.checkVariable(name))
- err.jspError(n, "jsp.error.useBean.duplicate");
+ err.jspError(n, "jsp.error.usebean.duplicate");
if ("session".equals(scope) && !pageInfo.isSession())
- err.jspError(n, "jsp.error.useBean.noSession");
+ err.jspError(n, "jsp.error.usebean.noSession");
Node.JspAttribute jattr
= getJspAttribute("beanName", null, null,
@@ -524,7 +524,7 @@
java.lang.String.class, n, false);
n.setBeanName(jattr);
if (className != null && jattr != null)
- err.jspError(n, "jsp.error.useBean.notBoth");
+ err.jspError(n, "jsp.error.usebean.notBoth");
if (className == null)
className = type;
1.9 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalStrings.properties 23 Mar 2005 15:48:37 -0000 1.8
+++ LocalStrings.properties 21 Jul 2005 20:50:56 -0000 1.9
@@ -342,7 +342,7 @@
jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive
with a name attribute with a value \"{0}\", the value of this
name-from-attribute attribute.
jsp.error.tagfile.nameFrom.badAttribute=The attribute directive (declared in
line {1} and whose name attribute is \"{0}\", the value of this
name-from-attribute attribute) must be of type java.lang.String, is
\"required\" and not a \"rtexprvalue\".
jsp.error.page.noSession=Cannot access session scope in page that does not
participate in any session
-jsp.error.useBean.noSession=Illegal for useBean to use session scope when
JSP page declares (via page directive) that it does not participate in sessions
+jsp.error.usebean.noSession=Illegal for useBean to use session scope when
JSP page declares (via page directive) that it does not participate in sessions
jsp.error.xml.encodingByteOrderUnsupported = Given byte order for encoding
\"{0}\" is not supported.
jsp.error.xml.encodingDeclInvalid = Invalid encoding name \"{0}\".
jsp.error.xml.encodingDeclRequired = The encoding declaration is required in
the text declaration.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
