Revert "Item1772: Put getResource, getTemplate and getFile in Templat…

…eParser so they can be accessed from configure, and make them OO"

As CDot pointed out, putting them in lib was deliberate so they're easy to find. So putting them back there, and fixing the code so configure and unit tests can find them

git-svn-id: http://svn.foswiki.org/trunk@4572 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

core/bin/configure

@@ -200,9 +200,6 @@ my $scriptName = Foswiki::getScriptName();
 
 # Try to load the LocalLib.cfg optional overload
 
-# Paths from LocalLib.cfg (preferred)
-use vars qw( $foswikiLibPath @localPerlLibPath );
-
 use lib '.';
 eval 'require "setlib.cfg"';
 
@@ -217,8 +214,6 @@ if ($@) {
     unshift( @INC, File::Spec->catfile( @root, 'lib' ) );
 }
 
-our $extrasDir    = "$foswikiLibPath/Foswiki/Configure/resources/";
-our $templatesDir = "$foswikiLibPath/Foswiki/Configure/templates/";
 our $time         = time();
 
 # Load all the bits of the configure module that we explicitly use
@@ -339,8 +334,6 @@ if ( $action eq 'resource' ) {
             $type = 'text/javascript';
         }
 
-        # This is probably slow, but we need to know where the templates are
-        Foswiki::Configure::Load::readConfig();
         my $parser = Foswiki::Configure::TemplateParser->new;
         my $text = $parser->getResource($resource);
 

core/lib/Foswiki/Configure/TemplateParser.pm

@@ -31,6 +31,9 @@ package Foswiki::Configure::TemplateParser;
 use strict;
 use Foswiki::Configure::Util ();
 
+# Where to look for templates and resources
+my $foswikiConfigureFilesDir;
+
 =pod
 
 parser ($parserId) -> $parser
@@ -59,6 +62,15 @@ sub new {
 
     my $this = bless( {}, $class );
     $this->{skin} = undef;
+
+    # This is probably slow, but we need to know where the templates are
+    our $foswikiLibPath;
+    unless( defined $foswikiLibPath ) {
+        delete $INC{'setlib.cfg'};
+        eval { require 'setlib.cfg'; };
+    }
+    $foswikiConfigureFilesDir = "$foswikiLibPath/Foswiki/Configure";
+
     return $this;
 }
 
