You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2008/03/25 04:23:19 UTC
svn commit: r640682 -
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/
Author: vgritsenko
Date: Mon Mar 24 20:23:17 2008
New Revision: 640682
URL: http://svn.apache.org/viewvc?rev=640682&view=rev
Log:
restore cforms 1.0 compatibility: add getLogger() method
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -20,8 +20,6 @@
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* AggregateJXPathBinding provides an implementation of a {@link Binding}
@@ -36,7 +34,6 @@
*/
public class AggregateJXPathBinding extends ComposedJXPathBindingBase {
- private static Log LOG = LogFactory.getLog( AggregateJXPathBinding.class );
private final String xpath;
private final String widgetId;
@@ -72,8 +69,8 @@
jxpc.getRelativeContext(jxpc.getPointer(this.xpath));
super.doLoad(aggregate, subContext);
aggregate.combineFields();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Done loading " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Done loading " + this);
}
}
@@ -89,8 +86,8 @@
JXPathContext subContext =
jxpc.getRelativeContext(jxpc.getPointer(this.xpath));
super.doSave(aggregate, subContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Done saving " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Done saving " + this);
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -20,8 +20,6 @@
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* CaseJXPathBinding provides an implementation of a {@link Binding}
@@ -36,7 +34,6 @@
*/
public class CaseJXPathBinding extends ComposedJXPathBindingBase {
- private static Log LOG = LogFactory.getLog( CaseJXPathBinding.class );
private final String xpath;
private final String widgetId;
@@ -75,8 +72,8 @@
subBindings[i].loadFormFromModel(unionWidget, jxpc);
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("done loading " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done loading " + this);
}
}
}
@@ -97,8 +94,8 @@
subBindings[i].saveFormToModel(unionWidget, jxpc);
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("done saving " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done saving " + this);
}
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -22,8 +22,6 @@
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* ContextJXPathBinding provides an implementation of a {@link Binding}
@@ -34,8 +32,6 @@
*/
public class ContextJXPathBinding extends ComposedJXPathBindingBase {
- private static Log LOG = LogFactory.getLog( ContextJXPathBinding.class );
-
/**
* the relative contextPath for the sub-bindings of this context
*/
@@ -88,12 +84,12 @@
if (ptr.getNode() != null) {
JXPathContext subContext = jxpc.getRelativeContext(ptr);
super.doLoad(frmModel, subContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("done loading " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done loading " + this);
}
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("non-existent path: skipping " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("non-existent path: skipping " + this);
}
}
}
@@ -114,8 +110,8 @@
}
JXPathContext subContext = jxpc.getRelativeContext(ptr);
super.doSave(frmModel, subContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("done saving " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done saving " + this);
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -21,8 +21,6 @@
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* InsertBeanJXPathBinding provides an implementation of a {@link Binding}
@@ -38,8 +36,6 @@
*/
public class InsertBeanJXPathBinding extends JXPathBindingBase {
- private static Log LOG = LogFactory.getLog( InsertBeanJXPathBinding.class );
-
private final String className;
private final String addMethodName;
@@ -95,8 +91,8 @@
// invoke this method with this new beast.
addMethod.invoke(parent, args);
- if (LOG.isDebugEnabled()) {
- LOG.debug("InsertBean performed.");
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("InsertBean performed.");
}
} catch (Exception e) {
throw new RuntimeException("InsertBean failed.", e);
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -19,8 +19,6 @@
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
@@ -39,8 +37,6 @@
*/
public class InsertNodeJXPathBinding extends JXPathBindingBase {
- private static Log LOG = LogFactory.getLog( InsertNodeJXPathBinding.class );
-
private final DocumentFragment template;
/**
@@ -74,8 +70,8 @@
Node toInsert = targetDoc.importNode(this.template, true);
parentNode.appendChild(toInsert);
- if (LOG.isDebugEnabled())
- LOG.debug("InsertNode executed.");
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("InsertNode executed.");
// jxpc.setFactory(new AbstractFactory() {
// public boolean createObject(JXPathContext context, Pointer pointer,
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JXPathBindingBase.java Mon Mar 24 20:23:17 2008
@@ -22,6 +22,7 @@
import org.apache.cocoon.forms.binding.library.Library;
import org.apache.cocoon.forms.formmodel.Widget;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.util.jxpath.DOMFactory;
import org.apache.commons.jxpath.AbstractFactory;
@@ -30,8 +31,6 @@
import org.apache.commons.jxpath.ri.model.beans.BeanPropertyPointer;
import org.apache.commons.jxpath.util.TypeUtils;
import org.apache.commons.lang.exception.NestableRuntimeException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Provides a base class for hooking up Binding implementations that use the
@@ -40,9 +39,9 @@
*
* @version $Id$
*/
-public abstract class JXPathBindingBase implements Binding {
+public abstract class JXPathBindingBase extends AbstractLogEnabled
+ implements Binding {
- private static Log LOG = LogFactory.getLog( JXPathBindingBase.class );
/**
* the local library, if this is the top binding
*/
@@ -100,7 +99,7 @@
try {
return !this.enclosingLibrary.dependenciesHaveChanged();
} catch (Exception e) {
- LOG.error("Error checking dependencies!", e);
+ getLogger().error("Error checking dependencies!", e);
throw new NestableRuntimeException("Error checking dependencies!", e);
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -26,8 +26,6 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mozilla.javascript.Function;
import org.mozilla.javascript.Scriptable;
@@ -40,8 +38,6 @@
final static String[] LOAD_PARAMS = { "widget", "jxpathPointer", "jxpathContext", "childBindings" };
final static String[] SAVE_PARAMS = { "widget", "jxpathPointer", "jxpathContext", "childBindings" };
- private static Log LOG = LogFactory.getLog( JavaScriptJXPathBinding.class );
-
private final String id;
private final String path;
private final Function loadScript;
@@ -103,8 +99,8 @@
throw new RuntimeException("Error invoking JavaScript event handler", e);
}
} else {
- if (LOG.isInfoEnabled()) {
- LOG.info("[Javascript Binding] - loadForm: No javascript code available. Widget id=" + this.getId());
+ if (getLogger().isInfoEnabled()) {
+ getLogger().info("[Javascript Binding] - loadForm: No javascript code available. Widget id=" + this.getId());
}
}
}
@@ -129,8 +125,8 @@
throw new RuntimeException("Error invoking JavaScript event handler", e);
}
} else {
- if (LOG.isInfoEnabled()) {
- LOG.info("[Javascript Binding] - saveForm: No code available on the javascript binding with id '" + getId() + "'");
+ if (getLogger().isInfoEnabled()) {
+ getLogger().info("[Javascript Binding] - saveForm: No code available on the javascript binding with id '" + getId() + "'");
}
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -26,8 +26,6 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Simple binding for multi fields: on save, first deletes the target data
@@ -37,7 +35,6 @@
*/
public class MultiValueJXPathBinding extends JXPathBindingBase {
- private static Log LOG = LogFactory.getLog( MultiValueJXPathBinding.class );
private final String multiValueId;
private final String multiValuePath;
private final String rowPath;
@@ -98,7 +95,7 @@
else
value = null;
} else {
- LOG.warn("Convertor ignored on backend-value which isn't of type String.");
+ getLogger().warn("Convertor ignored on backend-value which isn't of type String.");
}
}
@@ -108,8 +105,8 @@
widget.setValue(list.toArray());
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("done loading values " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done loading values " + this);
}
}
@@ -162,17 +159,12 @@
update = true;
}
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("done saving " + this + " -- on-update == " + update);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done saving " + this + " -- on-update == " + update);
}
-
-
-
}
public String toString() {
return "MultiValueJXPathBinding [widget=" + this.multiValueId + ", xpath=" + this.multiValuePath + "]";
}
-
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -30,8 +30,6 @@
import org.apache.commons.collections.ListUtils;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* RepeaterJXPathBinding provides an implementation of a {@link Binding}
@@ -42,8 +40,6 @@
*/
public class RepeaterJXPathBinding extends JXPathBindingBase {
- private static Log LOG = LogFactory.getLog( RepeaterJXPathBinding.class );
-
private final String repeaterId;
private final String repeaterPath;
private final String rowPath;
@@ -155,8 +151,10 @@
this.rowBinding.loadFormFromModel(thisRow, rowContext);
}
}
- if (LOG.isDebugEnabled())
- LOG.debug("done loading rows " + this);
+
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done loading rows " + this);
+ }
}
/**
@@ -262,13 +260,13 @@
this.rowPathForInsert + "[" + indexCount + "]");
JXPathContext newRowContext =
repeaterContext.getRelativeContext(newRowContextPointer);
- if (LOG.isDebugEnabled()) {
- LOG.debug("inserted row at " + newRowContextPointer.asPath());
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("inserted row at " + newRowContextPointer.asPath());
}
// + rebind to children for update
this.rowBinding.saveFormToModel(thisRow, newRowContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("bound new row");
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("bound new row");
}
indexCount++;
}
@@ -279,8 +277,9 @@
// }
// }
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("done saving rows " + this);
+
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done saving rows " + this);
}
}
@@ -343,9 +342,9 @@
else
value = null;
} else {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Convertor ignored on backend-value " +
- "which isn't of type String.");
+ if (getLogger().isWarnEnabled()) {
+ getLogger().warn("Convertor ignored on backend-value " +
+ "which isn't of type String.");
}
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -19,8 +19,6 @@
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* SetAttributeJXPathBinding provides an implementation of a {@link Binding}
@@ -34,7 +32,6 @@
*/
public class SetAttributeJXPathBinding extends JXPathBindingBase {
- private static Log LOG = LogFactory.getLog( SetAttributeJXPathBinding.class );
private final String name;
private final String value;
@@ -65,8 +62,8 @@
*/
public void doSave(Widget frmModel, JXPathContext jxpc) {
jxpc.setValue("@" + this.name, this.value);
- if (LOG.isDebugEnabled()) {
- LOG.debug("done saving " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done saving " + this);
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -23,8 +23,6 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Simple binding for repeaters: on save, first deletes the target data
@@ -37,7 +35,6 @@
*/
public class SimpleRepeaterJXPathBinding extends JXPathBindingBase {
- private static Log LOG = LogFactory.getLog( SimpleRepeaterJXPathBinding.class );
private final String repeaterId;
private final String repeaterPath;
private final String rowPath;
@@ -107,8 +104,8 @@
this.rowBinding.loadFormFromModel(thisRow, rowContext);
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("done loading rows " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done loading rows " + this);
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -23,8 +23,6 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -41,7 +39,6 @@
*/
public class TempRepeaterJXPathBinding extends JXPathBindingBase {
- private static Log LOG = LogFactory.getLog( TempRepeaterJXPathBinding.class );
private final String repeaterId;
private final String repeaterPath;
private final String rowPath;
@@ -168,8 +165,9 @@
}
}
- if (LOG.isDebugEnabled())
- LOG.debug("done loading rows " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done loading rows " + this);
+ }
}
public void doSave(Widget frmModel, JXPathContext jctx) throws BindingException {
@@ -239,13 +237,13 @@
rowNode.appendChild(list.item(0));
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("bound new row");
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("bound new row");
}
}
} else {
- LOG.warn("TempRepeaterBinding has detected rows to insert, " +
- "but misses the <on-insert-row> binding to do it.");
+ getLogger().warn("TempRepeaterBinding has detected rows to insert, " +
+ "but misses the <on-insert-row> binding to do it.");
}
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -20,8 +20,6 @@
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* UnionJXPathBinding provides an implementation of a {@link Binding}
@@ -36,7 +34,6 @@
*/
public class UnionJXPathBinding extends ComposedJXPathBindingBase {
- private static Log LOG = LogFactory.getLog( UnionJXPathBinding.class );
private final String xpath;
private final String widgetId;
@@ -80,8 +77,8 @@
subBindings[i].loadFormFromModel(unionWidget, subContext);
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("done loading " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done loading " + this);
}
}
@@ -100,8 +97,8 @@
subBindings[i].saveFormToModel(unionWidget, subContext);
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("done saving " + this);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done saving " + this);
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java?rev=640682&r1=640681&r2=640682&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java Mon Mar 24 20:23:17 2008
@@ -24,8 +24,6 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* ValueJXPathBinding provides an implementation of a {@link Binding}
@@ -37,8 +35,6 @@
*/
public class ValueJXPathBinding extends JXPathBindingBase {
- private static Log LOG = LogFactory.getLog( ValueJXPathBinding.class );
-
/**
* The xpath expression to the objectModel property
*/
@@ -109,13 +105,13 @@
else
value = null;
} else {
- LOG.warn("Convertor ignored on backend-value which isn't of type String.");
+ getLogger().warn("Convertor ignored on backend-value which isn't of type String.");
}
}
widget.setValue(value);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Done loading " + this + " -- value= " + value);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Done loading " + this + " -- value= " + value);
}
}
@@ -131,8 +127,8 @@
}
Object oldValue = jxpc.getValue(this.xpath);
- if (LOG.isDebugEnabled()) {
- LOG.debug("value= " + value + " -- oldvalue=" + oldValue);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("value= " + value + " -- oldvalue=" + oldValue);
}
boolean update = false;
@@ -148,8 +144,8 @@
} catch (JXPathException e) {
// if the value has been set to null and the underlying model is a bean, then
// JXPath will not be able to create a relative context
- if (LOG.isDebugEnabled()) {
- LOG.debug("(Ignorable) problem binding field " + widget.getRequestParameterName(), e);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("(Ignorable) problem binding field " + widget.getRequestParameterName(), e);
}
}
if (subContext != null) {
@@ -159,8 +155,8 @@
update = true;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("done saving " + this + " -- value= " + value + " -- on-update == " + update);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("done saving " + this + " -- value= " + value + " -- on-update == " + update);
}
}