svn commit: r387493 - in /lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree: DefaultSiteTree.java SiteTreeFactory.java

Author: andreas
Date: Tue Mar 21 03:10:36 2006
New Revision: 387493

URL: http://svn.apache.org/viewcvs?rev=387493&view=rev
Log:
Passing logger to DefaultSiteTree in constructor.

Modified:
    
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
    
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java

Modified: 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java?rev=387493&r1=387492&r2=387493&view=diff
==============================================================================
--- 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
 (original)
+++ 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
 Tue Mar 21 03:10:36 2006
@@ -26,6 +26,7 @@
 
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.lenya.cms.cocoon.source.RepositorySource;
@@ -71,10 +72,14 @@
      * @param publication The publication.
      * @param _area The area.
      * @param manager The service manager.
+     * @param logger The logger.
      * @throws SiteException if an error occurs.
      */
-    protected DefaultSiteTree(Publication publication, String _area, 
ServiceManager manager)
+    protected DefaultSiteTree(Publication publication, String _area, 
ServiceManager manager, Logger logger)
             throws SiteException {
+        
+        ContainerUtil.enableLogging(this, logger);
+        
         this.sourceUri = publication.getSourceURI() + "/content/" + _area + "/"
                 + SITE_TREE_FILENAME;
         this.area = _area;

Modified: 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java?rev=387493&r1=387492&r2=387493&view=diff
==============================================================================
--- 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
 (original)
+++ 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
 Tue Mar 21 03:10:36 2006
@@ -55,8 +55,7 @@
         String area = snippets[1];
 
         Publication publication = PublicationUtil.getPublication(this.manager, 
publicationId);
-        DefaultSiteTree tree = new DefaultSiteTree(publication, area, 
this.manager);
-        ContainerUtil.enableLogging(tree, getLogger());
+        DefaultSiteTree tree = new DefaultSiteTree(publication, area, 
this.manager, getLogger());
         return tree;
     }