r785 - in trunk: . lib lib/OpenGuides lib/OpenGuides/UK t - openguides-commits

14 May 2006

Author: dom
Date: 2006-05-14 16:54:22 +0100 (Sun, 14 May 2006)
New Revision: 785
Modified:
   trunk/Build.PL
   trunk/Changes
   trunk/INSTALL
   trunk/PREREQUISITES
   trunk/README
   trunk/lib/OpenGuides.pm
   trunk/lib/OpenGuides/Build.pm
   trunk/lib/OpenGuides/Feed.pm
   trunk/lib/OpenGuides/RDF.pm
   trunk/lib/OpenGuides/Search.pm
   trunk/lib/OpenGuides/Template.pm
   trunk/lib/OpenGuides/Test.pm
   trunk/lib/OpenGuides/UK/PubCrawl.pm
   trunk/lib/OpenGuides/Utils.pm
   trunk/t/11_utils.t
   trunk/t/12_macros.t
   trunk/t/14_recent_changes_cookies.t
   trunk/t/15_template.t
   trunk/t/16_test_tester.t
   trunk/t/21_rdf.t
   trunk/t/22_rss_modwiki.t
   trunk/t/25_write_geo_data.t
   trunk/t/26_geo_data_search_form.t
   trunk/t/27_geo_data_edit_form.t
   trunk/t/28_wgs84_coords.t
   trunk/t/31_search.t
   trunk/t/32_search_simple_metadata.t
   trunk/t/33_search_advanced_search.t
   trunk/t/33_search_advanced_search_utm.t
   trunk/t/34_search_paging.t
   trunk/t/35_search_two_searches.t
   trunk/t/36_search_order.t
   trunk/t/37_search_summaries.t
   trunk/t/38_search_params.t
   trunk/t/39_search_form.t
   trunk/t/41_deletion.t
   trunk/t/51_display_node.t
   trunk/t/52_display_diffs.t
   trunk/t/53_show_index.t
   trunk/t/54_redirect.t
   trunk/t/55_node_history.t
   trunk/t/56_diffs_with_macros.t
   trunk/t/61_bug_textareas.t
   trunk/t/62_bug_trailing_whitespace.t
   trunk/t/63_bug_map_link_no_address.t
   trunk/t/64_bug_node_history.t
   trunk/t/65_bug_metadata_escape.t
   trunk/t/66_bug_latlong_representation.t
   trunk/t/67_bug_first_version.t
   trunk/t/68_bug_website_displayed.t
   trunk/wiki.cgi
Log:
Use Wiki::Toolkit. Note that CGI::Wiki::Plugin::Diff hasn't been converted yet,
so tests will be broken for now.
Modified: trunk/Build.PL
===================================================================

--- trunk/Build.PL	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/Build.PL	2006-05-14 15:54:22 UTC (rev 785)
@@ -215,34 +215,34 @@
     dist_version_from => "wiki.cgi",
     license => "perl",
     requires => {
-        'Algorithm::Diff'                 => '0.13',  # for sdiff 
-        'CGI'                             => '2.92',  # avoid escapeHTML bug
-        'CGI::Carp'                       => 0,
-        'CGI::Cookie'                     => 0,
-        'CGI::Wiki'                       => '0.62',  # fixed delete version
-        'CGI::Wiki::Formatter::UseMod'    => '0.16',  # macros
-        'CGI::Wiki::Plugin::Atom'         => 0,
-        'CGI::Wiki::Plugin::Categoriser'  => 0,
-        'CGI::Wiki::Plugin::Diff'         => '0.08',  # earlier buggy
-        'CGI::Wiki::Plugin::Locator::Grid'=> '0.02',  # cope with sqlite 3
-        'CGI::Wiki::Plugin::RSS::ModWiki' => '0.09',  # fixes date formatting bug
-        'CGI::Wiki::Plugin::RSS::Reader'  => '1.3',   # earlier versions don't support RSS 2.0
-        'Class::Accessor'                 => 0,
-        'Config::Tiny'                    => 0,
-        'Data::Dumper'                    => 0,
-        $drivers{$dbtype}                 => 0,
-        'File::Spec::Functions'           => 0,
-        'File::Temp'                      => 0,
-        'Geography::NationalGrid'         => 0,
-        'LWP::Simple'                     => 0,
-        'Parse::RecDescent'               => 0,
-        $search_module                    => 0,
-        'POSIX'                           => 0,
-        'Template'                        => 0,
-        'Test::MockObject'                => '0.07', # earlier doesn't use 'mock'
-        'Time::Piece'                     => 0,
-        'URI::Escape'                     => 0,
-        'XML::RSS'                        => 0,
+        'Algorithm::Diff'                     => '0.13',  # for sdiff 
+        'CGI'                                 => '2.92',  # avoid escapeHTML bug
+        'CGI::Carp'                           => 0,
+        'CGI::Cookie'                         => 0,
+        'Wiki::Toolkit'                       => 0,
+        'Wiki::Toolkit::Feed::Atom'           => 0,
+        'Wiki::Toolkit::Feed::RSS'            => 0,
+        'Wiki::Toolkit::Formatter::UseMod'    => 0,
+        'Wiki::Toolkit::Plugin::Categoriser'  => 0,
+        'Wiki::Toolkit::Plugin::Diff'         => 0,
+        'Wiki::Toolkit::Plugin::Locator::Grid'=> 0,
+        'Wiki::Toolkit::Plugin::RSS::Reader'  => 0,
+        'Class::Accessor'                     => 0,
+        'Config::Tiny'                        => 0,
+        'Data::Dumper'                        => 0,
+        $drivers{$dbtype}                     => 0,
+        'File::Spec::Functions'               => 0,
+        'File::Temp'                          => 0,
+        'Geography::NationalGrid'             => 0,
+        'LWP::Simple'                         => 0,
+        'Parse::RecDescent'                   => 0,
+        $search_module                        => 0,
+        'POSIX'                               => 0,
+        'Template'                            => 0,
+        'Test::MockObject'                    => '0.07', # earlier doesn't use 'mock'
+        'Time::Piece'                         => 0,
+        'URI::Escape'                         => 0,
+        'XML::RSS'                            => 0,
         },
     build_requires => {
         'Module::Build' => '0.18', # earlier doesn't install script files
Modified: trunk/Changes
===================================================================
--- trunk/Changes	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/Changes	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,8 +1,12 @@
 "#" items refer to tickets. See http://dev.openguides.org/report/9 for details.
-0.55    ???
+0.54_01 ???
         Support for Atom feeds for RecentChanges.
-        #118 Use Wiki::Toolkit
+        #118 Use Wiki::Toolkit. NOTE this is a development snapshot and is
+        not suitable for production use. It may eat your data! Tests on
+        development mirrors of live data are highly welcomed; the underlying
+        database schema provided by Wiki::Toolkit has changed and the upgrade
+        process needs some rigorous testing.
0.54    21 April 2006
         #112 Fixed website display bug introduced in 0.53.
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/INSTALL	2006-05-14 15:54:22 UTC (rev 785)
@@ -104,7 +104,7 @@
 From version 0.39 of OpenGuides, you have the option of using Plucene
 to index your wiki instead of Search::InvertedIndex.  If you answer
 yes to this question, you will need to make sure you have installed
-both Plucene, and CGI::Wiki version 0.56 or later.
+both Plucene, and Wiki::Toolkit version 0.56 or later.
If you are changing to Plucene from Search::InvertedIndex, you will
 need to do two things:
@@ -350,7 +350,7 @@
 above; however since we only want one copy of the modules and CGI
 programs, it isn't appropriate to run them again. So we will make use of
 the utility program "cgi-wiki-setupdb" which is included with the
-CGI::Wiki distribution. Documentation for this command can be found in
+Wiki::Toolkit distribution. Documentation for this command can be found in
 its man page; run this with the appropriate arguments to create the
 new database.
Modified: trunk/PREREQUISITES
===================================================================
--- trunk/PREREQUISITES	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/PREREQUISITES	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,19 +1,19 @@
-Modules required by OpenGuides 0.54
-===================================
+Modules required by OpenGuides 0.54_01
+======================================
Algorithm::Diff (version 0.13 or later. Note that the latest version uses 
         .zip rather than .tar.gz and breaks some automated installs)
 CGI (version 2.92 or later)
 CGI::Carp
 CGI::Cookie
-CGI::Wiki (version 0.62 or later)
-CGI::Wiki::Formatter::UseMod (version 0.16 or later)
-CGI::Wiki::Plugin::Atom
-CGI::Wiki::Plugin::Categoriser
-CGI::Wiki::Plugin::Diff (version 0.08 or later)
-CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later)
-CGI::Wiki::Plugin::RSS::ModWiki (version 0.09 or later)
-CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later)
+Wiki::Toolkit
+Wiki::Toolkit::Feed::Atom
+Wiki::Toolkit::Feed::RSS
+Wiki::Toolkit::Formatter::UseMod
+Wiki::Toolkit::Plugin::Categoriser
+Wiki::Toolkit::Plugin::Diff
+Wiki::Toolkit::Plugin::Locator::Grid
+Wiki::Toolkit::Plugin::RSS::Reader
 Class::Accessor
 Config::Tiny
 Data::Dumper
