6:28 p.m.
Author: remy.maucherat(a)jboss.com
Date: 2010-10-28 12:28:22 -0400 (Thu, 28 Oct 2010)
New Revision: 1569
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
trunk/java/org/apache/jasper/resources/LocalStrings.properties
trunk/webapps/docs/changelog.xml
Log:
- JBAS-8579: Should default to JSP for body content.
- Cosmetic.
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2010-10-27 07:58:42 UTC (rev
1568)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2010-10-28 16:28:22 UTC (rev
1569)
@@ -86,7 +86,6 @@
import org.apache.catalina.deploy.SessionCookie;
import org.apache.catalina.deploy.jsp.TagLibraryInfo;
import org.apache.catalina.session.StandardManager;
-import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.util.CharsetMapper;
import org.apache.catalina.util.ExtensionValidator;
import org.apache.catalina.util.RequestUtil;
Modified: trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 2010-10-27 07:58:42 UTC
(rev 1568)
+++ trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 2010-10-28 16:28:22 UTC
(rev 1569)
@@ -793,7 +793,7 @@
taglibInfo = getTaglibInfo(prefix, uri);
} catch (JasperException je) {
throw new SAXParseException(
- Localizer.getMessage("jsp.error.could.not.add.taglibraries"),
+ Localizer.getMessage("jsp.error.could.not.add.taglibraries",
je.getMessage()),
locator,
je);
}
Modified: trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2010-10-27 07:58:42 UTC
(rev 1568)
+++ trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2010-10-28 16:28:22 UTC
(rev 1569)
@@ -301,8 +301,13 @@
e);
}
}
-
- return new TagInfo(tagInfo.getTagName(), tagInfo.getTagClassName(),
tagInfo.getBodyContent(),
+
+ String tagBodyContent = tagInfo.getBodyContent();
+ if (tagBodyContent == null) {
+ tagBodyContent = TagInfo.BODY_CONTENT_JSP;
+ }
+
+ return new TagInfo(tagInfo.getTagName(), tagInfo.getTagClassName(),
tagBodyContent,
tagInfo.getInfoString(), this, tei, attributeInfos.toArray(new
TagAttributeInfo[0]),
tagInfo.getDisplayName(), tagInfo.getSmallIcon(),
tagInfo.getLargeIcon(),
variableInfos.toArray(new TagVariableInfo[0]), dynamicAttributes);
Modified: trunk/java/org/apache/jasper/resources/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/jasper/resources/LocalStrings.properties 2010-10-27 07:58:42 UTC
(rev 1568)
+++ trunk/java/org/apache/jasper/resources/LocalStrings.properties 2010-10-28 16:28:22 UTC
(rev 1569)
@@ -344,7 +344,7 @@
jsp.error.coerce_to_type=Cannot coerce value ({2}) to type ({1}) for attribute {0}.
jsp.error.jspelement.missing.name=Mandatory XML-style \'name\' attribute missing
jsp.error.xmlns.redefinition.notimplemented=Internal error: Attempt to redefine
xmlns:{0}. Redefinition of namespaces is not implemented.
-jsp.error.could.not.add.taglibraries=Could not add one or more tag libraries.
+jsp.error.could.not.add.taglibraries=Could not add one or more tag libraries: {0}
jsp.error.duplicate.name.jspattribute=The attribute {0} specified in the standard or
custom action also appears as the value of the name attribute in the enclosed
jsp:attribute
jsp.error.not.in.template={0} not allowed in a template text body.
jsp.error.badStandardAction=Invalid standard action
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2010-10-27 07:58:42 UTC (rev 1568)
+++ trunk/webapps/docs/changelog.xml 2010-10-28 16:28:22 UTC (rev 1569)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 3.0.0.Beta8 (remm)">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <jboss-jira>JBAS-8579</jboss-jira>: Fix default for tag body content.
(remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 3.0.0.Beta7 (remm)">
<subsection name="Genral">
<changelog>