Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 74227 invoked from network); 20 Dec 2003 14:54:04 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 20 Dec 2003 14:54:04 -0000 Received: (qmail 79325 invoked by uid 500); 20 Dec 2003 14:54:00 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 79273 invoked by uid 500); 20 Dec 2003 14:53:59 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 79259 invoked by uid 500); 20 Dec 2003 14:53:59 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 79256 invoked from network); 20 Dec 2003 14:53:59 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 20 Dec 2003 14:53:59 -0000 Received: (qmail 74187 invoked by uid 1546); 20 Dec 2003 14:54:03 -0000 Date: 20 Dec 2003 14:54:03 -0000 Message-ID: <20031220145403.74186.qmail@minotaur.apache.org> From: mpo@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding JXPathBindingBase.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mpo 2003/12/20 06:54:03 Modified: src/blocks/woody/java/org/apache/cocoon/woody/binding JXPathBindingBase.java Log: Fixing the clumsy removal of the automatic registration of the DOMFactory for XML backends. (introduced in 1.5 and wrongfully removed in 1.7) Revision Changes Path 1.7 +6 -1 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBase.java Index: JXPathBindingBase.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBase.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JXPathBindingBase.java 18 Dec 2003 07:57:21 -0000 1.6 +++ JXPathBindingBase.java 20 Dec 2003 14:54:03 -0000 1.7 @@ -52,8 +52,10 @@ import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.logger.Logger; +import org.apache.cocoon.util.jxpath.DOMFactory; import org.apache.cocoon.woody.formmodel.Widget; import org.apache.commons.jxpath.JXPathContext; +import org.w3c.dom.Node; /** * Provides a base class for hooking up Binding implementations that use the @@ -158,8 +160,11 @@ if (!(objModel instanceof JXPathContext)) { jxpc = JXPathContext.newContext(objModel); jxpc.setLenient(true); + if (objModel instanceof Node) { + jxpc.setFactory(new DOMFactory()); + } } else { - jxpc = (JXPathContext) objModel; + jxpc = (JXPathContext) objModel; } return jxpc; }