Modified: trunk/README
===================================================================
--- trunk/README	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/README	2006-05-14 15:54:22 UTC (rev 785)
@@ -22,7 +22,7 @@
 SEE ALSO
     * http://london.openguides.org/, the first and biggest OpenGuides site.
     * http://openguides.org/, with a list of all live OpenGuides installs.
-    * CGI::Wiki, the Wiki toolkit which does the heavy lifting for
+    * Wiki::Toolkit, the Wiki toolkit which does the heavy lifting for
     OpenGuides
FEEDBACK
Modified: trunk/lib/OpenGuides/Build.pm
===================================================================
--- trunk/lib/OpenGuides/Build.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides/Build.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -26,7 +26,7 @@
    		  mysql    => "MySQL",
    		  sqlite   => "SQLite" );
-    my $cgi_wiki_module = "CGI::Wiki::Setup::" . $cgi_wiki_exts{$dbtype};
+    my $cgi_wiki_module = "Wiki::Toolkit::Setup::" . $cgi_wiki_exts{$dbtype};
     eval "require $cgi_wiki_module";
     die "There was a problem: $@" if $@;
Modified: trunk/lib/OpenGuides/Feed.pm
===================================================================
--- trunk/lib/OpenGuides/Feed.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides/Feed.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -5,8 +5,8 @@
 use vars qw( $VERSION );
 $VERSION = '0.01';
-use CGI::Wiki::Plugin::Atom;
-use CGI::Wiki::Plugin::RSS::ModWiki;
+use Wiki::Toolkit::Feed::Atom;
+use Wiki::Toolkit::Feed::RSS;
 use Time::Piece;
 use URI::Escape;
 use Carp 'croak';
@@ -23,8 +23,8 @@
my $wiki = $args{wiki};
-    unless ( $wiki && UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) {
-       croak "No CGI::Wiki object supplied.";
+    unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) {
+       croak "No Wiki::Toolkit object supplied.";
     }
     $self->{wiki} = $wiki;
@@ -81,7 +81,7 @@
     my $self = shift;
