From 13d1ec6206ee2c59534ab594ddbcecc6e85ebe67 Mon Sep 17 00:00:00 2001
From: Ryan Gustafson <rgustav@users.sourceforge.net>
Date: Tue, 29 Jul 2008 03:29:36 +0000
Subject: [PATCH] Remove unnecessary prefix on function calls.  These functions
 are non-standard XPath 1.0 functions built into Jaxen, and seem to work
 without the prefix (no unit tests fail).  They are however standard XPath 2.0
 functions, and do not need a prefix.  This change makes the queries
 compatible with both XPath 1.0 Jaxen and XPath 2.0.

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@6338 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/rulesets/basic-jsp.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pmd/rulesets/basic-jsp.xml b/pmd/rulesets/basic-jsp.xml
index 7f67841de7..3bec126fc1 100644
--- a/pmd/rulesets/basic-jsp.xml
+++ b/pmd/rulesets/basic-jsp.xml
@@ -21,7 +21,7 @@
 			<property name="xpath">
 				<value>
 					<![CDATA[ 
-// Element [ string:upper-case(@Name)="SCRIPT" and (@EndLine - @BeginLine > 10) ]
+// Element [ upper-case(@Name)="SCRIPT" and (@EndLine - @BeginLine > 10) ]
 				]]>
 				</value>
 			</property>
@@ -68,7 +68,7 @@ onload=calcDays;
 					<![CDATA[
 					//JspScriptlet
 					|
-					//Element[ string:upper-case(@Name)="JSP:SCRIPTLET" ]
+					//Element[ upper-case(@Name)="JSP:SCRIPTLET" ]
 					]]>
 				</value>
 			</property>
@@ -117,7 +117,7 @@ response.setHeader("Pragma", "No-cache");
 		<properties>
 			<property name="xpath">
 				<value>
-					<![CDATA[ //Attribute[ string:upper-case(@Name)="CLASS" ]  ]]>
+					<![CDATA[ //Attribute[ upper-case(@Name)="CLASS" ]  ]]>
 				</value>
 			</property>
 		</properties>
@@ -167,7 +167,7 @@ response.setHeader("Pragma", "No-cache");
 			<property name="xpath">
 				<value>
 					<![CDATA[ 
-	//Element[string:upper-case(@Name)="IFRAME"][count(Attribute[string:upper-case(@Name)="SRC" ]) = 0]
+	//Element[upper-case(@Name)="IFRAME"][count(Attribute[upper-case(@Name)="SRC" ]) = 0]
 					 ]]>
 				</value>
 			</property>
@@ -247,10 +247,10 @@ A missing 'meta' tag or page directive will trigger this rule, as well as a non-
 					<![CDATA[
 //Content[
 not(Element[@Name="meta"][
-   Attribute[@Name="content"]/AttributeValue[contains(string:lower-case(@Image),"charset=utf-8")]
+   Attribute[@Name="content"]/AttributeValue[contains(lower-case(@Image),"charset=utf-8")]
 ]) 
 and 
-    not(JspDirective[@Name='page']/JspDirectiveAttribute[@Name='contentType'][contains(string:lower-case(@Value),"charset=utf-8")])
+    not(JspDirective[@Name='page']/JspDirectiveAttribute[@Name='contentType'][contains(lower-case(@Value),"charset=utf-8")])
 ]
                     ]]>
 				</value>