jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r489238 - in /jakarta/taglibs/proper/standard/trunk: src/org/apache/taglibs/standard/tag/common/xml/ test/org/apache/taglibs/standard/tag/el/xml/ test/web/org/apache/taglibs/standard/tag/el/xml/
Date Thu, 21 Dec 2006 01:11:42 GMT
Author: bayard
Date: Wed Dec 20 17:11:42 2006
New Revision: 489238

URL: http://svn.apache.org/viewvc?view=rev&rev=489238
Log:
Applying cactus test and patch for issue #30068

Added:
    jakarta/taglibs/proper/standard/trunk/test/org/apache/taglibs/standard/tag/el/xml/
    jakarta/taglibs/proper/standard/trunk/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java
  (with props)
    jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/
    jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp
  (with props)
    jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.xml
  (with props)
Modified:
    jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java

Modified: jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java?view=diff&rev=489238&r1=489237&r2=489238
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
(original)
+++ jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
Wed Dec 20 17:11:42 2006
@@ -633,7 +633,8 @@
         boolean whetherOrigXPath = true;
         
         // If contextNode is not null then  just pass the values to Xalan XPath
-        if ( n != null ) {
+        // unless this is an expression that starts off with an xml document 
+        if ( n != null && !xpath.startsWith("$") ) {
             return n;
         }
         

Added: jakarta/taglibs/proper/standard/trunk/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java?view=auto&rev=489238
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java
(added)
+++ jakarta/taglibs/proper/standard/trunk/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java
Wed Dec 20 17:11:42 2006
@@ -0,0 +1,47 @@
+/*
+ * Copyright 1999,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.taglibs.standard.tag.el.xml;
+
+import javax.servlet.jsp.*;
+import org.apache.cactus.*;
+import org.apache.taglibs.standard.testutil.TestUtil;
+
+public class Test30068 extends JspTestCase {
+
+    public Test30068(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void test30068() throws Exception {
+        String toInclude = TestUtil.getTestJsp(this);
+        pageContext.include(toInclude);
+
+        String correct = (String) pageContext.getAttribute("correct", PageContext.APPLICATION_SCOPE);
+        String incorrect = (String) pageContext.getAttribute("incorrect", PageContext.APPLICATION_SCOPE);
+
+        assertEquals("The incorrect answer is not an empty string", "", incorrect);
+        assertEquals("The correct answer would be 42", "42", correct);
+    }
+}

Propchange: jakarta/taglibs/proper/standard/trunk/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp?view=auto&rev=489238
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp
(added)
+++ jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp
Wed Dec 20 17:11:42 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
+
+<x:parse var="sample">
+<sample>
+  <link href="/org/apache/taglibs/standard/tag/el/xml/Test30068.xml"/>
+</sample>
+</x:parse>
+
+<x:forEach select="$sample/sample/link">
+  <c:set var="link">
+    <x:out select="@href"/>
+  </c:set>
+
+  <c:import url="${link}" varReader="r2">
+    <x:parse var="sample2" doc="${r2}"/>
+  </c:import>
+
+  <!-- *** this does not work *** -->
+  <c:set var="correct" scope="application"><x:out select="$sample2/sample/text"/></c:set>
+
+  <!-- this does work, but is not correct -->
+  <c:set var="incorrect" scope="application"><x:out select="$sample2/text"/></c:set>
+
+</x:forEach>
+
+<!-- for manual testing -->
+Correct: ${correct}<br/>
+Incorrect: ${incorrect}

Propchange: jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.xml
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.xml?view=auto&rev=489238
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.xml
(added)
+++ jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.xml
Wed Dec 20 17:11:42 2006
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<sample>
+  <text>42</text>
+</sample>

Propchange: jakarta/taglibs/proper/standard/trunk/test/web/org/apache/taglibs/standard/tag/el/xml/Test30068.xml
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org


Mime
View raw message