cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject svn commit: rev 55144 - cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container
Date Wed, 20 Oct 2004 12:26:10 GMT
Author: ugo
Date: Wed Oct 20 05:26:09 2004
New Revision: 55144

Modified:
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/AbstractComponentHandler.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/AbstractServiceManager.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceSelector.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentFactory.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentsSelector.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/PoolableComponentHandler.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/RoleManager.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/SingleThreadedComponentHandler.java
  (contents, props changed)
   cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ThreadSafeComponentHandler.java
  (contents, props changed)
Log:
Javadocs, CascadingRuntimeException -> RuntimeException

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/AbstractComponentHandler.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/AbstractComponentHandler.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/AbstractComponentHandler.java
Wed Oct 20 05:26:09 2004
@@ -30,7 +30,7 @@
  * This class acts like a Factory to instantiate the correct version
  * of the component handler that you need.
  *
- * @version CVS $Revision: 1.6 $ $Date: 2004/02/28 11:47:14 $
+ * @version CVS $Id$
  */
 public abstract class AbstractComponentHandler {
     

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/AbstractServiceManager.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/AbstractServiceManager.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/AbstractServiceManager.java
Wed Oct 20 05:26:09 2004
@@ -33,9 +33,9 @@
 import org.apache.avalon.framework.thread.ThreadSafe;
 
 /**
- * Base class for all component managers: ServiceManager and ServiceSelector
+ * Base class for all service managers: ServiceManager and ServiceSelector
  *
- * @version CVS $Revision: 1.6 $ $Date: 2004/02/28 11:47:14 $
+ * @version CVS $Id$
  */
 public abstract class AbstractServiceManager
 extends AbstractLogEnabled
@@ -67,7 +67,7 @@
 
     
     /** 
-     * Create the ComponentLocator with a Classloader
+     * Create the ServiceManager with a Classloader
      */
     public AbstractServiceManager( final ClassLoader loader ) {
         if( null == loader ) {

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceManager.java
Wed Oct 20 05:26:09 2004
@@ -33,15 +33,15 @@
 import org.apache.cocoon.components.SitemapConfigurationHolder;
 
 /**
- * Default component manager for Cocoon's components.
+ * Default service manager for Cocoon's components.
  *
- * @version CVS $Revision: 1.6 $ $Date: 2004/02/28 11:47:14 $
+ * @version CVS $Revision: 1.6 $Id$
  */
 public class CocoonServiceManager
 extends AbstractServiceManager
 implements ServiceManager, Configurable {
     
-    /** The parent ComponentLocator */
+    /** The parent ServiceManager */
     private final ServiceManager parentManager;
 
     /** added component handlers before initialization to maintain
@@ -56,7 +56,7 @@
      * our lifecycle. */
     private ArrayList parentAwareComponents = new ArrayList();
 
-    /** Create the ComponentLocator with a Classloader and parent ComponentLocator */
+    /** Create the ServiceManager with a Classloader and parent ServiceManager */
     public CocoonServiceManager( final ServiceManager parent, 
                                  final ClassLoader loader ) {
         super(loader);
@@ -100,7 +100,7 @@
                 } catch( Exception e ) {
                     if( this.getLogger().isWarnEnabled() ) {
                         final String message =
-                            "ComponentLocator exception from parent CM during lookup.";
+                            "ComponentLocator exception from parent SM during lookup.";
                         this.getLogger().warn( message, e );
                     }
                     // ignore.  If the exception is thrown, we try to

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceSelector.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceSelector.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/CocoonServiceSelector.java
Wed Oct 20 05:26:09 2004
@@ -33,7 +33,7 @@
 /**
  * Default component selector for Cocoon's components.
  *
- * @version CVS $Revision: 1.6 $ $Date: 2004/02/28 11:47:14 $
+ * @version CVS $Id$
  */
 public class CocoonServiceSelector
 extends AbstractServiceManager

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentFactory.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentFactory.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentFactory.java
Wed Oct 20 05:26:09 2004
@@ -31,7 +31,7 @@
 /**
  * Factory for Avalon based components.
  *
- * @version CVS $Revision: 1.6 $ $Date: 2004/02/28 11:47:14 $
+ * @version CVS $Id$
  */
 public class ComponentFactory {
     
@@ -69,7 +69,7 @@
      *
      * @param componentClass the class to instantiate (must have a default constructor).
      * @param configuration the <code>Configuration</code> object to pass to
new instances.
-     * @param componentManager the component manager to pass to <code>Composable</code>s.
+     * @param seerviceManager the service manager to pass to <code>Serviceable</code>s.
      * @param context the <code>Context</code> to pass to <code>Contexutalizable</code>s.
      *
      */

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentsSelector.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentsSelector.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ComponentsSelector.java
Wed Oct 20 05:26:09 2004
@@ -18,7 +18,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.avalon.framework.CascadingRuntimeException;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -39,7 +38,7 @@
 /**
  * Component selector for sitemap components.
  *
- * @version CVS $Id: ComponentsSelector.java 47303 2004-09-27 16:21:30Z vgritsenko $
+ * @version CVS $Id$
  */
 public class ComponentsSelector extends CocoonServiceSelector {
 
@@ -170,7 +169,7 @@
             // Don't keep known hints (they're no more needed)
             this.knownHints = null;
         } catch (Exception e) {
-            throw new CascadingRuntimeException("Cannot setup default components", e);
+            throw new RuntimeException("Cannot setup default components", e);
         }
     }
 

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/PoolableComponentHandler.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/PoolableComponentHandler.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/PoolableComponentHandler.java
Wed Oct 20 05:26:09 2004
@@ -51,7 +51,7 @@
  *  but not pooled.</li>
  * </ul>
  *
- * @version CVS $Revision: 1.5 $ $Date: 2004/03/30 14:15:23 $
+ * @version CVS $Id$
  */
 public class PoolableComponentHandler
 extends AbstractComponentHandler {

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/RoleManager.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/RoleManager.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/RoleManager.java
Wed Oct 20 05:26:09 2004
@@ -29,7 +29,7 @@
  * Default RoleManager implementation.  It populates the RoleManager
  * from a configuration file.
  *
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:14 $
+ * @version CVS $Id$
  */
 public class RoleManager
 extends AbstractLogEnabled

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/SingleThreadedComponentHandler.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/SingleThreadedComponentHandler.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/SingleThreadedComponentHandler.java
Wed Oct 20 05:26:09 2004
@@ -22,20 +22,18 @@
  * The DefaultComponentHandler to make sure components are initialized
  * and destroyed correctly.
  *
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:14 $
+ * @version CVS $Id$
  */
 public class SingleThreadedComponentHandler
 extends AbstractComponentHandler {
 
     /**
-     * Create a DefaultComponentHandler which manages a pool of Components
+     * Create a SingleThreadedComponentHandler which manages a pool of Components
      *  created by the specified factory object.
      *
+     * @param logger The logger to use
      * @param factory The factory object which is responsible for creating the components
-     *                managed by the ComponentHandler.
-     * @param config The configuration to use to configure the pool.
-     *
-     * @throws Exception If there are any problems creating the handler.
+     *                managed by the handler.
      */
     public SingleThreadedComponentHandler( final Logger logger,
                                     final ComponentFactory factory ) {

Modified: cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ThreadSafeComponentHandler.java
==============================================================================
--- cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ThreadSafeComponentHandler.java
(original)
+++ cocoon/whiteboard/ecmplus/src/java/org/apache/cocoon/components/container/ThreadSafeComponentHandler.java
Wed Oct 20 05:26:09 2004
@@ -22,7 +22,7 @@
  * The ThreadSafeComponentHandler to make sure components are initialized
  * and destroyed correctly.
  *
- * @version CVS $Revision: 1.4 $ $Date: 2004/02/28 11:47:14 $
+ * @version CVS $Id$
  */
 public class ThreadSafeComponentHandler
 extends AbstractComponentHandler {

Mime
View raw message