@@ -149,21 +161,13 @@ sub _getTemplateFileName {
 sub getResource {
     my ( $this, $resource, %vars ) = @_;
 
-    unless( $this->isa( 'Foswiki::Configure::TemplateParser' ) ) {
-        require Carp;
-        Carp::confess "$this called getTemplate not in OO";
-    }
-    return $this->getFile( "$Foswiki::cfg{PubDir}/System/ConfigureResources/", $resource, %vars );
+    return $this->getFile( "$foswikiConfigureFilesDir/resources/", $resource, %vars );
 }
 
 sub getTemplate {
     my ( $this, $resource, %vars ) = @_;
 
-    unless( $this->isa( 'Foswiki::Configure::TemplateParser' ) ) {
-        require Carp;
-        Carp::confess "$this called getTemplate not in OO";
-    }
-    return $this->getFile( "$Foswiki::cfg{PubDir}/System/ConfigureTemplates/", $resource, %vars );
+    return $this->getFile( "$foswikiConfigureFilesDir/templates/", $resource, %vars );
 }
 
 sub getFile {
@@ -190,6 +194,7 @@ sub getFile {
     else {
         print STDERR "Error loading resource $dir$resource: $!\n";
     }
+
     return $text;
 }
 

core/lib/Foswiki/Configure/UIs/Introduction.pm

@@ -5,13 +5,13 @@ package Foswiki::Configure::UIs::Introduction;
 use strict;
 
 use Foswiki::Configure::TemplateParser ();
-use Foswiki::Configure::UIs::Section ();
+use Foswiki::Configure::UIs::Section   ();
 our @ISA = ('Foswiki::Configure::UIs::Section');
 
 sub renderHtml {
     my ( $this, $section, $root ) = @_;
 
-    my $parser = Foswiki::Configure::TemplateParser->new;
+    my $parser   = Foswiki::Configure::TemplateParser->new;
     my $contents = $parser->getResource(
         'intro.html',
         SYSTEMWEB     => $Foswiki::cfg{SystemWebName},

core/lib/Foswiki/Configure/UIs/Welcome.pm

@@ -5,13 +5,13 @@ package Foswiki::Configure::UIs::Welcome;
 use strict;
 
 use Foswiki::Configure::TemplateParser ();
-use Foswiki::Configure::UIs::Section ();
+use Foswiki::Configure::UIs::Section   ();
 our @ISA = ('Foswiki::Configure::UIs::Section');
 
 sub renderHtml {
     my ( $this, $section, $root ) = @_;
 
-    my $parser = Foswiki::Configure::TemplateParser->new;
+    my $parser   = Foswiki::Configure::TemplateParser->new;
     my $contents = $parser->getResource(
         'welcome.html',
         SYSTEMWEB     => $Foswiki::cfg{SystemWebName},

core/lib/Foswiki/Contrib/core/MANIFEST

@@ -474,50 +474,50 @@ lib/Foswiki/Configure/LANGUAGES.pm 0444
 lib/Foswiki/Configure/Load.pm 0444
 lib/Foswiki/Configure/Pluggable.pm 0444
 lib/Foswiki/Configure/PLUGINS.pm 0444
-pub/System/ConfigureResources/base.css 0444
-pub/System/ConfigureResources/behaviour.js 0444
-pub/System/ConfigureResources/bg_button_gradient.gif 0444
-pub/System/ConfigureResources/bg_buttoncancel_gradient.gif 0444
-pub/System/ConfigureResources/bg_submit_gradient.gif 0444
-pub/System/ConfigureResources/favicon.ico 0444
-pub/System/ConfigureResources/foswikiStyles.js 0444
-pub/System/ConfigureResources/icon_arrows.psd
-pub/System/ConfigureResources/icon_down.gif 0444
-pub/System/ConfigureResources/icon_error_blue.gif 0444
-pub/System/ConfigureResources/icon_error_white.gif 0444
-pub/System/ConfigureResources/icon_error.psd
-pub/System/ConfigureResources/icon_info.gif 0444
-pub/System/ConfigureResources/icon_info.psd
-pub/System/ConfigureResources/icon_up.gif 0444
-pub/System/ConfigureResources/icon_warn_and_error_blue.gif 0444
-pub/System/ConfigureResources/icon_warn_and_error_white.gif 0444
-pub/System/ConfigureResources/icon_warn_and_error.psd
-pub/System/ConfigureResources/icon_warn_blue.gif 0444
-pub/System/ConfigureResources/icon_warn_white.gif 0444
-pub/System/ConfigureResources/icon_warning.psd
-pub/System/ConfigureResources/intro.html 0444
-pub/System/ConfigureResources/legend.html 0444
-pub/System/ConfigureResources/logo.gif 0444
-pub/System/ConfigureResources/logo.psd
-pub/System/ConfigureResources/pattern.css 0444
-pub/System/ConfigureResources/scripts.js 0444
-pub/System/ConfigureResources/styles.css 0444
-pub/System/ConfigureResources/template_main.tmpl 0444
-pub/System/ConfigureResources/template_section.tmpl 0444
-pub/System/ConfigureResources/warning.gif 0444
-pub/System/ConfigureResources/welcome.html 0444
-pub/System/ConfigureResources/yui.css 0444
+lib/Foswiki/Configure/resources/base.css 0444
+lib/Foswiki/Configure/resources/behaviour.js 0444
+lib/Foswiki/Configure/resources/bg_button_gradient.gif 0444
+lib/Foswiki/Configure/resources/bg_buttoncancel_gradient.gif 0444
+lib/Foswiki/Configure/resources/bg_submit_gradient.gif 0444
+lib/Foswiki/Configure/resources/favicon.ico 0444
+lib/Foswiki/Configure/resources/foswikiStyles.js 0444
+lib/Foswiki/Configure/resources/icon_arrows.psd
+lib/Foswiki/Configure/resources/icon_down.gif 0444
+lib/Foswiki/Configure/resources/icon_error_blue.gif 0444
+lib/Foswiki/Configure/resources/icon_error_white.gif 0444
+lib/Foswiki/Configure/resources/icon_error.psd
+lib/Foswiki/Configure/resources/icon_info.gif 0444
+lib/Foswiki/Configure/resources/icon_info.psd
+lib/Foswiki/Configure/resources/icon_up.gif 0444
+lib/Foswiki/Configure/resources/icon_warn_and_error_blue.gif 0444
+lib/Foswiki/Configure/resources/icon_warn_and_error_white.gif 0444
+lib/Foswiki/Configure/resources/icon_warn_and_error.psd
+lib/Foswiki/Configure/resources/icon_warn_blue.gif 0444
+lib/Foswiki/Configure/resources/icon_warn_white.gif 0444
+lib/Foswiki/Configure/resources/icon_warning.psd
+lib/Foswiki/Configure/resources/intro.html 0444
+lib/Foswiki/Configure/resources/legend.html 0444
+lib/Foswiki/Configure/resources/logo.gif 0444
+lib/Foswiki/Configure/resources/logo.psd
+lib/Foswiki/Configure/resources/pattern.css 0444
+lib/Foswiki/Configure/resources/scripts.js 0444
+lib/Foswiki/Configure/resources/styles.css 0444
+lib/Foswiki/Configure/resources/template_main.tmpl 0444
+lib/Foswiki/Configure/resources/template_section.tmpl 0444
+lib/Foswiki/Configure/resources/warning.gif 0444
+lib/Foswiki/Configure/resources/welcome.html 0444
+lib/Foswiki/Configure/resources/yui.css 0444
 lib/Foswiki/Configure/Root.pm 0444
 lib/Foswiki/Configure/Section.pm 0444
 lib/Foswiki/Configure/TemplateParser.pm
 lib/Foswiki/Configure/TemplateParser/SimpleFreeMarker.pm
-pub/System/ConfigureTemplates/authorize.tmpl 0444
-pub/System/ConfigureTemplates/extensions.tmpl 0444
-pub/System/ConfigureTemplates/feedback.tmpl 0444
-pub/System/ConfigureTemplates/findextensionsintro.tmpl 0444
-pub/System/ConfigureTemplates/main.tmpl 0444
-pub/System/ConfigureTemplates/page.tmpl 0444
-pub/System/ConfigureTemplates/section.tmpl 0444
+lib/Foswiki/Configure/templates/authorize.tmpl 0444
+lib/Foswiki/Configure/templates/extensions.tmpl 0444
+lib/Foswiki/Configure/templates/feedback.tmpl 0444
+lib/Foswiki/Configure/templates/findextensionsintro.tmpl 0444
+lib/Foswiki/Configure/templates/main.tmpl 0444
+lib/Foswiki/Configure/templates/page.tmpl 0444
+lib/Foswiki/Configure/templates/section.tmpl 0444
 lib/Foswiki/Configure/Type.pm 0444
 lib/Foswiki/Configure/Types/BOOLEAN.pm 0444
 lib/Foswiki/Configure/Types/COMMAND.pm 0444