cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl AbstractDatatypeBuilder.java

[bruno]

bruno       2004/04/21 06:20:27

  Modified:    src/blocks/forms/java/org/apache/cocoon/forms/datatype
                        DefaultDatatypeManager.java
               src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl
                        AbstractDatatypeBuilder.java
  Log:
  give logger to SimpleServiceSelector
  
  Revision  Changes    Path
  1.3       +3 -1      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultDatatypeManager.java
  
  Index: DefaultDatatypeManager.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultDatatypeManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultDatatypeManager.java       15 Apr 2004 18:09:03 -0000      1.2
  +++ DefaultDatatypeManager.java       21 Apr 2004 13:20:27 -0000      1.3
  @@ -67,11 +67,13 @@
   
       public void initialize() throws Exception {
           typeBuilderSelector = new SimpleServiceSelector("datatype", 
DatatypeBuilder.class);
  +        typeBuilderSelector.enableLogging(getLogger());
           typeBuilderSelector.contextualize(context);
           typeBuilderSelector.service(serviceManager);
           typeBuilderSelector.configure(configuration.getChild("datatypes"));
   
           validationRuleBuilderSelector = new 
SimpleServiceSelector("validation-rule", ValidationRuleBuilder.class);
  +        validationRuleBuilderSelector.enableLogging(getLogger());
           validationRuleBuilderSelector.contextualize(context);
           validationRuleBuilderSelector.service(serviceManager);
           
validationRuleBuilderSelector.configure(configuration.getChild("validation-rules"));
  
  
  
  1.4       +4 -2      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
  
  Index: AbstractDatatypeBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractDatatypeBuilder.java      15 Apr 2004 18:09:03 -0000      1.3
  +++ AbstractDatatypeBuilder.java      21 Apr 2004 13:20:27 -0000      1.4
  @@ -24,6 +24,7 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.cocoon.forms.Constants;
   import org.apache.cocoon.forms.datatype.DatatypeBuilder;
   import org.apache.cocoon.forms.datatype.DatatypeManager;
  @@ -39,7 +40,7 @@
    * will derive from this class.
    * @version $Id$
    */
  -public abstract class AbstractDatatypeBuilder implements DatatypeBuilder, 
Serviceable, Configurable, Contextualizable {
  +public abstract class AbstractDatatypeBuilder extends AbstractLogEnabled 
implements DatatypeBuilder, Serviceable, Configurable, Contextualizable {
       protected ServiceManager serviceManager;
       private SimpleServiceSelector convertorBuilders;
       private String defaultConvertorHint;
  @@ -57,6 +58,7 @@
       public void configure(Configuration configuration) throws 
ConfigurationException {
           convertorBuilders = new SimpleServiceSelector("convertor", 
ConvertorBuilder.class);
           try {
  +            convertorBuilders.enableLogging(getLogger());
               convertorBuilders.contextualize(context);
               convertorBuilders.service(serviceManager);
           } catch (Exception e) {