Changeset 763 for branches


Ignore:
Timestamp:
Apr 10, 2006, 6:36:16 PM (13 years ago)
Author:
Dominic Hargreaves
Message:

Simple search and replace, should cover most things.

Location:
branches/move-to-wiki-toolkit
Files:
50 edited

Legend:

Unmodified
Added
Removed
  • branches/move-to-wiki-toolkit/Build.PL

    r753 r763  
    219219        'CGI::Carp'                       => 0,
    220220        'CGI::Cookie'                     => 0,
    221         'CGI::Wiki'                       => '0.62',  # fixed delete version
    222         'CGI::Wiki::Formatter::UseMod'    => '0.16',  # macros
    223         'CGI::Wiki::Plugin::Atom'         => 0,
    224         'CGI::Wiki::Plugin::Categoriser'  => 0,
    225         'CGI::Wiki::Plugin::Diff'         => '0.08',  # earlier buggy
    226         'CGI::Wiki::Plugin::Locator::Grid'=> '0.02',  # cope with sqlite 3
    227         'CGI::Wiki::Plugin::RSS::ModWiki' => '0.09',  # fixes date formatting bug
    228         'CGI::Wiki::Plugin::RSS::Reader'  => '1.3',   # earlier versions don't support RSS 2.0
     221        'Wiki::Toolkit'                       => '0.62',  # fixed delete version
     222        'Wiki::Toolkit::Formatter::UseMod'    => '0.16',  # macros
     223        'Wiki::Toolkit::Plugin::Atom'         => 0,
     224        'Wiki::Toolkit::Plugin::Categoriser'  => 0,
     225        'Wiki::Toolkit::Plugin::Diff'         => '0.08',  # earlier buggy
     226        'Wiki::Toolkit::Plugin::Locator::Grid'=> '0.02',  # cope with sqlite 3
     227        'Wiki::Toolkit::Plugin::RSS::ModWiki' => '0.09',  # fixes date formatting bug
     228        'Wiki::Toolkit::Plugin::RSS::Reader'  => '1.3',   # earlier versions don't support RSS 2.0
    229229        'Class::Accessor'                 => 0,
    230230        'Config::Tiny'                    => 0,
  • branches/move-to-wiki-toolkit/Changes

    r759 r763  
    7575       
    76760.49    24 July 2005
    77         Add updated prerequisite on CGI::Wiki::Plugin::RSS::ModWiki (fixes
     77        Add updated prerequisite on Wiki::Toolkit::Plugin::RSS::ModWiki (fixes
    7878        a test failure)
    7979
     
    112112        Fixed bug with list_all_versions for nodes with only one version.
    113113        Extended config changes to examples/reindex.pl (thanks jimbo).
    114         Now require CGI::Wiki 0.62 to fix bug with deleting versions.
     114        Now require Wiki::Toolkit 0.62 to fix bug with deleting versions.
    115115        Try to ensure that a .htaccess file protecting wiki.conf is installed.
    116116        Allow for external URLs for Text Formatting help.
     
    175175          This only affects you if you have used the custom template support
    176176          introduced in 0.41.
    177         Replace use of CGI::Wiki::Plugin::Geocache with improved node.tt.
     177        Replace use of Wiki::Toolkit::Plugin::Geocache with improved node.tt.
    178178
    1791790.41    21 September 2004
     
    228228
    2292290.35    25 June 2004
    230         Forgot to add version prerequisite on CGI::Wiki.  Don't use 0.34,
     230        Forgot to add version prerequisite on Wiki::Toolkit.  Don't use 0.34,
    231231          use this.
    232232
     
    2682680.31    09 May 2004
    269269        Created a new macro to allow the embedding of RSS feeds into
    270           pages, using CGI::Wiki::Plugin::RSS::Reader. This allows you
     270          pages, using Wiki::Toolkit::Plugin::RSS::Reader. This allows you
    271271          to do this to produce a list of up to ten hyperlinks:
    272272            @RSS [http://example.com/example.rss]
     
    317317        Removed newlines from output of search box macro.
    318318
    319         Reimplemented diffing using CGI::Wiki::Plugin::Diff as it seems the
     319        Reimplemented diffing using Wiki::Toolkit::Plugin::Diff as it seems the
    320320          change in 0.30 got lost. Removed OpenGuides::Diff.pm as we should not
    321321          be distributing it.
     
    351351        Removed pubcrawl stuff from distro for now - it doesn't really work.
    352352
    353         Changed to use CGI::Wiki::Plugin::Diff instead of OpenGuides::Diff.
     353        Changed to use Wiki::Toolkit::Plugin::Diff instead of OpenGuides::Diff.
    354354
    3553550.29    8 November 2003
     
    540540
    5415410.07    3 May 2003
    542         Require CGI::Wiki 0.32 to avoid bug (again a Bob find!) where
     542        Require Wiki::Toolkit 0.32 to avoid bug (again a Bob find!) where
    543543        committing a node with metadata but no content would die.
    544544
  • branches/move-to-wiki-toolkit/INSTALL

    r736 r763  
    105105to index your wiki instead of Search::InvertedIndex.  If you answer
    106106yes to this question, you will need to make sure you have installed
    107 both Plucene, and CGI::Wiki version 0.56 or later.
     107both Plucene, and Wiki::Toolkit version 0.56 or later.
    108108
    109109If you are changing to Plucene from Search::InvertedIndex, you will
     
    334334programs, it isn't appropriate to run them again. So we will make use of
    335335the utility program "cgi-wiki-setupdb" which is included with the
    336 CGI::Wiki distribution. Documentation for this command can be found in
     336Wiki::Toolkit distribution. Documentation for this command can be found in
    337337its man page; run this with the appropriate arguments to create the
    338338new database.
  • branches/move-to-wiki-toolkit/PREREQUISITES

    r753 r763  
    77CGI::Carp
    88CGI::Cookie
    9 CGI::Wiki (version 0.62 or later)
    10 CGI::Wiki::Formatter::UseMod (version 0.16 or later)
    11 CGI::Wiki::Plugin::Atom
    12 CGI::Wiki::Plugin::Categoriser
    13 CGI::Wiki::Plugin::Diff (version 0.08 or later)
    14 CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later)
    15 CGI::Wiki::Plugin::RSS::ModWiki (version 0.09 or later)
    16 CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later)
     9Wiki::Toolkit (version 0.62 or later)
     10Wiki::Toolkit::Formatter::UseMod (version 0.16 or later)
     11Wiki::Toolkit::Plugin::Atom
     12Wiki::Toolkit::Plugin::Categoriser
     13Wiki::Toolkit::Plugin::Diff (version 0.08 or later)
     14Wiki::Toolkit::Plugin::Locator::Grid (version 0.02 or later)
     15Wiki::Toolkit::Plugin::RSS::ModWiki (version 0.09 or later)
     16Wiki::Toolkit::Plugin::RSS::Reader (version 1.3 or later)
    1717Class::Accessor
    1818Config::Tiny
  • branches/move-to-wiki-toolkit/README

    r736 r763  
    2323    * http://london.openguides.org/, the first and biggest OpenGuides site.
    2424    * http://openguides.org/, with a list of all live OpenGuides installs.
    25     * CGI::Wiki, the Wiki toolkit which does the heavy lifting for
     25    * Wiki::Toolkit, the Wiki toolkit which does the heavy lifting for
    2626    OpenGuides
    2727
  • branches/move-to-wiki-toolkit/lib/OpenGuides.pm

    r761 r763  
    44use Carp "croak";
    55use CGI;
    6 use CGI::Wiki::Plugin::Diff;
    7 use CGI::Wiki::Plugin::Locator::Grid;
     6use Wiki::Toolkit::Plugin::Diff;
     7use Wiki::Toolkit::Plugin::Locator::Grid;
    88use OpenGuides::CGI;
    99use OpenGuides::Feed;
     
    5151    my $locator;
    5252    if ( $geo_handler == 1 ) {
    53         $locator = CGI::Wiki::Plugin::Locator::Grid->new(
     53        $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(
    5454                                             x => "os_x",    y => "os_y" );
    5555    } elsif ( $geo_handler == 2 ) {
    56         $locator = CGI::Wiki::Plugin::Locator::Grid->new(
     56        $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(
    5757                                             x => "osie_x",  y => "osie_y" );
    5858    } else {
    59         $locator = CGI::Wiki::Plugin::Locator::Grid->new(
     59        $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(
    6060                                             x => "easting", y => "northing" );
    6161    }
    6262    $wiki->register_plugin( plugin => $locator );
    6363    $self->{locator} = $locator;
    64     my $differ = CGI::Wiki::Plugin::Diff->new;
     64    my $differ = Wiki::Toolkit::Plugin::Diff->new;
    6565    $wiki->register_plugin( plugin => $differ );
    6666    $self->{differ} = $differ;
     
    7070=item B<wiki>
    7171
    72 An accessor, returns the underlying L<CGI::Wiki> object.
     72An accessor, returns the underlying L<Wiki::Toolkit> object.
    7373
    7474=cut
     
    9292=item B<locator>
    9393
    94 An accessor, returns the underlying L<CGI::Wiki::Plugin::Locator::UK> object.
     94An accessor, returns the underlying L<Wiki::Toolkit::Plugin::Locator::UK> object.
    9595
    9696=cut
     
    103103=item B<differ>
    104104
    105 An accessor, returns the underlying L<CGI::Wiki::Plugin::Diff> object.
     105An accessor, returns the underlying L<Wiki::Toolkit::Plugin::Diff> object.
    106106
    107107=cut
     
    958958    $metadata{host} = $ENV{REMOTE_ADDR};
    959959
    960     # CGI::Wiki::Plugin::RSS::ModWiki wants "major_change" to be set.
     960    # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set.
    961961    $metadata{major_change} = ( $metadata{edit_type} eq "Normal edit" )
    962962                            ? 1
     
    11361136=item * L<http://openguides.org/|The OpenGuides website>, with a list of all live OpenGuides installs.
    11371137
    1138 =item * L<CGI::Wiki>, the Wiki toolkit which does the heavy lifting for OpenGuides
     1138=item * L<Wiki::Toolkit>, the Wiki toolkit which does the heavy lifting for OpenGuides
    11391139
    11401140=back
  • branches/move-to-wiki-toolkit/lib/OpenGuides/Build.pm

    r606 r763  
    2727                          sqlite   => "SQLite" );
    2828
    29     my $cgi_wiki_module = "CGI::Wiki::Setup::" . $cgi_wiki_exts{$dbtype};
     29    my $cgi_wiki_module = "Wiki::Toolkit::Setup::" . $cgi_wiki_exts{$dbtype};
    3030    eval "require $cgi_wiki_module";
    3131    die "There was a problem: $@" if $@;
  • branches/move-to-wiki-toolkit/lib/OpenGuides/Feed.pm

    r753 r763  
    66$VERSION = '0.01';
    77
    8 use CGI::Wiki::Plugin::Atom;
    9 use CGI::Wiki::Plugin::RSS::ModWiki;
     8use Wiki::Toolkit::Plugin::Atom;
     9use Wiki::Toolkit::Plugin::RSS::ModWiki;
    1010use Time::Piece;
    1111use URI::Escape;
     
    2424    my $wiki = $args{wiki};
    2525   
    26     unless ( $wiki && UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) {
    27        croak "No CGI::Wiki object supplied.";
     26    unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) {
     27       croak "No Wiki::Toolkit object supplied.";
    2828    }
    2929    $self->{wiki} = $wiki;
     
    8282 
    8383    unless ($self->{atom_maker}) {
    84         $self->{atom_maker} = CGI::Wiki::Plugin::Atom->new(
     84        $self->{atom_maker} = Wiki::Toolkit::Plugin::Atom->new(
    8585            wiki                => $self->{wiki},
    8686            site_name           => $self->{site_name},
     
    103103
    104104    unless ($self->{rss_maker}) {
    105         $self->{rss_maker} = CGI::Wiki::Plugin::RSS::ModWiki->new(
     105        $self->{rss_maker} = Wiki::Toolkit::Plugin::RSS::ModWiki->new(
    106106            wiki                => $self->{wiki},
    107107            site_name           => $self->{site_name},
     
    140140=head1 SYNOPSIS
    141141
    142     use CGI::Wiki;
     142    use Wiki::Toolkit;
    143143    use OpenGuides::Config;
    144144    use OpenGuides::Feed;
    145145
    146     my $wiki = CGI::Wiki->new( ... );
     146    my $wiki = Wiki::Toolkit->new( ... );
    147147    my $config = OpenGuides::Config->new( file => "wiki.conf" );
    148148    my $feed = OpenGuides::Feed->new( wiki       => $wiki,
     
    167167                                      og_version => '1.0', );
    168168
    169 C<wiki> must be a L<CGI::Wiki> object and C<config> must be an
     169C<wiki> must be a L<Wiki::Toolkit> object and C<config> must be an
    170170L<OpenGuides::Config> object.  Both of these arguments are mandatory.
    171171C<og_version> is an optional argument specifying the version of
     
    174174=item B<rss_maker>
    175175
    176 Returns a raw L<CGI::Wiki::Plugin::RSS::ModWiki> object created with the values you
     176Returns a raw L<Wiki::Toolkit::Plugin::RSS::ModWiki> object created with the values you
    177177invoked this module with.
    178178
    179179=item B<atom_maker>
    180180
    181 Returns a raw L<CGI::Wiki::Plugin::Atom> object created with the values you
     181Returns a raw L<Wiki::Toolkit::Plugin::Atom> object created with the values you
    182182invoked this module with.
    183183
     
    216216=over 4
    217217
    218 =item * L<CGI::Wiki>, L<CGI::Wiki::Plugin::RSS::ModWiki> and L<CGI::Wiki::Plugin::Atom>
     218=item * L<Wiki::Toolkit>, L<Wiki::Toolkit::Plugin::RSS::ModWiki> and L<Wiki::Toolkit::Plugin::Atom>
    219219
    220220=item * L<http://openguides.org/>
  • branches/move-to-wiki-toolkit/lib/OpenGuides/RDF.pm

    r753 r763  
    66$VERSION = '0.09';
    77
    8 use CGI::Wiki::Plugin::RSS::ModWiki;
     8use Wiki::Toolkit::Plugin::RSS::ModWiki;
    99use Time::Piece;
    1010use URI::Escape;
     
    2323    my $wiki = $args{wiki};
    2424   
    25     unless ( $wiki && UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) {
    26       croak "No CGI::Wiki object supplied.";
     25    unless ( $wiki && UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) {
     26      croak "No Wiki::Toolkit object supplied.";
    2727    }
    2828    $self->{wiki} = $wiki;
     
    106106   
    107107    # Make a Time::Piece object.
    108     my $timestamp_fmt = $CGI::Wiki::Store::Database::timestamp_fmt;
     108    my $timestamp_fmt = $Wiki::Toolkit::Store::Database::timestamp_fmt;
    109109
    110110    if ( $timestamp ) {
     
    213213=head1 SYNOPSIS
    214214
    215     use CGI::Wiki;
     215    use Wiki::Toolkit;
    216216    use OpenGuides::Config;
    217217    use OpenGuides::RDF;
    218218
    219     my $wiki = CGI::Wiki->new( ... );
     219    my $wiki = Wiki::Toolkit->new( ... );
    220220    my $config = OpenGuides::Config->new( file => "wiki.conf" );
    221221    my $rdf_writer = OpenGuides::RDF->new( wiki   => $wiki,
     
    235235                                           config => $config );
    236236
    237 C<wiki> must be a L<CGI::Wiki> object and C<config> must be an
     237C<wiki> must be a L<Wiki::Toolkit> object and C<config> must be an
    238238L<OpenGuides::Config> object.  Both arguments mandatory.
    239239
     
    254254B<Note:> Some of the fields emitted by the RDF/XML generator are taken
    255255from the node metadata. The form of this metadata is I<not> mandated
    256 by L<CGI::Wiki>. Your wiki application should make sure to store some or
     256by L<Wiki::Toolkit>. Your wiki application should make sure to store some or
    257257all of the following metadata when calling C<write_node>:
    258258
     
    281281=over 4
    282282
    283 =item * L<CGI::Wiki>
     283=item * L<Wiki::Toolkit>
    284284
    285285=item * L<http://openguides.org/>
  • branches/move-to-wiki-toolkit/lib/OpenGuides/Search.pm

    r716 r763  
    44
    55use CGI qw( :standard );
    6 use CGI::Wiki::Plugin::Locator::Grid;
     6use Wiki::Toolkit::Plugin::Locator::Grid;
    77use File::Spec::Functions qw(:ALL);
    88use OpenGuides::Template;
     
    6565    }
    6666
    67     my $locator = CGI::Wiki::Plugin::Locator::Grid->new( %locator_params );
     67    my $locator = Wiki::Toolkit::Plugin::Locator::Grid->new( %locator_params );
    6868    $wiki->register_plugin( plugin => $locator );
    6969    $self->{locator} = $locator;
     
    7676  my $wiki = $search->wiki;
    7777
    78 An accessor; returns the underlying L<CGI::Wiki> object.
     78An accessor; returns the underlying L<Wiki::Toolkit> object.
    7979
    8080=cut
     
    430430
    431431    # Rationalise the scores a little.  The scores returned by
    432     # CGI::Wiki::Search::Plucene are simply a ranking.
     432    # Wiki::Toolkit::Search::Plucene are simply a ranking.
    433433    my $num_results = scalar keys %contents_res;
    434434    foreach my $node ( keys %contents_res ) {
  • branches/move-to-wiki-toolkit/lib/OpenGuides/Template.pm

    r739 r763  
    229229
    230230Picks out things like categories, locales, phone number etc from
    231 EITHER the metadata hash returned by L<CGI::Wiki> OR the query
     231EITHER the metadata hash returned by L<Wiki::Toolkit> OR the query
    232232parameters in a L<CGI> object, and packages them nicely for passing to
    233 templates or storing in L<CGI::Wiki> datastore.  If you supply both
     233templates or storing in L<Wiki::Toolkit> datastore.  If you supply both
    234234C<metadata> and C<cgi_obj> then C<metadata> will take precedence, but
    235235don't do that.
  • branches/move-to-wiki-toolkit/lib/OpenGuides/Test.pm

    r594 r763  
    6868    );
    6969
    70     eval { require CGI::Wiki::Search::Plucene; };
     70    eval { require Wiki::Toolkit::Search::Plucene; };
    7171    if ( $@ ) { $config->use_plucene ( 0 ) };
    7272       
  • branches/move-to-wiki-toolkit/lib/OpenGuides/UK/PubCrawl.pm

    r202 r763  
    66
    77use Carp qw( croak );
    8 use CGI::Wiki::Plugin;
    9 use CGI::Wiki::Plugin::Locator::UK;
     8use Wiki::Toolkit::Plugin;
     9use Wiki::Toolkit::Plugin::Locator::UK;
    1010
    11 @ISA = qw( CGI::Wiki::Plugin );
     11@ISA = qw( Wiki::Toolkit::Plugin );
    1212
    1313=head1 NAME
     
    2424=head1 SYNOPSIS
    2525
    26   use CGI::Wiki;
    27   use CGI::Wiki::Plugin::Locator::UK;
     26  use Wiki::Toolkit;
     27  use Wiki::Toolkit::Plugin::Locator::UK;
    2828  use OpenGuides::UK::PubCrawl;
    2929
    30   my $wiki = CGI::Wiki->new( ... );
    31   my $locator = CGI::Wiki::Plugin::Locator::UK->new;
     30  my $wiki = Wiki::Toolkit->new( ... );
     31  my $locator = Wiki::Toolkit::Plugin::Locator::UK->new;
    3232  $wiki->register_plugin( plugin => $locator );
    33   my $categoriser = CGI::Wiki::Plugin::Categoriser->new;
     33  my $categoriser = Wiki::Toolkit::Plugin::Categoriser->new;
    3434  $wiki->register_plugin( plugin => $categoriser );
    3535
     
    5151  my $crawler = OpenGuides::UK::PubCrawl->new( locator => $locator );
    5252
    53 Croaks unless a C<CGI::Wiki::Plugin::Locator::UK> object and a
    54 C<CGI::Wiki::Plugin::Categoriser> object are supplied.
     53Croaks unless a C<Wiki::Toolkit::Plugin::Locator::UK> object and a
     54C<Wiki::Toolkit::Plugin::Categoriser> object are supplied.
    5555
    5656=cut
     
    6060    my $locator = $args{locator}
    6161      or croak "No locator parameter supplied";
    62     croak "Locator parameter is not a CGI::Wiki::Plugin::Locator::UK"
    63       unless UNIVERSAL::isa( $locator, "CGI::Wiki::Plugin::Locator::UK" );
     62    croak "Locator parameter is not a Wiki::Toolkit::Plugin::Locator::UK"
     63      unless UNIVERSAL::isa( $locator, "Wiki::Toolkit::Plugin::Locator::UK" );
    6464    my $categoriser = $args{categoriser}
    6565      or croak "No categoriser parameter supplied";
    66     croak "Categoriser parameter is not a CGI::Wiki::Plugin::Categoriser"
    67       unless UNIVERSAL::isa( $categoriser, "CGI::Wiki::Plugin::Categoriser" );
     66    croak "Categoriser parameter is not a Wiki::Toolkit::Plugin::Categoriser"
     67      unless UNIVERSAL::isa( $categoriser, "Wiki::Toolkit::Plugin::Categoriser" );
    6868    my $self = { _locator     => $locator,
    6969                 _categoriser => $categoriser };
  • branches/move-to-wiki-toolkit/lib/OpenGuides/Utils.pm

    r730 r763  
    66
    77use Carp qw( croak );
    8 use CGI::Wiki;
    9 use CGI::Wiki::Formatter::UseMod;
    10 use CGI::Wiki::Plugin::RSS::Reader;
     8use Wiki::Toolkit;
     9use Wiki::Toolkit::Formatter::UseMod;
     10use Wiki::Toolkit::Plugin::RSS::Reader;
    1111use URI::Escape;
    1212
     
    4040
    4141Croaks unless an C<OpenGuides::Config> object is supplied.  Returns a
    42 C<CGI::Wiki> object made from the given config file on success,
     42C<Wiki::Toolkit> object made from the given config file on success,
    4343croaks if any other error occurs.
    4444
     
    7878                        );
    7979
    80     my $cgi_wiki_module = "CGI::Wiki::Store::" . $cgi_wiki_exts{$dbtype};
     80    my $cgi_wiki_module = "Wiki::Toolkit::Store::" . $cgi_wiki_exts{$dbtype};
    8181    eval "require $cgi_wiki_module";
    8282    croak "Can't 'require' $cgi_wiki_module.\n" if $@;
     
    9696              || $config->use_plucene == 1 )
    9797       ) {
    98         require CGI::Wiki::Search::Plucene;
    99         $search = CGI::Wiki::Search::Plucene->new(
     98        require Wiki::Toolkit::Search::Plucene;
     99        $search = Wiki::Toolkit::Search::Plucene->new(
    100100                                       path => $config->indexing_directory,
    101101                                                 );
    102102    } else {
    103         require CGI::Wiki::Search::SII;
     103        require Wiki::Toolkit::Search::SII;
    104104        require Search::InvertedIndex::DB::DB_File_SplitHash;
    105105        my $indexdb = Search::InvertedIndex::DB::DB_File_SplitHash->new(
     
    107107            -lock_mode => "EX"
    108108        );
    109         $search = CGI::Wiki::Search::SII->new( indexdb => $indexdb );
     109        $search = Wiki::Toolkit::Search::SII->new( indexdb => $indexdb );
    110110    }
    111111
     
    119119        qr/\@INDEX_LINK\s+\[\[(Category|Locale)\s+([^\]|]+)\|?([^\]]+)?\]\]/ =>
    120120            sub {
    121                   # We may be being called by CGI::Wiki::Plugin::Diff,
     121                  # We may be being called by Wiki::Toolkit::Plugin::Diff,
    122122                  # which doesn't know it has to pass us $wiki - and
    123123                  # we don't use it anyway.
    124                   if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) {
     124                  if ( UNIVERSAL::isa( $_[0], "Wiki::Toolkit" ) ) {
    125125                      shift; # just throw it away
    126126                  }
     
    132132                   my ($wiki, $type, $value) = @_;
    133133
    134                    # We may be being called by CGI::Wiki::Plugin::Diff,
     134                   # We may be being called by Wiki::Toolkit::Plugin::Diff,
    135135                   # which doesn't know it has to pass us $wiki
    136                    unless ( UNIVERSAL::isa( $wiki, "CGI::Wiki" ) ) {
     136                   unless ( UNIVERSAL::isa( $wiki, "Wiki::Toolkit" ) ) {
    137137                       return "(unprocessed INDEX_LIST macro)";
    138138                   }
     
    159159                 },
    160160        qr/\@RSS\s+(.+)/ => sub {
    161                     # We may be being called by CGI::Wiki::Plugin::Diff,
     161                    # We may be being called by Wiki::Toolkit::Plugin::Diff,
    162162                    # which doesn't know it has to pass us $wiki - and
    163163                    # we don't use it anyway.
    164                     if ( UNIVERSAL::isa( $_[0], "CGI::Wiki" ) ) {
     164                    if ( UNIVERSAL::isa( $_[0], "Wiki::Toolkit" ) ) {
    165165                        shift; # just throw it away
    166166                    }
     
    174174                    }
    175175
    176                     my $rss = CGI::Wiki::Plugin::RSS::Reader->new(url => $url);
     176                    my $rss = Wiki::Toolkit::Plugin::RSS::Reader->new(url => $url);
    177177                    my @items = $rss->retrieve;
    178178
     
    196196    );
    197197
    198     my $formatter = CGI::Wiki::Formatter::UseMod->new(
     198    my $formatter = Wiki::Toolkit::Formatter::UseMod->new(
    199199        extended_links      => 1,
    200200        implicit_links      => 0,
     
    213213                 formatter => $formatter );
    214214
    215     my $wiki = CGI::Wiki->new( %conf );
     215    my $wiki = Wiki::Toolkit->new( %conf );
    216216    return $wiki;
    217217}
  • branches/move-to-wiki-toolkit/t/11_utils.t

    r594 r763  
    2727    );
    2828
    29     eval { require CGI::Wiki::Search::Plucene; };
     29    eval { require Wiki::Toolkit::Search::Plucene; };
    3030    if ( $@ ) { $config->use_plucene ( 0 ) };
    3131
     
    3535    is( $@, "",
    3636        "...but not with an OpenGuides::Config object with suitable data" );
    37     isa_ok( $wiki, "CGI::Wiki" );
     37    isa_ok( $wiki, "Wiki::Toolkit" );
    3838
    3939    ok( $wiki->store,      "...and store defined" );
  • branches/move-to-wiki-toolkit/t/12_macros.t

    r565 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides;
    44use OpenGuides::Test;
     
    1515    unlink "t/node.db";
    1616    unlink <t/indexes/*>;
    17     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     17    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1818
    1919    my $config = OpenGuides::Test->make_basic_config;
  • branches/move-to-wiki-toolkit/t/14_recent_changes_cookies.t

    r594 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides;
     
    5858      unless $have_sqlite;
    5959
    60     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     60    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    6161    my $config = OpenGuides::Config->new(
    6262           vars => {
     
    7171                   }
    7272    );
    73     eval { require CGI::Wiki::Search::Plucene; };
     73    eval { require Wiki::Toolkit::Search::Plucene; };
    7474    if ( $@ ) { $config->use_plucene ( 0 ) };
    7575   
  • branches/move-to-wiki-toolkit/t/15_template.t

    r607 r763  
    22use Cwd;
    33use CGI::Cookie;
    4 use CGI::Wiki::Formatter::UseMod;
     4use Wiki::Toolkit::Formatter::UseMod;
    55use OpenGuides::Config;
    66use OpenGuides::Template;
     
    1111       vars => {
    1212                 template_path         => cwd . '/t/templates',
    13                  site_name             => 'CGI::Wiki Test Site',
     13                 site_name             => 'Wiki::Toolkit Test Site',
    1414                 script_url            => 'http://wiki.example.com/',
    1515                 script_name           => 'mywiki.cgi',
     
    2929my $fake_wiki = Test::MockObject->new;
    3030$fake_wiki->mock("formatter",
    31                  sub { return CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ); } );
     31                 sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } );
    3232
    3333eval { OpenGuides::Template->output( wiki   => $fake_wiki,
     
    7575);
    7676
    77 like( $output, qr/SITE NAME: CGI::Wiki Test Site/, "site_name var set" );
     77like( $output, qr/SITE NAME: Wiki::Toolkit Test Site/, "site_name var set" );
    7878like( $output, qr/CGI URL: mywiki.cgi/, "cgi_url var set" );
    7979like( $output, qr/FULL CGI URL: http:\/\/wiki.example.com\/mywiki.cgi/,
     
    117117       vars => {
    118118                 template_path         => cwd . '/t/templates',
    119                  site_name             => 'CGI::Wiki Test Site',
     119                 site_name             => 'Wiki::Toolkit Test Site',
    120120                 script_url            => 'http://wiki.example.com/',
    121121                 script_name           => 'mywiki.cgi',
     
    136136       vars => {
    137137                 template_path         => cwd . '/t/templates',
    138                  site_name             => 'CGI::Wiki Test Site',
     138                 site_name             => 'Wiki::Toolkit Test Site',
    139139                 script_url            => 'http://wiki.example.com/',
    140140                 script_name           => '',
     
    154154       vars => {
    155155                 template_path         => cwd . '/t/templates',
    156                  site_name             => 'CGI::Wiki Test Site',
     156                 site_name             => 'Wiki::Toolkit Test Site',
    157157                 script_url            => 'http://wiki.example.com',
    158158                 script_name           => 'wiki.cgi',
  • branches/move-to-wiki-toolkit/t/16_test_tester.t

    r587 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides;
    44use OpenGuides::Test;
     
    2121unlink <t/indexes/*>;
    2222
    23 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     23Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2424my $config = OpenGuides::Test->make_basic_config;
    2525$config->site_name( "Test Site" );
  • branches/move-to-wiki-toolkit/t/21_rdf.t

    r745 r763  
    1 use CGI::Wiki::Setup::SQLite;
     1use Wiki::Toolkit::Setup::SQLite;
    22use OpenGuides;
    33use OpenGuides::Config;
     
    1515        unless $have_sqlite;
    1616
    17     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     17    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1818    my $config = OpenGuides::Config->new(
    1919        vars => {
     
    2323                    script_url         => "http://wiki.example.com/",
    2424                    script_name        => "mywiki.cgi",
    25                     site_name          => "CGI::Wiki Test Site",
     25                    site_name          => "Wiki::Toolkit Test Site",
    2626                    default_city       => "London",
    2727                    default_country    => "United Kingdom",
    2828                }
    2929    );
    30     eval { require CGI::Wiki::Search::Plucene; };
     30    eval { require Wiki::Toolkit::Search::Plucene; };
    3131    if ( $@ ) { $config->use_plucene ( 0 ) };
    3232
     
    8181
    8282    like( $rdfxml,
    83         qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|,
     83        qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|,
    8484        "sets the title correctly" );
    8585
  • branches/move-to-wiki-toolkit/t/22_rss_modwiki.t

    r753 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides;
     
    1313}
    1414
    15 eval { require CGI::Wiki::Search::Plucene; };
     15eval { require Wiki::Toolkit::Search::Plucene; };
    1616if ( $@ ) {
    1717    plan skip_all => "Plucene not installed";
     
    2525unlink <t/indexes/*>;
    2626
    27 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     27Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2828my $config = OpenGuides::Config->new(
    2929       vars => {
  • branches/move-to-wiki-toolkit/t/25_write_geo_data.t

    r587 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides;
     
    3636unlink <t/indexes/*>;
    3737
    38 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     38Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    3939my $config = OpenGuides::Config->new(
    4040       vars => {
  • branches/move-to-wiki-toolkit/t/26_geo_data_search_form.t

    r587 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides;
    44use OpenGuides::Test;
     
    4141unlink <t/indexes/*>;
    4242
    43 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     43Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    4444my $config = OpenGuides::Test->make_basic_config;
    4545$config->use_plucene( 1 );
  • branches/move-to-wiki-toolkit/t/27_geo_data_edit_form.t

    r587 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides;
    44use OpenGuides::Test;
     
    4242unlink <t/indexes/*>;
    4343
    44 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     44Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    4545my $config = OpenGuides::Test->make_basic_config;
    4646$config->use_plucene( 1 );
  • branches/move-to-wiki-toolkit/t/28_wgs84_coords.t

    r730 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides;
    44use OpenGuides::Test;
  • branches/move-to-wiki-toolkit/t/31_search.t

    r738 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Search;
    44use OpenGuides::Test;
     
    1515    unlink <t/indexes/*>;
    1616
    17     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     17    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1818    my $config = OpenGuides::Test->make_basic_config;
    1919    $config->script_name( "wiki.cgi" );
     
    2121
    2222    # Plucene is the recommended searcher now.
    23     eval { require CGI::Wiki::Search::Plucene; };
     23    eval { require Wiki::Toolkit::Search::Plucene; };
    2424    if ( $@ ) { $config->use_plucene( 0 ) };
    2525
  • branches/move-to-wiki-toolkit/t/32_search_simple_metadata.t

    r717 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides::Search;
     
    1616    unlink <t/indexes/*>;
    1717
    18     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     18    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1919    my $config = OpenGuides::Config->new(
    2020           vars => {
     
    3030
    3131    # Plucene is the recommended searcher now.
    32     eval { require CGI::Wiki::Search::Plucene; };
     32    eval { require Wiki::Toolkit::Search::Plucene; };
    3333    if ( $@ ) { $config->use_plucene( 0 ) };
    3434
  • branches/move-to-wiki-toolkit/t/33_search_advanced_search.t

    r717 r763  
    11use strict;
    2 use CGI::Wiki::Plugin::Locator::Grid; # use directly to help debug
    3 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Plugin::Locator::Grid; # use directly to help debug
     3use Wiki::Toolkit::Setup::SQLite;
    44use OpenGuides::Config;
    55use OpenGuides::Search;
     
    2727unlink "t/node.db";
    2828unlink <t/indexes/*>;
    29 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     29Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    3030
    3131my $config = OpenGuides::Config->new(
     
    7979# Sanity check.
    8080print "# Distances should be:\n";
    81 my $locator = CGI::Wiki::Plugin::Locator::Grid->new(x => "os_x", y => "os_y");
     81my $locator = Wiki::Toolkit::Plugin::Locator::Grid->new(x => "os_x", y => "os_y");
    8282my $wiki = $guide->wiki;
    8383$wiki->register_plugin( plugin => $locator );
  • branches/move-to-wiki-toolkit/t/33_search_advanced_search_utm.t

    r717 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides::Search;
     
    2626unlink "t/node.db";
    2727unlink <t/indexes/*>;
    28 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     28Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2929
    3030my $config = OpenGuides::Config->new(
  • branches/move-to-wiki-toolkit/t/34_search_paging.t

    r717 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides::Search;
     
    2121unlink "t/node.db";
    2222unlink <t/indexes/*>;
    23 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     23Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2424
    2525my $config = OpenGuides::Test->make_basic_config;
  • branches/move-to-wiki-toolkit/t/35_search_two_searches.t

    r717 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides::Search;
     
    3535unlink <t/indexes/*>;
    3636
    37 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     37Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    3838my $config = OpenGuides::Config->new(
    3939       vars => {
     
    5050
    5151# Plucene is the recommended searcher now.
    52 eval { require CGI::Wiki::Search::Plucene; };
     52eval { require Wiki::Toolkit::Search::Plucene; };
    5353if ( $@ ) { $config->use_plucene( 0 ) };
    5454
  • branches/move-to-wiki-toolkit/t/36_search_order.t

    r717 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides::Search;
     
    1111}
    1212
    13 eval { require CGI::Wiki::Search::Plucene; };
     13eval { require Wiki::Toolkit::Search::Plucene; };
    1414if ( $@ ) {
    1515    plan skip_all => "Plucene not installed";
     
    2323unlink <t/indexes/*>;
    2424
    25 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     25Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2626my $config = OpenGuides::Config->new(
    2727       vars => {
  • branches/move-to-wiki-toolkit/t/37_search_summaries.t

    r717 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides::Search;
     
    1515    unlink <t/indexes/*>;
    1616
    17     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     17    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1818    my $config = OpenGuides::Config->new(
    1919           vars => {
     
    2929
    3030    # Plucene is the recommended searcher now.
    31     eval { require CGI::Wiki::Search::Plucene; };
     31    eval { require Wiki::Toolkit::Search::Plucene; };
    3232    if ( $@ ) { $config->use_plucene( 0 ) };
    3333
  • branches/move-to-wiki-toolkit/t/38_search_params.t

    r717 r763  
    11use strict;
    22use CGI;
    3 use CGI::Wiki::Setup::SQLite;
     3use Wiki::Toolkit::Setup::SQLite;
    44use OpenGuides::Config;
    55use OpenGuides::Search;
     
    1212}
    1313
    14 eval { require CGI::Wiki::Search::Plucene; };
     14eval { require Wiki::Toolkit::Search::Plucene; };
    1515if ( $@ ) {
    1616    plan skip_all => "Plucene not installed";
     
    3737unlink <t/indexes/*>;
    3838
    39 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     39Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    4040my $config = OpenGuides::Config->new(
    4141       vars => {
  • branches/move-to-wiki-toolkit/t/39_search_form.t

    r717 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Search;
    44use OpenGuides::Test;
     
    4141unlink <t/indexes/*>;
    4242
    43 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     43Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    4444my $config = OpenGuides::Test->make_basic_config;
    4545$config->use_plucene( 1 );
  • branches/move-to-wiki-toolkit/t/41_deletion.t

    r587 r763  
    11use strict;
    2 use CGI::Wiki::Formatter::UseMod;
     2use Wiki::Toolkit::Formatter::UseMod;
    33use OpenGuides::Template;
    44use OpenGuides::Test;
     
    1616my $fake_wiki = Test::MockObject->new;
    1717$fake_wiki->mock("formatter",
    18                  sub { return CGI::Wiki::Formatter::UseMod->new( munge_urls => 1 ); } );
     18                 sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } );
    1919
    2020my $output = OpenGuides::Template->output(
  • branches/move-to-wiki-toolkit/t/51_display_node.t

    r739 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides;
     
    1212      unless $have_sqlite;
    1313
    14     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1515    my $config = OpenGuides::Config->new(
    1616           vars => {
     
    2525                   }
    2626    );
    27     eval { require CGI::Wiki::Search::Plucene; };
     27    eval { require Wiki::Toolkit::Search::Plucene; };
    2828    if ( $@ ) { $config->use_plucene ( 0 ) };
    2929
     
    3131    isa_ok( $guide, "OpenGuides" );
    3232    my $wiki = $guide->wiki;
    33     isa_ok( $wiki, "CGI::Wiki" );
     33    isa_ok( $wiki, "Wiki::Toolkit" );
    3434    $wiki->write_node( "Test Page", "foo", undef, { source => "alternate.cgi?Test_Page" } );
    3535    my $output = eval {
  • branches/move-to-wiki-toolkit/t/52_display_diffs.t

    r581 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides;
    44use OpenGuides::Test;
     
    1212      unless $have_sqlite;
    1313
    14     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1515    my $config = OpenGuides::Test->make_basic_config;
    1616    my $guide = OpenGuides->new( config => $config );
  • branches/move-to-wiki-toolkit/t/53_show_index.t

    r718 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides;
    44use OpenGuides::Test;
     
    1212      unless $have_sqlite;
    1313
    14     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1515    my $config = OpenGuides::Test->make_basic_config;
    1616    $config->script_name( "wiki.cgi" );
     
    1919    isa_ok( $guide, "OpenGuides" );
    2020    my $wiki = $guide->wiki;
    21     isa_ok( $wiki, "CGI::Wiki" );
     21    isa_ok( $wiki, "Wiki::Toolkit" );
    2222
    2323    # Clear out the database from any previous runs.
  • branches/move-to-wiki-toolkit/t/54_redirect.t

    r663 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use OpenGuides::Config;
    44use OpenGuides;
     
    1212      unless $have_sqlite;
    1313
    14     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1515    my $config = OpenGuides::Config->new(
    1616           vars => {
     
    2424                   }
    2525    );
    26     eval { require CGI::Wiki::Search::Plucene; };
     26    eval { require Wiki::Toolkit::Search::Plucene; };
    2727    if ( $@ ) { $config->use_plucene ( 0 ) };
    2828           
  • branches/move-to-wiki-toolkit/t/55_node_history.t

    r587 r763  
    1 use CGI::Wiki::Setup::SQLite;
     1use Wiki::Toolkit::Setup::SQLite;
    22use OpenGuides;
    33use OpenGuides::Test;
     
    1111      unless $have_sqlite;
    1212
    13     CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
    14     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     13    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1515    my $config = OpenGuides::Test->make_basic_config;
    1616    $config->script_name( "mywiki.cgi" );
  • branches/move-to-wiki-toolkit/t/56_diffs_with_macros.t

    r584 r763  
    11use strict;
    2 use CGI::Wiki::Setup::SQLite;
     2use Wiki::Toolkit::Setup::SQLite;
    33use File::Temp qw( tempfile );
    44use OpenGuides;
     
    1717unlink "t/node.db";
    1818unlink <t/indexes/*>;
    19 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     19Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2020
    2121my $config = OpenGuides::Test->make_basic_config;
  • branches/move-to-wiki-toolkit/t/61_bug_textareas.t

    r565 r763  
    1 use CGI::Wiki::Setup::SQLite;
     1use Wiki::Toolkit::Setup::SQLite;
    22use OpenGuides::Template;
    33use OpenGuides::Test;
     
    1212      unless $have_sqlite;
    1313
    14     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1515    my $config = OpenGuides::Test->make_basic_config;
    1616    my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
  • branches/move-to-wiki-toolkit/t/62_bug_trailing_whitespace.t

    r592 r763  
    1 use CGI::Wiki::Setup::SQLite;
     1use Wiki::Toolkit::Setup::SQLite;
    22use OpenGuides::Config;
    33use OpenGuides;
     
    1717unlink "t/node.db";
    1818unlink <t/indexes/*>;
    19 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     19Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2020
    2121my $config = OpenGuides::Test->make_basic_config;
  • branches/move-to-wiki-toolkit/t/63_bug_map_link_no_address.t

    r651 r763  
    1 use CGI::Wiki::Setup::SQLite;
     1use Wiki::Toolkit::Setup::SQLite;
    22use OpenGuides;
    33use OpenGuides::Test;
     
    1111      unless $have_sqlite;
    1212
    13     CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
    14     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     13    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1515    my $config = OpenGuides::Test->make_basic_config;
    1616    my $guide = OpenGuides->new( config => $config );
  • branches/move-to-wiki-toolkit/t/64_bug_node_history.t

    r594 r763  
    1 use CGI::Wiki::Setup::SQLite;
     1use Wiki::Toolkit::Setup::SQLite;
    22use OpenGuides::Config;
    33use Cwd;
     
    1212      unless $have_sqlite;
    1313
    14     CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
    15     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
     15    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1616    my $config = OpenGuides::Config->new(
    1717           vars => {
     
    2121                     script_url         => "http://wiki.example.com/",
    2222                     script_name        => "mywiki.cgi",
    23                      site_name          => "CGI::Wiki Test Site",
     23                     site_name          => "Wiki::Toolkit Test Site",
    2424                     template_path      => cwd . "/templates",
    2525                   }
    2626    );
    27     eval { require CGI::Wiki::Search::Plucene; };
     27    eval { require Wiki::Toolkit::Search::Plucene; };
    2828    if ( $@ ) { $config->use_plucene ( 0 ) };
    2929
  • branches/move-to-wiki-toolkit/t/65_bug_metadata_escape.t

    r594 r763  
    1 use CGI::Wiki::Setup::SQLite;
     1use Wiki::Toolkit::Setup::SQLite;
    22use OpenGuides::Config;
    33use Cwd;
     
    1111    plan tests => 1;
    1212
    13     CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
    14     CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     13    Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
     14    Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    1515    my $config = OpenGuides::Config->new(
    1616           vars => {
     
    2020                     script_url         => "http://wiki.example.com/",
    2121                     script_name        => "mywiki.cgi",
    22                      site_name          => "CGI::Wiki Test Site",
     22                     site_name          => "Wiki::Toolkit Test Site",
    2323                     template_path      => cwd . "/templates",
    2424                   }
    2525    );
    26     eval { require CGI::Wiki::Search::Plucene; };
     26    eval { require Wiki::Toolkit::Search::Plucene; };
    2727    if ( $@ ) { $config->use_plucene ( 0 ) };
    2828
  • branches/move-to-wiki-toolkit/t/66_bug_latlong_representation.t

    r594 r763  
    11use strict;
    22use CGI;
    3 use CGI::Wiki::Setup::SQLite;
     3use Wiki::Toolkit::Setup::SQLite;
    44use OpenGuides::Config;
    55use OpenGuides::CGI;
     
    2424unlink <t/indexes/*>;
    2525
    26 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     26Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2727my $config = OpenGuides::Config->new(
    2828       vars => {
     
    4141
    4242# Plucene is the recommended searcher now.
    43 eval { require CGI::Wiki::Search::Plucene; };
     43eval { require Wiki::Toolkit::Search::Plucene; };
    4444if ( $@ ) { $config->use_plucene( 0 ) };
    4545
  • branches/move-to-wiki-toolkit/t/67_bug_first_version.t

    r603 r763  
    1 use CGI::Wiki::Setup::SQLite;
     1use Wiki::Toolkit::Setup::SQLite;
    22use OpenGuides::Config;
    33use OpenGuides;
     
    1717unlink "t/node.db";
    1818unlink <t/indexes/*>;
    19 CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } );
     19Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
    2020
    2121my $config = OpenGuides::Test->make_basic_config;
  • branches/move-to-wiki-toolkit/wiki.cgi

    r753 r763  
    99use CGI qw/:standard/;
    1010use CGI::Carp qw(croak);
    11 use CGI::Wiki;
     11use Wiki::Toolkit;
    1212use Geography::NationalGrid;
    1313use Geography::NationalGrid::GB;
Note: See TracChangeset for help on using the changeset viewer.