svn commit: r329536 - in /cocoon: blocks/linkrewriter/trunk/samples/sitedemo-ns/ trunk/ trunk/legal/ trunk/lib/ trunk/lib/core/ trunk/src/java/ trunk/src/java/org/apache/cocoon/components/modules/input/

[an...@apache.org]

Author: antonio
Date: Sat Oct 29 23:03:17 2005
New Revision: 329536

URL: http://svn.apache.org/viewcvs?rev=329536&view=rev
Log:
Fix bug COCOON-1616: Source that declares namespace fails JXPath/Linkrewriter/Input Modules

Added:
    cocoon/trunk/legal/commons-jxpath-1.2-r329470.jar.license.txt
      - copied unchanged from r329507, cocoon/trunk/legal/commons-jxpath-1.2.jar.license.txt
    cocoon/trunk/lib/core/commons-jxpath-1.2-r329470.jar   (with props)
Removed:
    cocoon/trunk/legal/commons-jxpath-1.2.jar.license.txt
    cocoon/trunk/lib/core/commons-jxpath-1.2.jar
Modified:
    cocoon/blocks/linkrewriter/trunk/samples/sitedemo-ns/sitemap.xmap
    cocoon/trunk/lib/jars.xml
    cocoon/trunk/src/java/Manifest.mf
    cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/JXPathHelper.java
    cocoon/trunk/status.xml

Modified: cocoon/blocks/linkrewriter/trunk/samples/sitedemo-ns/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/linkrewriter/trunk/samples/sitedemo-ns/sitemap.xmap?rev=329536&r1=329535&r2=329536&view=diff
==============================================================================
--- cocoon/blocks/linkrewriter/trunk/samples/sitedemo-ns/sitemap.xmap (original)
+++ cocoon/blocks/linkrewriter/trunk/samples/sitedemo-ns/sitemap.xmap Sat Oct 29 23:03:17 2005
@@ -32,7 +32,6 @@
         </input-module>
         <prefix>/site/</prefix>
         <suffix>/@href</suffix>
-        <namespace-uri>http://apache.org/cocoon/linkmap/1.0</namespace-uri>
       </input-module>
     </map:transformer>
   </map:transformers>
@@ -52,7 +51,6 @@
        <!-- Uses {src} and {prefix} var interpolation -->
        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
          <map:parameter name="prefix" value="/site/"/>
-         <map:parameter name="namespace-uri" value="http://apache.org/cocoon/linkmap/1.0"/>
        </map:transform>
        <map:serialize type="xml"/>
      </map:match>

Added: cocoon/trunk/lib/core/commons-jxpath-1.2-r329470.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/core/commons-jxpath-1.2-r329470.jar?rev=329536&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/lib/core/commons-jxpath-1.2-r329470.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/trunk/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?rev=329536&r1=329535&r2=329536&view=diff
==============================================================================
--- cocoon/trunk/lib/jars.xml (original)
+++ cocoon/trunk/lib/jars.xml Sat Oct 29 23:03:17 2005
@@ -592,7 +592,7 @@
     <title>Jakarta Commons JXPath</title>
     <description>XPath interpreter. Work with JavaBeans and DOM nodes</description>
     <used-by>Flow, JXPath logicsheet</used-by>
-    <lib>core/commons-jxpath-1.2.jar</lib>
+    <lib>core/commons-jxpath-1.2-r329470.jar</lib>
     <homepage>http://jakarta.apache.org/commons/jxpath/</homepage>
   </file>
 

Modified: cocoon/trunk/src/java/Manifest.mf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/Manifest.mf?rev=329536&r1=329535&r2=329536&view=diff
==============================================================================
--- cocoon/trunk/src/java/Manifest.mf (original)
+++ cocoon/trunk/src/java/Manifest.mf Sat Oct 29 23:03:17 2005
@@ -21,7 +21,7 @@
  commons-jci-r306555.jar,
  commons-javaflow-r306555.jar,
  commons-jexl-1.0.jar,
- commons-jxpath-1.2.jar,
+ commons-jxpath-1.2-r329470.jar,
  commons-lang-2.1.jar,
  commons-logging-1.0.4.jar,
  ehcache-1.1.jar,

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/JXPathHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/JXPathHelper.java?rev=329536&r1=329535&r2=329536&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/JXPathHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/JXPathHelper.java Sat Oct 29 23:03:17 2005
@@ -71,6 +71,7 @@
 
         // Setup context with local config
         context.setLenient(setup.isLenient());
+        context.setDefaultNamespaceIgnored(true);
         context.setFunctions(local.getLibrary());
         if (local.getNamespaces() != null) {
             for (Iterator i = local.getNamespaces().entrySet().iterator(); i.hasNext();) {

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=329536&r1=329535&r2=329536&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Sat Oct 29 23:03:17 2005
@@ -175,6 +175,9 @@
   <!-- These are the changes from the last 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="AN" type="add" fixes-bug="COCOON-1616">
+      Source that declares namespace fails JXPath/Linkrewriter/Input Modules.
+    </action>
     <action dev="CZ" type="update">
       Each block has now it's own status file.
     </action>