Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 32113 invoked by uid 500); 16 Mar 2001 21:50:38 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 31864 invoked by uid 1152); 16 Mar 2001 21:50:33 -0000 Date: 16 Mar 2001 21:50:33 -0000 Message-ID: <20010316215033.31859.qmail@apache.org> From: bloritsch@apache.org To: xml-cocoon-cvs@apache.org Subject: cvs commit: xml-cocoon/src/org/apache/cocoon/components CocoonComponentManager.java bloritsch 01/03/16 13:50:32 Modified: src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java src/org/apache/cocoon/components Tag: xml-cocoon2 CocoonComponentManager.java Log: Fixed ordering dependency from new ComponentManagement architecture Revision Changes Path No revision No revision 1.4.2.65 +1 -2 xml-cocoon/src/org/apache/cocoon/Cocoon.java Index: Cocoon.java =================================================================== RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v retrieving revision 1.4.2.64 retrieving revision 1.4.2.65 diff -u -r1.4.2.64 -r1.4.2.65 --- Cocoon.java 2001/03/16 21:45:57 1.4.2.64 +++ Cocoon.java 2001/03/16 21:50:21 1.4.2.65 @@ -47,7 +47,7 @@ * * @author Pierpaolo Fumagalli (Apache Software Foundation, Exoffice Technologies) * @author Stefano Mazzocchi - * @version CVS $Revision: 1.4.2.64 $ $Date: 2001/03/16 21:45:57 $ + * @version CVS $Revision: 1.4.2.65 $ $Date: 2001/03/16 21:50:21 $ */ public class Cocoon extends AbstractLoggable implements Component, Initializable, Modifiable, Processor, Contextualizable { /** The application context */ @@ -160,7 +160,6 @@ } getLogger().debug("Setting up components..."); this.componentManager.configure(conf); - this.componentManager.init(); getLogger().debug("Setting up the sitemap."); // Create the sitemap Configuration sconf = conf.getChild("sitemap"); No revision No revision 1.1.2.5 +2 -11 xml-cocoon/src/org/apache/cocoon/components/Attic/CocoonComponentManager.java Index: CocoonComponentManager.java =================================================================== RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/Attic/CocoonComponentManager.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- CocoonComponentManager.java 2001/03/16 21:46:04 1.1.2.4 +++ CocoonComponentManager.java 2001/03/16 21:50:29 1.1.2.5 @@ -34,9 +34,9 @@ /** Default component manager for Cocoon's non sitemap components. * @author Paul Russell - * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/03/16 21:46:04 $ + * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/03/16 21:50:29 $ */ -public class CocoonComponentManager implements ComponentManager, Loggable, Configurable, Contextualizable, Initializable { +public class CocoonComponentManager implements ComponentManager, Loggable, Configurable, Contextualizable { protected Logger log; @@ -69,15 +69,6 @@ public void contextualize(Context context) { if (this.context == null) { this.context = context; - } - } - - public void init() { - Iterator i = this.componentHandlers.keySet().iterator(); - - while (i.hasNext()) { - CocoonComponentHandler handler = (CocoonComponentHandler) this.componentHandlers.get(i.next()); - handler.init(); } } ---------------------------------------------------------------------- In case of troubles, e-mail: webmaster@xml.apache.org To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: cocoon-cvs-help@xml.apache.org