cziegeler 2002/11/20 04:35:19
Modified: src/scratchpad/src/org/apache/cocoon/validation/schematron
Tag: cocoon_2_0_3_branch SchematronValidator.java
lib Tag: cocoon_2_0_3_branch jars.xml
src/scratchpad/src/org/apache/cocoon/xmlform Tag:
cocoon_2_0_3_branch FormBeanBinder.java
Removed: src/scratchpad/lib Tag: cocoon_2_0_3_branch
commons-JXPath-20020320.jar
lib/optional Tag: cocoon_2_0_3_branch commons-jxpath.jar
Log:
Updating to jxpath 1.0
Revision Changes Path
No revision
No revision
1.1.2.3 +4 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronValidator.java
Index: SchematronValidator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronValidator.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SchematronValidator.java 5 Jun 2002 17:19:30 -0000 1.1.2.2
+++ SchematronValidator.java 20 Nov 2002 12:35:18 -0000 1.1.2.3
@@ -337,10 +337,9 @@
*/
protected List evalRule( JXPathContext jxpContext, Rule rule )
{
- List elements = jxpContext.locate( rule.getContext() );
List failedRules = new ArrayList();
- Iterator pointerIter = elements.iterator ();
+ Iterator pointerIter = jxpContext.iteratePointers( rule.getContext() );
while ( pointerIter.hasNext() )
{
No revision
No revision
1.11.2.14 +1 -1 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.11.2.13
retrieving revision 1.11.2.14
diff -u -r1.11.2.13 -r1.11.2.14
--- jars.xml 17 Nov 2002 19:04:28 -0000 1.11.2.13
+++ jars.xml 20 Nov 2002 12:35:18 -0000 1.11.2.14
@@ -268,7 +268,7 @@
<title>Jakarta Commons JXPath</title>
<description>XPath interpreter. Work with JavaBeans and DOM nodes</description>
<used-by>JXPath logicsheet and XMLForm</used-by>
- <lib>optional/commons-jxpath.jar</lib>
+ <lib>optional/commons-jxpath-1.0.jar</lib>
<homepage>http://jakarta.apache.org/commons/jxpath/</homepage>
</file>
<file>
No revision
No revision
1.1.2.2 +5 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/xmlform/Attic/FormBeanBinder.java
Index: FormBeanBinder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/xmlform/Attic/FormBeanBinder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FormBeanBinder.java 24 May 2002 09:06:55 -0000 1.1.2.1
+++ FormBeanBinder.java 20 Nov 2002 12:35:18 -0000 1.1.2.2
@@ -102,7 +102,7 @@
String path = (String) enum.nextElement ();
Object[] values = request.getParameterValues ( path );
- Pointer pointer = context.locateValue( path );
+ Pointer pointer = context.getPointer( path );
Object property = pointer.getValue();
// if the property is a collection, set value as array
if ( property instanceof Collection )
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