unless ($self->{atom_maker}) {
-        $self->{atom_maker} = CGI::Wiki::Plugin::Atom->new(
+        $self->{atom_maker} = Wiki::Toolkit::Feed::Atom->new(
             wiki                => $self->{wiki},
             site_name           => $self->{site_name},
             site_url            => $self->{config}->script_url,
@@ -102,7 +102,7 @@
     my $self = shift;
unless ($self->{rss_maker}) {
-        $self->{rss_maker} = CGI::Wiki::Plugin::RSS::ModWiki->new(
+        $self->{rss_maker} = Wiki::Toolkit::Feed::RSS->new(
             wiki                => $self->{wiki},
             site_name           => $self->{site_name},
             site_url            => $self->{config}->script_url,
@@ -139,11 +139,11 @@
=head1 SYNOPSIS
-    use CGI::Wiki;
+    use Wiki::Toolkit;
     use OpenGuides::Config;
     use OpenGuides::Feed;
-    my $wiki = CGI::Wiki->new( ... );
+    my $wiki = Wiki::Toolkit->new( ... );
     my $config = OpenGuides::Config->new( file => "wiki.conf" );
     my $feed = OpenGuides::Feed->new( wiki       => $wiki,
                                       config     => $config,
@@ -166,19 +166,19 @@
                                       config     => $config,
                                       og_version => '1.0', );
-C<wiki> must be a LCGI::Wiki object and C<config> must be an
+C<wiki> must be a LWiki::Toolkit object and C<config> must be an
 LOpenGuides::Config object.  Both of these arguments are mandatory.
 C<og_version> is an optional argument specifying the version of
 OpenGuides for inclusion in the feed.
=item B<rss_maker>
-Returns a raw LCGI::Wiki::Plugin::RSS::ModWiki object created with the values you
+Returns a raw LWiki::Toolkit::Feed::RSS object created with the values you
 invoked this module with.
=item B<atom_maker>
-Returns a raw LCGI::Wiki::Plugin::Atom object created with the values you
+Returns a raw LWiki::Toolkit::Feed::Atom object created with the values you
 invoked this module with.
=item B<make_feed>
@@ -215,7 +215,7 @@
=over 4
-=item * LCGI::Wiki, LCGI::Wiki::Plugin::RSS::ModWiki and LCGI::Wiki::Plugin::Atom
+=item * LWiki::Toolkit, LWiki::Toolkit::Feed::RSS and LWiki::Toolkit::Feed::Atom
=item * Lhttp://openguides.org/
Modified: trunk/lib/OpenGuides/RDF.pm
===================================================================
--- trunk/lib/OpenGuides/RDF.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides/RDF.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -5,7 +5,6 @@
 use vars qw( $VERSION );
 $VERSION = '0.09';
-use CGI::Wiki::Plugin::RSS::ModWiki;
 use Time::Piece;
 use URI::Escape;
 use Carp 'croak';
@@ -22,8 +21,8 @@
my $wiki = $args{wiki};
-    unless ( $wiki && UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) {
-      croak "No CGI::Wiki object supplied.";
+    unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) {
+      croak "No Wiki::Toolkit object supplied.";
     }
     $self->{wiki} = $wiki;
@@ -105,7 +104,7 @@
     my $timestamp = $node_data{last_modified};
# Make a Time::Piece object.
-    my $timestamp_fmt = $CGI::Wiki::Store::Database::timestamp_fmt;
+    my $timestamp_fmt = $Wiki::Toolkit::Store::Database::timestamp_fmt;
if ( $timestamp ) {
         my $time   = Time::Piece->strptime($timestamp, $timestamp_fmt);
@@ -227,11 +226,11 @@
=head1 SYNOPSIS
-    use CGI::Wiki;
+    use Wiki::Toolkit;
     use OpenGuides::Config;
     use OpenGuides::RDF;
-    my $wiki = CGI::Wiki->new( ... );
+    my $wiki = Wiki::Toolkit->new( ... );
     my $config = OpenGuides::Config->new( file => "wiki.conf" );
     my $rdf_writer = OpenGuides::RDF->new( wiki   => $wiki,
                                          config => $config ); 
@@ -249,7 +248,7 @@
     my $rdf_writer = OpenGuides::RDF->new( wiki   => $wiki,
                                            config => $config );
-C<wiki> must be a LCGI::Wiki object and C<config> must be an
+C<wiki> must be a LWiki::Toolkit object and C<config> must be an
 LOpenGuides::Config object.  Both arguments mandatory.
@@ -268,7 +267,7 @@
BNote: Some of the fields emitted by the RDF/XML generator are taken
 from the node metadata. The form of this metadata is I<not> mandated
-by LCGI::Wiki. Your wiki application should make sure to store some or
+by LWiki::Toolkit. Your wiki application should make sure to store some or
 all of the following metadata when calling C<write_node>:
=over 4
@@ -295,7 +294,7 @@
=over 4
-=item * LCGI::Wiki
+=item * LWiki::Toolkit
=item * Lhttp://openguides.org/
Modified: trunk/lib/OpenGuides/Search.pm
===================================================================
--- trunk/lib/OpenGuides/Search.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides/Search.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -3,7 +3,7 @@
 our $VERSION = '0.10';
use CGI qw( :standard );
-use CGI::Wiki::Plugin::Locator::Grid;
+use Wiki::Toolkit::Plugin::Locator::Grid;
 use File::Spec::Functions qw(:ALL);
 use OpenGuides::Template;
 use OpenGuides::Utils;
@@ -64,7 +64,7 @@
         %locator_params = ( x => "easting", y => "northing" );
     }
-    my $locator = CGI::Wiki::Plugin::Locator::Grid->new( %locator_params );
+    my $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( %locator_params );
     $wiki->register_plugin( plugin => $locator );
     $self->{locator} = $locator;
@@ -75,7 +75,7 @@
my $wiki = $search->wiki;
-An accessor; returns the underlying LCGI::Wiki object.
+An accessor; returns the underlying LWiki::Toolkit object.
=cut
@@ -429,7 +429,7 @@
     my %contents_res = $wiki->search_nodes( $phrase );
# Rationalise the scores a little.  The scores returned by
-    # CGI::Wiki::Search::Plucene are simply a ranking.
+    # Wiki::Toolkit::Search::Plucene are simply a ranking.
     my $num_results = scalar keys %contents_res;
     foreach my $node ( keys %contents_res ) {
         $contents_res{$node} = int( $contents_res{$node} / $num_results ) + 1;
Modified: trunk/lib/OpenGuides/Template.pm
===================================================================
--- trunk/lib/OpenGuides/Template.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides/Template.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -237,9 +237,9 @@
         );
Picks out things like categories, locales, phone number etc from
-EITHER the metadata hash returned by LCGI::Wiki OR the query
+EITHER the metadata hash returned by LWiki::Toolkit OR the query
 parameters in a L<CGI> object, and packages them nicely for passing to
-templates or storing in LCGI::Wiki datastore.  If you supply both
+templates or storing in LWiki::Toolkit datastore.  If you supply both
 C<metadata> and C<cgi_obj> then C<metadata> will take precedence, but
 don't do that.
Modified: trunk/lib/OpenGuides/Test.pm
===================================================================
--- trunk/lib/OpenGuides/Test.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides/Test.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -67,7 +67,7 @@
                    }
     );
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene ( 0 ) };
    
     return $config;
Modified: trunk/lib/OpenGuides/UK/PubCrawl.pm
===================================================================
--- trunk/lib/OpenGuides/UK/PubCrawl.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides/UK/PubCrawl.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -5,10 +5,10 @@
 $VERSION = '0.02';
use Carp qw( croak );
-use CGI::Wiki::Plugin;
-use CGI::Wiki::Plugin::Locator::UK;
+use Wiki::Toolkit::Plugin;
+use Wiki::Toolkit::Plugin::Locator::UK;
-@ISA = qw( CGI::Wiki::Plugin );
+@ISA = qw( Wiki::Toolkit::Plugin );
=head1 NAME
@@ -23,14 +23,14 @@
=head1 SYNOPSIS
-  use CGI::Wiki;
-  use CGI::Wiki::Plugin::Locator::UK;
+  use Wiki::Toolkit;
+  use Wiki::Toolkit::Plugin::Locator::UK;
   use OpenGuides::UK::PubCrawl;
-  my $wiki = CGI::Wiki->new( ... );
-  my $locator = CGI::Wiki::Plugin::Locator::UK->new;
+  my $wiki = Wiki::Toolkit->new( ... );
+  my $locator = Wiki::Toolkit::Plugin::Locator::UK->new;
   $wiki->register_plugin( plugin => $locator );
-  my $categoriser = CGI::Wiki::Plugin::Categoriser->new;
+  my $categoriser = Wiki::Toolkit::Plugin::Categoriser->new;
   $wiki->register_plugin( plugin => $categoriser );
my $crawler = OpenGuides::UK::PubCrawl->new(
@@ -50,8 +50,8 @@
my $crawler = OpenGuides::UK::PubCrawl->new( locator => $locator );
-Croaks unless a CCGI::Wiki::Plugin::Locator::UK object and a
-CCGI::Wiki::Plugin::Categoriser object are supplied.
+Croaks unless a CWiki::Toolkit::Plugin::Locator::UK object and a
+CWiki::Toolkit::Plugin::Categoriser object are supplied.
=cut
@@ -59,12 +59,12 @@
     my ($class, %args) = @_;
     my $locator = $args{locator}
       or croak "No locator parameter supplied";
-    croak "Locator parameter is not a CGI::Wiki::Plugin::Locator::UK"
-      unless UNIVERSAL::isa( $locator, "CGI::Wiki::Plugin::Locator::UK" );
+    croak "Locator parameter is not a Wiki::Toolkit::Plugin::Locator::UK"
+      unless UNIVERSAL::isa( $locator, "Wiki::Toolkit::Plugin::Locator::UK" );
     my $categoriser = $args{categoriser}
       or croak "No categoriser parameter supplied";
-    croak "Categoriser parameter is not a CGI::Wiki::Plugin::Categoriser"
-      unless UNIVERSAL::isa( $categoriser, "CGI::Wiki::Plugin::Categoriser" );
+    croak "Categoriser parameter is not a Wiki::Toolkit::Plugin::Categoriser"
+      unless UNIVERSAL::isa( $categoriser, "Wiki::Toolkit::Plugin::Categoriser" );
     my $self = { _locator     => $locator,
                  _categoriser => $categoriser };
     bless $self, $class;
Modified: trunk/lib/OpenGuides/Utils.pm
===================================================================
--- trunk/lib/OpenGuides/Utils.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides/Utils.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -5,9 +5,9 @@
 $VERSION = '0.09';
use Carp qw( croak );
-use CGI::Wiki;
-use CGI::Wiki::Formatter::UseMod;
-use CGI::Wiki::Plugin::RSS::Reader;
+use Wiki::Toolkit;
+use Wiki::Toolkit::Formatter::UseMod;
+use Wiki::Toolkit::Plugin::RSS::Reader;
 use URI::Escape;
=head1 NAME
@@ -39,7 +39,7 @@
   my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
Croaks unless an COpenGuides::Config object is supplied.  Returns a
-CCGI::Wiki object made from the given config file on success,
+CWiki::Toolkit object made from the given config file on success,
 croaks if any other error occurs.
The config file needs to define at least the following variables:
@@ -77,7 +77,7 @@
                           sqlite   => "SQLite",
                         );
-    my $cgi_wiki_module = "CGI::Wiki::Store::" . $cgi_wiki_exts{$dbtype};
+    my $cgi_wiki_module = "Wiki::Toolkit::Store::" . $cgi_wiki_exts{$dbtype};
     eval "require $cgi_wiki_module";
     croak "Can't 'require' $cgi_wiki_module.\n" if $@;
@@ -95,18 +95,18 @@
          && ( lc($config->use_plucene) eq "y"
               || $config->use_plucene == 1 )
        ) {
-        require CGI::Wiki::Search::Plucene;
-        $search = CGI::Wiki::Search::Plucene->new(
+        require Wiki::Toolkit::Search::Plucene;
+        $search = Wiki::Toolkit::Search::Plucene->new(
                                        path => $config->indexing_directory,
                                                  );
     } else {
-        require CGI::Wiki::Search::SII;
+        require Wiki::Toolkit::Search::SII;
         require Search::InvertedIndex::DB::DB_File_SplitHash;
         my $indexdb = Search::InvertedIndex::DB::DB_File_SplitHash->new(
             -map_name  => $config->indexing_directory,
             -lock_mode => "EX"
         );
-        $search = CGI::Wiki::Search::SII->new( indexdb => $indexdb );
+        $search = Wiki::Toolkit::Search::SII->new( indexdb => $indexdb );
     }
# Make formatter.
@@ -118,10 +118,10 @@
             qq(<form action="$search_url" method="get"><input type="text" size="20" name="search"><input type="submit" name="Go" value="Search"></form>),
         qr/@INDEX_LINK\s+[[(Category|Locale)\s+([^]|]+)|?([^]]+)?]]/ =>
             sub {
-                  # We may be being called by CGI::Wiki::Plugin::Diff,
+                  # We may be being called by Wiki::Toolkit::Plugin::Diff,
                   # which doesn't know it has to pass us $wiki - and
                   # we don't use it anyway.
-                  if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) {
+                  if ( UNIVERSAL::isa( $_[0], "Wiki::Toolkit" ) ) {
                       shift; # just throw it away
                   }
                   my $link_title = $_[2] || "View all pages in $_[0] $_[1]";
@@ -131,9 +131,9 @@
              sub {
                    my ($wiki, $type, $value) = @_;
-                   # We may be being called by CGI::Wiki::Plugin::Diff,
+                   # We may be being called by Wiki::Toolkit::Plugin::Diff,
                    # which doesn't know it has to pass us $wiki
-                   unless ( UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) {
+                   unless ( UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) {
                        return "(unprocessed INDEX_LIST macro)";
    	   }
@@ -158,10 +158,10 @@
                    return $return;
                  },
    qr/@RSS\s+(.+)/ => sub {
-                    # We may be being called by CGI::Wiki::Plugin::Diff,
+                    # We may be being called by Wiki::Toolkit::Plugin::Diff,
                     # which doesn't know it has to pass us $wiki - and
                     # we don't use it anyway.
-                    if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) {
+                    if ( UNIVERSAL::isa( $_[0], "Wiki::Toolkit" ) ) {
                         shift; # just throw it away
                     }
@@ -173,7 +173,7 @@
                         $url = $1;
                     }
-                    my $rss = CGI::Wiki::Plugin::RSS::Reader->new(url => $url);
+                    my $rss = Wiki::Toolkit::Plugin::RSS::Reader->new(url => $url);
                     my @items = $rss->retrieve;
# Ten items only at this till.
@@ -195,7 +195,7 @@
         },
     );
-    my $formatter = CGI::Wiki::Formatter::UseMod->new(
+    my $formatter = Wiki::Toolkit::Formatter::UseMod->new(
         extended_links      => 1,
         implicit_links      => 0,
         allowed_tags        => [qw(a p b strong i em pre small img table td
@@ -212,7 +212,7 @@
                  search    => $search,
                  formatter => $formatter );
-    my $wiki = CGI::Wiki->new( %conf );
+    my $wiki = Wiki::Toolkit->new( %conf );
     return $wiki;
 }
Modified: trunk/lib/OpenGuides.pm
===================================================================
--- trunk/lib/OpenGuides.pm	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/lib/OpenGuides.pm	2006-05-14 15:54:22 UTC (rev 785)
@@ -3,8 +3,8 @@
use Carp "croak";
 use CGI;
-use CGI::Wiki::Plugin::Diff;
-use CGI::Wiki::Plugin::Locator::Grid;
+use Wiki::Toolkit::Plugin::Diff;
+use Wiki::Toolkit::Plugin::Locator::Grid;
 use OpenGuides::CGI;
 use OpenGuides::Feed;
 use OpenGuides::Template;
@@ -50,18 +50,18 @@
     my $geo_handler = $self->config->geo_handler;
     my $locator;
     if ( $geo_handler == 1 ) {
-        $locator = CGI::Wiki::Plugin::Locator::Grid->new(
+        $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(
                                              x => "os_x",    y => "os_y" );
     } elsif ( $geo_handler == 2 ) {
-        $locator = CGI::Wiki::Plugin::Locator::Grid->new(
+        $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(
                                              x => "osie_x",  y => "osie_y" );
     } else {
-        $locator = CGI::Wiki::Plugin::Locator::Grid->new(
+        $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(
                                              x => "easting", y => "northing" );
     }
     $wiki->register_plugin( plugin => $locator );
     $self->{locator} = $locator;
-    my $differ = CGI::Wiki::Plugin::Diff->new;
+    my $differ = Wiki::Toolkit::Plugin::Diff->new;
     $wiki->register_plugin( plugin => $differ );
     $self->{differ} = $differ;
     return $self;
@@ -69,7 +69,7 @@
=item B<wiki>
-An accessor, returns the underlying LCGI::Wiki object.
+An accessor, returns the underlying LWiki::Toolkit object.
=cut
@@ -91,7 +91,7 @@
=item B<locator>
-An accessor, returns the underlying LCGI::Wiki::Plugin::Locator::UK object.
+An accessor, returns the underlying LWiki::Toolkit::Plugin::Locator::UK object.
=cut
@@ -102,7 +102,7 @@
=item B<differ>
-An accessor, returns the underlying LCGI::Wiki::Plugin::Diff object.
+An accessor, returns the underlying LWiki::Toolkit::Plugin::Diff object.
=cut
@@ -957,7 +957,7 @@
     }
     $metadata{host} = $ENV{REMOTE_ADDR};
-    # CGI::Wiki::Plugin::RSS::ModWiki wants "major_change" to be set.
+    # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set.
     $metadata{major_change} = ( $metadata{edit_type} eq "Normal edit" )
                             ? 1
                             : 0;
@@ -1135,7 +1135,7 @@
=item * L<http://openguides.org/%7CThe OpenGuides website>, with a list of all live OpenGuides installs.
-=item * LCGI::Wiki, the Wiki toolkit which does the heavy lifting for OpenGuides
+=item * LWiki::Toolkit, the Wiki toolkit which does the heavy lifting for OpenGuides
=back
Modified: trunk/t/11_utils.t
===================================================================
--- trunk/t/11_utils.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/11_utils.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -26,7 +26,7 @@
                    }
     );
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene ( 0 ) };
my $wiki = eval {
@@ -34,7 +34,7 @@
     };
     is( $@, "",
         "...but not with an OpenGuides::Config object with suitable data" );
-    isa_ok( $wiki, "CGI::Wiki" );
+    isa_ok( $wiki, "Wiki::Toolkit" );
ok( $wiki->store,      "...and store defined" );
     ok( $wiki->search_obj, "...and search defined" );
Modified: trunk/t/12_macros.t
===================================================================
--- trunk/t/12_macros.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/12_macros.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More tests => 6;
@@ -14,7 +14,7 @@
     # Clear out the database from any previous runs.
     unlink "t/node.db";
     unlink <t/indexes/*>;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
my $config = OpenGuides::Test->make_basic_config;
     my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/14_recent_changes_cookies.t
===================================================================
--- trunk/t/14_recent_changes_cookies.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/14_recent_changes_cookies.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides;
 use OpenGuides::CGI;
@@ -57,7 +57,7 @@
     skip "DBD::SQLite not installed - no database to test with", 2
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Config->new(
            vars => {
                      dbtype             => "sqlite",
@@ -70,7 +70,7 @@
                      home_name          => "Home",
                    }
     );
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene ( 0 ) };
my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/15_template.t
===================================================================
--- trunk/t/15_template.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/15_template.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,7 +1,7 @@
 use strict;
 use Cwd;
 use CGI::Cookie;
-use CGI::Wiki::Formatter::UseMod;
+use Wiki::Toolkit::Formatter::UseMod;
 use OpenGuides::Config;
 use OpenGuides::Template;
 use Test::MockObject;
@@ -10,7 +10,7 @@
 my $config = OpenGuides::Config->new(
        vars => {
                  template_path         => cwd . '/t/templates',
-                 site_name             => 'CGI::Wiki Test Site',
+                 site_name             => 'Wiki::Toolkit Test Site',
                  script_url            => 'http://wiki.example.com/',
                  script_name           => 'mywiki.cgi',
                  default_country       => 'United Kingdom',
@@ -28,7 +28,7 @@
 # object passed in, and I CBA to make a proper wiki object here.
 my $fake_wiki = Test::MockObject->new;
 $fake_wiki->mock("formatter",
-                 sub { return CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ); } );
+                 sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } );
eval { OpenGuides::Template->output( wiki   => $fake_wiki,
                                      config => $config ); };
@@ -74,7 +74,7 @@
     template => "15_test.tt"
 );
-like( $output, qr/SITE NAME: CGI::Wiki Test Site/, "site_name var set" );
+like( $output, qr/SITE NAME: Wiki::Toolkit Test Site/, "site_name var set" );
 like( $output, qr/CGI URL: mywiki.cgi/, "cgi_url var set" );
 like( $output, qr/FULL CGI URL: http://wiki.example.com/mywiki.cgi/,
       "full_cgi_url var set" );
@@ -116,7 +116,7 @@
 $config = OpenGuides::Config->new(
        vars => {
                  template_path         => cwd . '/t/templates',
-                 site_name             => 'CGI::Wiki Test Site',
+                 site_name             => 'Wiki::Toolkit Test Site',
                  script_url            => 'http://wiki.example.com/',
                  script_name           => 'mywiki.cgi',
    	 formatting_rules_node => 'Some External Help',
@@ -135,7 +135,7 @@
 $config = OpenGuides::Config->new(
        vars => {
                  template_path         => cwd . '/t/templates',
-                 site_name             => 'CGI::Wiki Test Site',
+                 site_name             => 'Wiki::Toolkit Test Site',
                  script_url            => 'http://wiki.example.com/',
                  script_name           => '',
                }
@@ -153,7 +153,7 @@
 $config = OpenGuides::Config->new(
        vars => {
                  template_path         => cwd . '/t/templates',
-                 site_name             => 'CGI::Wiki Test Site',
+                 site_name             => 'Wiki::Toolkit Test Site',
                  script_url            => 'http://wiki.example.com',
                  script_name           => 'wiki.cgi',
                }
Modified: trunk/t/16_test_tester.t
===================================================================
--- trunk/t/16_test_tester.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/16_test_tester.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More;
@@ -20,7 +20,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Test->make_basic_config;
 $config->site_name( "Test Site" );
 my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/21_rdf.t
===================================================================
--- trunk/t/21_rdf.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/21_rdf.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Config;
 use OpenGuides::RDF;
@@ -14,7 +14,7 @@
     skip "DBD::SQLite not installed - no database to test with", 24
         unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Config->new(
         vars => {
                     dbtype             => "sqlite",
@@ -22,12 +22,12 @@
                     indexing_directory => "t/indexes",
                     script_url         => "http://wiki.example.com/",
                     script_name        => "mywiki.cgi",
-                    site_name          => "CGI::Wiki Test Site",
+                    site_name          => "Wiki::Toolkit Test Site",
                     default_city       => "London",
                     default_country    => "United Kingdom",
                 }
     );
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene ( 0 ) };
@@ -80,7 +80,7 @@
     like( $rdfxml, qr|<foaf:homepage rdf:resource="test website" />|, "picks up website" );
like( $rdfxml,
-        qr|dc:titleCGI::Wiki Test Site: Calthorpe Arms</dc:title>|,
+        qr|dc:titleWiki::Toolkit Test Site: Calthorpe Arms</dc:title>|,
         "sets the title correctly" );
like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|,
Modified: trunk/t/22_rss_modwiki.t
===================================================================
--- trunk/t/22_rss_modwiki.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/22_rss_modwiki.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,8 +1,8 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides;
-use OpenGuides::RDF;
+use OpenGuides::Feed;
 use OpenGuides::Utils;
 use Test::More;
@@ -12,7 +12,7 @@
     exit 0;
 }
-eval { require CGI::Wiki::Search::Plucene; };
+eval { require Wiki::Toolkit::Search::Plucene; };
 if ( $@ ) {
     plan skip_all => "Plucene not installed";
     exit 0;
@@ -24,7 +24,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Config->new(
        vars => {
                  dbtype             => "sqlite",
Modified: trunk/t/25_write_geo_data.t
===================================================================
--- trunk/t/25_write_geo_data.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/25_write_geo_data.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides;
 use OpenGuides::Test;
@@ -35,7 +35,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Config->new(
        vars => {
                  dbtype             => "sqlite",
Modified: trunk/t/26_geo_data_search_form.t
===================================================================
--- trunk/t/26_geo_data_search_form.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/26_geo_data_search_form.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More;
@@ -40,7 +40,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Test->make_basic_config;
 $config->use_plucene( 1 );
Modified: trunk/t/27_geo_data_edit_form.t
===================================================================
--- trunk/t/27_geo_data_edit_form.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/27_geo_data_edit_form.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More;
@@ -41,7 +41,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Test->make_basic_config;
 $config->use_plucene( 1 );
Modified: trunk/t/28_wgs84_coords.t
===================================================================
--- trunk/t/28_wgs84_coords.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/28_wgs84_coords.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More;
Modified: trunk/t/31_search.t
===================================================================
--- trunk/t/31_search.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/31_search.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Search;
 use OpenGuides::Test;
 use Test::More;
@@ -14,13 +14,13 @@
     unlink "t/node.db";
     unlink <t/indexes/*>;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Test->make_basic_config;
     $config->script_name( "wiki.cgi" );
     $config->script_url( "http://example.com/" );
# Plucene is the recommended searcher now.
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene( 0 ) };
my $search = OpenGuides::Search->new( config => $config );
Modified: trunk/t/32_search_simple_metadata.t
===================================================================
--- trunk/t/32_search_simple_metadata.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/32_search_simple_metadata.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::Search;
 use Test::More tests => 10;
@@ -15,7 +15,7 @@
     unlink "t/node.db";
     unlink <t/indexes/*>;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Config->new(
            vars => {
                      dbtype             => "sqlite",
@@ -29,7 +29,7 @@
     );
# Plucene is the recommended searcher now.
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene( 0 ) };
my $search = OpenGuides::Search->new( config => $config );
Modified: trunk/t/33_search_advanced_search.t
===================================================================
--- trunk/t/33_search_advanced_search.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/33_search_advanced_search.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,6 +1,6 @@
 use strict;
-use CGI::Wiki::Plugin::Locator::Grid; # use directly to help debug
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Plugin::Locator::Grid; # use directly to help debug
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::Search;
 use OpenGuides::Test;
@@ -26,7 +26,7 @@
 # Clear out the database from any previous runs.
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
my $config = OpenGuides::Config->new(
        vars => {
@@ -78,7 +78,7 @@
# Sanity check.
 print "# Distances should be:\n";
-my $locator = CGI::Wiki::Plugin::Locator::Grid->new(x => "os_x", y => "os_y");
+my $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(x => "os_x", y => "os_y");
 my $wiki = $guide->wiki;
 $wiki->register_plugin( plugin => $locator );
 foreach my $node ( "Blue Anchor", "Crabtree Tavern", "Hammersmith Bridge"){
Modified: trunk/t/33_search_advanced_search_utm.t
===================================================================
--- trunk/t/33_search_advanced_search_utm.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/33_search_advanced_search_utm.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::Search;
 use OpenGuides::Test;
@@ -25,7 +25,7 @@
 # Clear out the database from any previous runs.
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
my $config = OpenGuides::Config->new(
        vars => {
Modified: trunk/t/34_search_paging.t
===================================================================
--- trunk/t/34_search_paging.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/34_search_paging.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::Search;
 use OpenGuides::Test;
@@ -20,7 +20,7 @@
 # Clear out the database from any previous runs.
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
my $config = OpenGuides::Test->make_basic_config;
 $config->use_plucene( 1 );
Modified: trunk/t/35_search_two_searches.t
===================================================================
--- trunk/t/35_search_two_searches.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/35_search_two_searches.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::Search;
 use Test::More;
@@ -34,7 +34,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Config->new(
        vars => {
                  dbtype             => "sqlite",
@@ -49,7 +49,7 @@
 );
# Plucene is the recommended searcher now.
-eval { require CGI::Wiki::Search::Plucene; };
+eval { require Wiki::Toolkit::Search::Plucene; };
 if ( $@ ) { $config->use_plucene( 0 ) };
my $search = OpenGuides::Search->new( config => $config );
Modified: trunk/t/36_search_order.t
===================================================================
--- trunk/t/36_search_order.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/36_search_order.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::Search;
 use Test::More;
@@ -10,7 +10,7 @@
     exit 0;
 }
-eval { require CGI::Wiki::Search::Plucene; };
+eval { require Wiki::Toolkit::Search::Plucene; };
 if ( $@ ) {
     plan skip_all => "Plucene not installed";
     exit 0;
@@ -22,7 +22,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Config->new(
        vars => {
                  dbtype             => "sqlite",
Modified: trunk/t/37_search_summaries.t
===================================================================
--- trunk/t/37_search_summaries.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/37_search_summaries.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::Search;
 use Test::More;
@@ -14,7 +14,7 @@
     unlink "t/node.db";
     unlink <t/indexes/*>;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Config->new(
            vars => {
                      dbtype             => "sqlite",
@@ -28,7 +28,7 @@
     );
# Plucene is the recommended searcher now.
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene( 0 ) };
my $search = OpenGuides::Search->new( config => $config );
Modified: trunk/t/38_search_params.t
===================================================================
--- trunk/t/38_search_params.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/38_search_params.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,6 +1,6 @@
 use strict;
 use CGI;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::Search;
 use Test::More;
@@ -11,7 +11,7 @@
     exit 0;
 }
-eval { require CGI::Wiki::Search::Plucene; };
+eval { require Wiki::Toolkit::Search::Plucene; };
 if ( $@ ) { 
     plan skip_all => "Plucene not installed";
     exit 0;
@@ -36,7 +36,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Config->new(
        vars => {
                  dbtype             => "sqlite",
Modified: trunk/t/39_search_form.t
===================================================================
--- trunk/t/39_search_form.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/39_search_form.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Search;
 use OpenGuides::Test;
 use Test::More;
@@ -40,7 +40,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Test->make_basic_config;
 $config->use_plucene( 1 );
Modified: trunk/t/41_deletion.t
===================================================================
--- trunk/t/41_deletion.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/41_deletion.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Formatter::UseMod;
+use Wiki::Toolkit::Formatter::UseMod;
 use OpenGuides::Template;
 use OpenGuides::Test;
 use Test::MockObject;
@@ -15,7 +15,7 @@
 # info to make a proper wiki object here.
 my $fake_wiki = Test::MockObject->new;
 $fake_wiki->mock("formatter",
-                 sub { return CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ); } );
+                 sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } );
my $output = OpenGuides::Template->output(
     wiki     => $fake_wiki,
Modified: trunk/t/51_display_node.t
===================================================================
--- trunk/t/51_display_node.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/51_display_node.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides;
 use Test::More tests => 7;
@@ -11,7 +11,7 @@
     skip "DBD::SQLite not installed - no database to test with", 5
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Config->new(
            vars => {
                      dbtype             => "sqlite",
@@ -24,13 +24,13 @@
                      home_name          => "Home",
                    }
     );
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene ( 0 ) };
my $guide = OpenGuides->new( config => $config );
     isa_ok( $guide, "OpenGuides" );
     my $wiki = $guide->wiki;
-    isa_ok( $wiki, "CGI::Wiki" );
+    isa_ok( $wiki, "Wiki::Toolkit" );
     $wiki->write_node( "Test Page", "foo", undef, { source => "alternate.cgi?Test_Page" } );
     my $output = eval {
         $guide->display_node( id => "Test Page", return_output => 1 );
Modified: trunk/t/52_display_diffs.t
===================================================================
--- trunk/t/52_display_diffs.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/52_display_diffs.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More tests => 5;
@@ -11,7 +11,7 @@
     skip "DBD::SQLite not installed - no database to test with", 5
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Test->make_basic_config;
     my $guide = OpenGuides->new( config => $config );
     my $wiki = $guide->wiki;
Modified: trunk/t/53_show_index.t
===================================================================
--- trunk/t/53_show_index.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/53_show_index.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More tests => 6;
@@ -11,14 +11,14 @@
     skip "DBD::SQLite not installed - no database to test with", 6
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Test->make_basic_config;
     $config->script_name( "wiki.cgi" );
     $config->script_url( "http://example.com/" );
     my $guide = OpenGuides->new( config => $config );
     isa_ok( $guide, "OpenGuides" );
     my $wiki = $guide->wiki;
-    isa_ok( $wiki, "CGI::Wiki" );
+    isa_ok( $wiki, "Wiki::Toolkit" );
# Clear out the database from any previous runs.
     foreach my $del_node ( $wiki->list_all_nodes ) {
Modified: trunk/t/54_redirect.t
===================================================================
--- trunk/t/54_redirect.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/54_redirect.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides;
 use Test::More tests => 2;
@@ -11,7 +11,7 @@
     skip "DBD::SQLite not installed - no database to test with", 2
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Config->new(
            vars => {
                      dbtype             => "sqlite",
@@ -23,7 +23,7 @@
                      template_path      => "./templates",
                    }
     );
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene ( 0 ) };
        
     my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/55_node_history.t
===================================================================
--- trunk/t/55_node_history.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/55_node_history.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More tests => 2;
@@ -10,8 +10,8 @@
     skip "DBD::SQLite not installed - no database to test with", 2
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Test->make_basic_config;
     $config->script_name( "mywiki.cgi" );
     $config->script_url( "http://example.com/" );
Modified: trunk/t/56_diffs_with_macros.t
===================================================================
--- trunk/t/56_diffs_with_macros.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/56_diffs_with_macros.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,5 +1,5 @@
 use strict;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use File::Temp qw( tempfile );
 use OpenGuides;
 use OpenGuides::Test;
@@ -16,7 +16,7 @@
 # Clear out the database from any previous runs.
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
my $config = OpenGuides::Test->make_basic_config;
 my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/61_bug_textareas.t
===================================================================
--- trunk/t/61_bug_textareas.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/61_bug_textareas.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Template;
 use OpenGuides::Test;
 use OpenGuides::Utils;
@@ -11,7 +11,7 @@
     skip "DBD::SQLite not installed - no database to test with", 1
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Test->make_basic_config;
     my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
Modified: trunk/t/62_bug_trailing_whitespace.t
===================================================================
--- trunk/t/62_bug_trailing_whitespace.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/62_bug_trailing_whitespace.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides;
 use OpenGuides::Template;
@@ -16,7 +16,7 @@
 # Clear out the database from any previous runs.
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
my $config = OpenGuides::Test->make_basic_config;
 my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/63_bug_map_link_no_address.t
===================================================================
--- trunk/t/63_bug_map_link_no_address.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/63_bug_map_link_no_address.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More tests => 1;
@@ -10,8 +10,8 @@
     skip "DBD::SQLite not installed - no database to test with", 1
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Test->make_basic_config;
     my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/64_bug_node_history.t
===================================================================
--- trunk/t/64_bug_node_history.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/64_bug_node_history.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use Cwd;
 use OpenGuides;
@@ -11,8 +11,8 @@
     skip "DBD::SQLite not installed - no database to test with", 1
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Config->new(
            vars => {
                      dbtype             => "sqlite",
@@ -20,11 +20,11 @@
                      indexing_directory => "t/indexes",
                      script_url         => "http://wiki.example.com/",
                      script_name        => "mywiki.cgi",
-                     site_name          => "CGI::Wiki Test Site",
+                     site_name          => "Wiki::Toolkit Test Site",
                      template_path      => cwd . "/templates",
                    }
     );
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene ( 0 ) };
my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/65_bug_metadata_escape.t
===================================================================
--- trunk/t/65_bug_metadata_escape.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/65_bug_metadata_escape.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use Cwd;
 use OpenGuides;
@@ -10,8 +10,8 @@
 } else {
     plan tests => 1;
-    CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Config->new(
            vars => {
                      dbtype             => "sqlite",
@@ -19,11 +19,11 @@
                      indexing_directory => "t/indexes",
                      script_url         => "http://wiki.example.com/",
                      script_name        => "mywiki.cgi",
-                     site_name          => "CGI::Wiki Test Site",
+                     site_name          => "Wiki::Toolkit Test Site",
                      template_path      => cwd . "/templates",
                    }
     );
-    eval { require CGI::Wiki::Search::Plucene; };
+    eval { require Wiki::Toolkit::Search::Plucene; };
     if ( $@ ) { $config->use_plucene ( 0 ) };
my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/66_bug_latlong_representation.t
===================================================================
--- trunk/t/66_bug_latlong_representation.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/66_bug_latlong_representation.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,6 +1,6 @@
 use strict;
 use CGI;
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides::CGI;
 use OpenGuides;
@@ -23,7 +23,7 @@
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Config->new(
        vars => {
                  dbtype             => "sqlite",
@@ -40,7 +40,7 @@
 );
# Plucene is the recommended searcher now.
-eval { require CGI::Wiki::Search::Plucene; };
+eval { require Wiki::Toolkit::Search::Plucene; };
 if ( $@ ) { $config->use_plucene( 0 ) };
my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/67_bug_first_version.t
===================================================================
--- trunk/t/67_bug_first_version.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/67_bug_first_version.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides::Config;
 use OpenGuides;
 use OpenGuides::Template;
@@ -16,7 +16,7 @@
 # Clear out the database from any previous runs.
 unlink "t/node.db";
 unlink <t/indexes/*>;
-CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
my $config = OpenGuides::Test->make_basic_config;
 my $guide = OpenGuides->new( config => $config );
Modified: trunk/t/68_bug_website_displayed.t
===================================================================
--- trunk/t/68_bug_website_displayed.t	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/t/68_bug_website_displayed.t	2006-05-14 15:54:22 UTC (rev 785)
@@ -1,4 +1,4 @@
-use CGI::Wiki::Setup::SQLite;
+use Wiki::Toolkit::Setup::SQLite;
 use OpenGuides;
 use OpenGuides::Test;
 use Test::More tests => 1;
@@ -10,8 +10,8 @@
     skip "DBD::SQLite not installed - no database to test with", 1
       unless $have_sqlite;
-    CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
-    CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
+    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
     my $config = OpenGuides::Test->make_basic_config;
     my $guide = OpenGuides->new( config => $config );
Modified: trunk/wiki.cgi
===================================================================
--- trunk/wiki.cgi	2006-05-14 15:27:00 UTC (rev 784)
+++ trunk/wiki.cgi	2006-05-14 15:54:22 UTC (rev 785)
@@ -8,7 +8,7 @@
use CGI qw/:standard/;
 use CGI::Carp qw(croak);
-use CGI::Wiki;
+use Wiki::Toolkit;
 use Geography::NationalGrid;
 use Geography::NationalGrid::GB;
 use OpenGuides;

    