cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/util SimpleServiceSelector.java

[proyal]

proyal      2003/09/10 10:37:45

  Modified:    src/blocks/apples/java/org/apache/cocoon/components/flow/apples
                        ApplesProcessor.java
               src/blocks/woody/java/org/apache/cocoon/woody/acting
                        HandleFormSubmitAction.java
               src/blocks/woody/java/org/apache/cocoon/woody/util
                        SimpleServiceSelector.java
  Log:
  Use slightly simpler variant of the LifecycleHelper methods
  
  Revision  Changes    Path
  1.9       +1 -1      
cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
  
  Index: ApplesProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ApplesProcessor.java      4 Sep 2003 15:25:09 -0000       1.8
  +++ ApplesProcessor.java      10 Sep 2003 17:37:45 -0000      1.9
  @@ -88,7 +88,7 @@
           
           LifecycleHelper.setupComponent( app, getLogger(), appleContext, 
                                           this.serviceManager, super.manager,  
  -                                        null, null, null, true);
  +                                        null, null, true);
           
           processApple(params, env, app, wk);
       }
  
  
  
  1.9       +1 -1      
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/acting/HandleFormSubmitAction.java
  
  Index: HandleFormSubmitAction.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/acting/HandleFormSubmitAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HandleFormSubmitAction.java       28 Jul 2003 15:54:08 -0000      1.8
  +++ HandleFormSubmitAction.java       10 Sep 2003 17:37:45 -0000      1.9
  @@ -104,7 +104,7 @@
                   // TODO cache these classes
                   Class clazz = Class.forName(formHandlerClassName);
                   formHandler = (FormHandler)clazz.newInstance();
  -                LifecycleHelper.setupComponent(formHandler, null, null, 
manager, null, null, null);
  +                LifecycleHelper.setupComponent(formHandler, null, null, 
manager, null, null);
                   formHandler.setup(form);
                   form.setFormHandler(formHandler);
               }
  
  
  
  1.4       +1 -1      
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/util/SimpleServiceSelector.java
  
  Index: SimpleServiceSelector.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/util/SimpleServiceSelector.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SimpleServiceSelector.java        12 Aug 2003 16:33:08 -0000      1.3
  +++ SimpleServiceSelector.java        10 Sep 2003 17:37:45 -0000      1.4
  @@ -104,7 +104,7 @@
               Object component = null;
               try {
                   component = clazz.newInstance();
  -                LifecycleHelper lifecycleHelper = new 
LifecycleHelper(getLogger(), null, serviceManager, null, null, 
componentConfs[i]);
  +                LifecycleHelper lifecycleHelper = new 
LifecycleHelper(getLogger(), null, serviceManager, null, componentConfs[i]);
                   lifecycleHelper.setupComponent(component);
               } catch (Exception e) {
                   throw new ConfigurationException("Error creating " + 
hintShortHand + " declared at " + componentConfs[i].getLocation(), e);