[Jifty-commit] r2962 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Tue Mar 13 23:12:39 2007
New Revision: 2962

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Handler.pm

Log:
 r53384 at pinglin:  jesse | 2007-03-13 22:59:21 -0400
 * Debug messages about what template libraries we _did_ find, not which ones we didn't.


Modified: jifty/trunk/lib/Jifty/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/Handler.pm	Tue Mar 13 23:12:39 2007
@@ -138,9 +138,9 @@
     for my $plugin (Jifty->plugins) {
         my $comp_root = $plugin->template_root;
         unless  ( $comp_root and -d $comp_root) {
-            Jifty->log->debug( "Plugin @{[ref($plugin)]} doesn't appear to have a valid mason template component root (@{[$comp_root ||'']})");
             next;
         }
+        Jifty->log->debug( "Plugin @{[ref($plugin)]} mason component root added: (@{[$comp_root ||'']})");
         push @{ $config{comp_root} }, [ ref($plugin)."-".Jifty->web->serial => $comp_root ];
     }
     push @{$config{comp_root}}, [jifty => Jifty->config->framework('Web')->{'DefaultTemplateRoot'}];
@@ -164,9 +164,7 @@
 
 sub templatedeclare_config {
     
-    use Jifty::View::Declare::CoreTemplates;
     my %config = (
-        roots => [ 'Jifty::View::Declare::CoreTemplates' ],
         %{ Jifty->config->framework('Web')->{'TemplateDeclareConfig'} ||{}},
     );
 
@@ -174,14 +172,14 @@
         my $comp_root = $plugin->template_class;
         Jifty::Util->require($comp_root);
         unless (defined $comp_root and $comp_root->isa('Template::Declare') ){
-            Jifty->log->debug( "Plugin @{[ref($plugin)]} doesn't appear to have a ::View class that's a Template::Declare subclass");
             next;
         }
+        Jifty->log->debug( "Plugin @{[ref($plugin)]}::View added as a Template::Declare root");
         push @{ $config{roots} }, $comp_root ;
     }
 
-    push @{$config{roots}}, Jifty->config->framework('TemplateClass');
-
+    push @{$config{roots}},  Jifty->config->framework('TemplateClass');
+        
     return %config;
 }