cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 55256 - cocoon/trunk/src/core/java/org/apache/cocoon/core/container
Date Thu, 21 Oct 2004 19:56:05 GMT
Author: cziegeler
Date: Thu Oct 21 12:56:03 2004
New Revision: 55256

Modified:
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java
Log:
Remove unused role

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractComponentHandler.java
Thu Oct 21 12:56:03 2004
@@ -51,8 +51,6 @@
     /**
      * Looks up and returns a component handler for a given component class.
      *
-     * @param role           The role name of the component. This must be
-     *                       a fully-qualified classname
      * @param componentClass Class of the component for which the handle is
      *                       being requested.
      * @param configuration The configuration for this component.
@@ -63,8 +61,7 @@
      *
      * @throws Exception If there were any problems obtaining a ComponentHandler
      */
-    public static AbstractComponentHandler getComponentHandler( final String role,
-                                                        final Class componentClass,
+    public static AbstractComponentHandler getComponentHandler( final Class componentClass,
                                                         final Configuration configuration,
                                                         final ServiceManager serviceManager,
                                                         final Context context,
@@ -99,7 +96,7 @@
         }
         
         // Create the factory to use to create the instances of the Component.
-        ComponentFactory factory = new ComponentFactory( role,
+        ComponentFactory factory = new ComponentFactory( 
                                          componentClass,
                                          configuration,
                                          serviceManager,

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
Thu Oct 21 12:56:03 2004
@@ -98,7 +98,6 @@
     /**
      * Obtain a new ComponentHandler for the specified component. 
      * 
-     * @param role The role
      * @param componentClass Class of the component for which the handle is
      *                       being requested.
      * @param configuration The configuration for this component.
@@ -106,13 +105,11 @@
      *
      * @throws Exception If there were any problems obtaining a ComponentHandler
      */
-    protected AbstractComponentHandler getComponentHandler( final String role,
-                                                    final Class componentClass,
+    protected AbstractComponentHandler getComponentHandler( final Class componentClass,
                                                     final Configuration configuration,
                                                     final ServiceManager serviceManager)
     throws Exception {
-        return AbstractComponentHandler.getComponentHandler( role,
-                                                     componentClass,
+        return AbstractComponentHandler.getComponentHandler(componentClass,
                                                      configuration,
                                                      serviceManager,
                                                      this.context,

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
Thu Oct 21 12:56:03 2004
@@ -128,8 +128,7 @@
 
                         final Configuration configuration = new DefaultConfiguration( "",
"-" );
 
-                        handler = this.getComponentHandler( role,
-                                                       componentClass,
+                        handler = this.getComponentHandler( componentClass,
                                                        configuration,
                                                        this);
 
@@ -459,8 +458,7 @@
                 this.getLogger().debug( "Attempting to get handler for role [" + role.toString()
+ "]" );
             }
 
-            final AbstractComponentHandler handler = this.getComponentHandler( role.toString(),
-                                                                  component,
+            final AbstractComponentHandler handler = this.getComponentHandler( component,
                                                                   configuration,
                                                                   this);
 

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
Thu Oct 21 12:56:03 2004
@@ -349,8 +349,7 @@
         }
 
         try {
-            final AbstractComponentHandler handler = getComponentHandler( this.roleName,
-                                                                  component,
+            final AbstractComponentHandler handler = getComponentHandler( component,
                                                                   configuration,
                                                                   this.serviceManager);
 

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java	(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java	Thu
Oct 21 12:56:03 2004
@@ -58,8 +58,6 @@
     
     private final Logger logger;
     
-    private final String role;
-    
     private final LoggerManager loggerManager;
 
     private final RoleManager roleManager;
@@ -73,15 +71,13 @@
      * @param context the <code>Context</code> to pass to <code>Contexutalizable</code>s.
      *
      */
-    public ComponentFactory( final String role,
-                             final Class componentClass,
+    public ComponentFactory( final Class componentClass,
                              final Configuration configuration,
                              final ServiceManager serviceManager,
                              final Context context,
                              final Logger logger,
                              final LoggerManager loggerManager,
                              final RoleManager roleManager) {
-        this.role = role;
         this.componentClass = componentClass;
         this.configuration = configuration;
         this.serviceManager = serviceManager;

Mime
View raw message