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/08/26 02:08:33 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler PageDataImpl.java TagLibraryInfoImpl.java
luehe 2003/08/25 17:08:33
Modified: jasper2/src/share/org/apache/jasper/compiler
PageDataImpl.java TagLibraryInfoImpl.java
Log:
- Prepend "urn:jsptld" to uri values that represent relative paths
when adding "xmlns:prefix" attribute on the root of the JSP document's
XML view (see JSP.10.1.5)
- Make the value passed as the uri argument to
TagLibraryValidator.validate() match the above
Revision Changes Path
1.35 +6 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java
Index: PageDataImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- PageDataImpl.java 12 Aug 2003 18:12:54 -0000 1.34
+++ PageDataImpl.java 26 Aug 2003 00:08:32 -0000 1.35
@@ -227,6 +227,9 @@
if (rootAttrs.getIndex(qName) == -1) {
String location = attrs.getValue("uri");
if (location != null) {
+ if (location.startsWith("/")) {
+ location = URN_JSPTLD + location;
+ }
rootAttrs.addAttribute("", "", qName, "CDATA",
location);
} else {
1.46 +11 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- TagLibraryInfoImpl.java 25 Aug 2003 19:46:50 -0000 1.45
+++ TagLibraryInfoImpl.java 26 Aug 2003 00:08:32 -0000 1.46
@@ -82,7 +82,7 @@
* @author Kin-man Chung
* @author Jan Luehe
*/
-class TagLibraryInfoImpl extends TagLibraryInfo {
+class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants {
// Logger
private static Log log = LogFactory.getLog(TagLibraryInfoImpl.class);
@@ -726,9 +726,13 @@
public ValidationMessage[] validate(PageData thePage) {
TagLibraryValidator tlv = getTagLibraryValidator();
if (tlv == null) return null;
- return tlv.validate(getPrefixString(),
- (getReliableURN() != null) ? getReliableURN() : getURI(),
- thePage);
+
+ String uri = getURI();
+ if (uri.startsWith("/")) {
+ uri = URN_JSPTLD + uri;
+ }
+
+ return tlv.validate(getPrefixString(), uri, thePage);
}
protected TagLibraryValidator tagLibraryValidator;