svn commit: r617584 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/validation/java/org/apache/cocoon/components/validation/jaxp/JaxpResolver.java status.xml

[cz...@apache.org]

Author: cziegeler
Date: Fri Feb  1 10:13:33 2008
New Revision: 617584

URL: http://svn.apache.org/viewvc?rev=617584&view=rev
Log:
SOLVED - issue COCOON-2164: Bug in JaxpResolver in validation block 
https://issues.apache.org/jira/browse/COCOON-2164

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/jaxp/JaxpResolver.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/jaxp/JaxpResolver.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/jaxp/JaxpResolver.java?rev=617584&r1=617583&r2=617584&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/jaxp/JaxpResolver.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/jaxp/JaxpResolver.java Fri Feb  1 10:13:33 2008
@@ -45,7 +45,7 @@
     /**
      * <p>Resolve a resource into a {@link LSInput} from the provided location
      * information.</p>
-     * 
+     *
      * <p>This method will obtain a {@link InputSource} instance invoking the
      * {@link ValidationResolver#resolveEntity(String, String, String)} method
      * return it wrapped in a {@link JaxpInput} instance.</p>
@@ -54,12 +54,12 @@
      * @param namespace the namespace of the resource being resolved.
      * @param systemId the system identifier of the resource being resolved.
      * @param publicId the public identifier of the resource being resolved.
-     * @param base the base uri against wich relative resolution should happen. 
+     * @param base the base uri against wich relative resolution should happen.
      * @return a <b>non null</b> {@link LSInput} instance.
      * @throws LSException wrapping another {@link Exception}.
      */
-    public LSInput resolveResource(String type, String namespace, String systemId,
-                                   String publicId, String base)
+    public LSInput resolveResource(String type, String namespace, String publicId,
+                                   String systemId, String base)
     throws LSException {
         try {
             final InputSource source = this.resolveEntity(base, publicId, systemId);

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=617584&r1=617583&r2=617584&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Fri Feb  1 10:13:33 2008
@@ -182,6 +182,9 @@
 
   <changes>
   <release version="2.1.12" date="TBD">
+    <action dev="CZ" type="fix" fixes-bug="COCOON-2164" due-to="Nico Verwer" due-to-email="nverwer@email.com">
+      Validation Block: Fix error in JaxpResolver#resolveResource(..) where publicId and systemId where swapped.
+    </action>
     <action dev="VG" type="fix">
       Forms Block: Fixed concurrency issue in form definition builders code. If you have custom
       widgets, please implement WidgetDefinitionBuilder.buildWidgetDefinition(Element, WidgetDefinitionBuilderContext)