[libcatalyst-modules-perl] 01/01: replace bundled Catalyst-Controller-FormBuilder with a dependency on libcatalyst-controller-formbuilder-perl

Damyan Ivanov dmn at moszumanska.debian.org
Wed May 14 20:32:47 UTC 2014


This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository libcatalyst-modules-perl.

commit aae793a90f999b816ab376fc14ec2dbce36db315
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed May 14 20:32:41 2014 +0000

    replace bundled Catalyst-Controller-FormBuilder with a dependency on libcatalyst-controller-formbuilder-perl
---
 bundle/05/Catalyst-Controller-FormBuilder          |   1 -
 debian/control                                     |   1 +
 debian/copyright                                   |   5 -
 sources/Catalyst-Controller-FormBuilder/Changes    |  22 -
 sources/Catalyst-Controller-FormBuilder/MANIFEST   |  39 -
 sources/Catalyst-Controller-FormBuilder/META.yml   |  33 -
 .../Catalyst-Controller-FormBuilder/Makefile.PL    |  22 -
 .../inc/Module/AutoInstall.pm                      | 820 ---------------------
 .../inc/Module/Install.pm                          | 466 ------------
 .../inc/Module/Install/AutoInstall.pm              |  74 --
 .../inc/Module/Install/Base.pm                     |  83 ---
 .../inc/Module/Install/Can.pm                      |  81 --
 .../inc/Module/Install/Fetch.pm                    |  93 ---
 .../inc/Module/Install/Include.pm                  |  34 -
 .../inc/Module/Install/Makefile.pm                 | 415 -----------
 .../inc/Module/Install/Metadata.pm                 | 715 ------------------
 .../inc/Module/Install/Win32.pm                    |  64 --
 .../inc/Module/Install/WriteAll.pm                 |  63 --
 .../lib/Catalyst/Controller/FormBuilder.pm         | 440 -----------
 .../lib/Catalyst/Controller/FormBuilder/Action.pm  | 143 ----
 .../Controller/FormBuilder/Action/HTML/Template.pm | 136 ----
 .../Controller/FormBuilder/Action/Mason.pm         |  16 -
 .../Catalyst/Controller/FormBuilder/Action/TT.pm   |  15 -
 .../Catalyst-Controller-FormBuilder/t/00-load.t    |   9 -
 .../Catalyst-Controller-FormBuilder/t/01-basic.t   |  22 -
 .../Catalyst-Controller-FormBuilder/t/02-edit.t    |  70 --
 .../t/03-attr_param.t                              |  21 -
 .../t/lib/TestApp.pm                               |  30 -
 .../t/lib/TestApp/Component/HTML/Template.pm       |  22 -
 .../t/lib/TestApp/Component/Mason.pm               |  17 -
 .../t/lib/TestApp/Component/Rendered.pm            |  12 -
 .../t/lib/TestApp/Component/TT.pm                  |  25 -
 .../t/lib/TestApp/Controller/Base.pm               |  41 --
 .../t/lib/TestApp/Controller/Books.pm              |  63 --
 .../t/root/forms/books/edit.fb                     |  26 -
 .../t/root/forms/books/edit2.fb                    |  15 -
 .../t/root/src/mason/books/basic.tt                |   7 -
 .../t/root/src/mason/books/edit.tt                 |  43 --
 .../t/root/src/tmpl/books/basic.tt                 |   6 -
 .../t/root/src/tmpl/books/edit.tt                  |  28 -
 .../t/root/src/tt2/books/basic.tt                  |   4 -
 .../t/root/src/tt2/books/edit.tt                   |  37 -
 42 files changed, 1 insertion(+), 4278 deletions(-)

diff --git a/bundle/05/Catalyst-Controller-FormBuilder b/bundle/05/Catalyst-Controller-FormBuilder
deleted file mode 120000
index 21c5250..0000000
--- a/bundle/05/Catalyst-Controller-FormBuilder
+++ /dev/null
@@ -1 +0,0 @@
-../../sources/Catalyst-Controller-FormBuilder
\ No newline at end of file
diff --git a/debian/control b/debian/control
index dbbb71b..17efa14 100644
--- a/debian/control
+++ b/debian/control
@@ -106,6 +106,7 @@ Depends: ${misc:Depends},
          libcatalyst-authentication-credential-authen-simple-perl,
          libcatalyst-authentication-store-dbix-class-perl,
          libcatalyst-component-instancepercontext-perl,
+         libcatalyst-controller-formbuilder-perl,
          libcatalyst-model-dbi-perl,
          libcatalyst-model-dbic-schema-perl,
          libcatalyst-plugin-authentication-perl,
diff --git a/debian/copyright b/debian/copyright
index 3ffc9f8..aaedda0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,11 +9,6 @@ Copyright: 2005-2006, Florian Ragwitz <rafl at debian.org>
  2010-2013, gregor herrmann <gregoa at debian.org>
 License: Artistic or GPL-1+
 
-Files: sources/Catalyst-Controller-FormBuilder
-Copyright: 2006, Juan Camacho <formbuilder at suspenda.com>
-X-Upstream-Maintainers: Matt S Trout <perl-stuff at trout.me.uk>
-License: Artistic or GPL-1+
-
 Files: sources/Catalyst-Controller-HTML-FormFu
 Copyright: 2013, Carl Franks <cfranks at cpan.org>
 X-Upstream-Maintainers: Carl Franks <cfranks at cpan.org>
diff --git a/sources/Catalyst-Controller-FormBuilder/Changes b/sources/Catalyst-Controller-FormBuilder/Changes
deleted file mode 100644
index b39ec93..0000000
--- a/sources/Catalyst-Controller-FormBuilder/Changes
+++ /dev/null
@@ -1,22 +0,0 @@
-0.06   26-01-11 10:38:00
-    Remove last reference to NEXT:: (caelum/agladish)
-
-0.05   08-05-09 15:12:26
-    Change from NEXT to MRO::Compat. Remove unneeded Class::Accessor::Fast
-    base classes (Chisel Wright)
-
-0.04
-    Memory Leak Fix - Matt S Trout
-
-0.03
-    Documentation: TT example used field.tag instead of field.field.
-    Documentation: clarify config should be in Controller not Application.
-    Documentation: modifying $form->field must happen before $form->validate.
-    Added source_type config option to define alternative source adapter class.
-    Instantiate CGI::FormBuilder::Source::File and call parse method directly.
-    Reset CGI::FormBuilder object after ACTION in case of $c->forward overwrites it.
-
-0.02   17-12-06 14:24:30
-    First working version
-    Add HTML::Template and Mason support
-    Rewrote Plugin::FormBuilder as Controller::FormBuilder base class
diff --git a/sources/Catalyst-Controller-FormBuilder/MANIFEST b/sources/Catalyst-Controller-FormBuilder/MANIFEST
deleted file mode 100644
index e494e53..0000000
--- a/sources/Catalyst-Controller-FormBuilder/MANIFEST
+++ /dev/null
@@ -1,39 +0,0 @@
-Changes
-inc/Module/AutoInstall.pm
-inc/Module/Install.pm
-inc/Module/Install/AutoInstall.pm
-inc/Module/Install/Base.pm
-inc/Module/Install/Can.pm
-inc/Module/Install/Fetch.pm
-inc/Module/Install/Include.pm
-inc/Module/Install/Makefile.pm
-inc/Module/Install/Metadata.pm
-inc/Module/Install/Win32.pm
-inc/Module/Install/WriteAll.pm
-lib/Catalyst/Controller/FormBuilder.pm
-lib/Catalyst/Controller/FormBuilder/Action.pm
-lib/Catalyst/Controller/FormBuilder/Action/HTML/Template.pm
-lib/Catalyst/Controller/FormBuilder/Action/Mason.pm
-lib/Catalyst/Controller/FormBuilder/Action/TT.pm
-Makefile.PL
-MANIFEST			This list of files
-META.yml
-t/00-load.t
-t/01-basic.t
-t/02-edit.t
-t/03-attr_param.t
-t/lib/TestApp.pm
-t/lib/TestApp/Component/HTML/Template.pm
-t/lib/TestApp/Component/Mason.pm
-t/lib/TestApp/Component/Rendered.pm
-t/lib/TestApp/Component/TT.pm
-t/lib/TestApp/Controller/Base.pm
-t/lib/TestApp/Controller/Books.pm
-t/root/forms/books/edit.fb
-t/root/forms/books/edit2.fb
-t/root/src/mason/books/basic.tt
-t/root/src/mason/books/edit.tt
-t/root/src/tmpl/books/basic.tt
-t/root/src/tmpl/books/edit.tt
-t/root/src/tt2/books/basic.tt
-t/root/src/tt2/books/edit.tt
diff --git a/sources/Catalyst-Controller-FormBuilder/META.yml b/sources/Catalyst-Controller-FormBuilder/META.yml
deleted file mode 100644
index 231cced..0000000
--- a/sources/Catalyst-Controller-FormBuilder/META.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-abstract: 'Catalyst FormBuilder Base Controller'
-author:
-  - 'Copyright (c) 2006 Juan Camacho <formbuilder at suspenda.com>. All Rights Reserved.'
-build_requires:
-  ExtUtils::MakeMaker: 6.42
-configure_requires:
-  ExtUtils::MakeMaker: 6.42
-distribution_type: module
-generated_by: 'Module::Install version 0.99'
-license: unknown
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
-name: Catalyst-Controller-FormBuilder
-no_index:
-  directory:
-    - inc
-    - t
-recommends:
-  Catalyst::View::TT: 0.23
-requires:
-  CGI::FormBuilder: 3.02
-  Catalyst::Runtime: 5.7
-  Class::Data::Inheritable: 0.04
-  Class::Inspector: 1.13
-  MRO::Compat: 0.09
-  Scalar::Util: 1.19
-  Test::WWW::Mechanize::Catalyst: 0.37
-  Tie::IxHash: 1.21
-resources:
-  repository: http://dev.catalyst.perl.org/repos/Catalyst/trunk/Catalyst-Controller-FormBuilder/
-version: 0.06
diff --git a/sources/Catalyst-Controller-FormBuilder/Makefile.PL b/sources/Catalyst-Controller-FormBuilder/Makefile.PL
deleted file mode 100644
index a790ca2..0000000
--- a/sources/Catalyst-Controller-FormBuilder/Makefile.PL
+++ /dev/null
@@ -1,22 +0,0 @@
-use inc::Module::Install 0.87;
-
-name 'Catalyst-Controller-FormBuilder';
-all_from 'lib/Catalyst/Controller/FormBuilder.pm';
-
-# Specific dependencies
-
-requires 'CGI::FormBuilder'               => '3.02';
-requires 'Catalyst::Runtime'              => '5.7';
-requires 'MRO::Compat'                    => '0.09';
-requires 'Test::WWW::Mechanize::Catalyst' => '0.37';
-requires 'Tie::IxHash'                    => '1.21';
-requires 'Class::Data::Inheritable'       => '0.04';
-requires 'Class::Inspector'               => '1.13';
-requires 'Scalar::Util'                   => '1.19';
-recommends 'Catalyst::View::TT'           => '0.23';
-
-auto_install;
-resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/trunk/Catalyst-Controller-FormBuilder/';
-
-WriteAll();
-
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/AutoInstall.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/AutoInstall.pm
deleted file mode 100644
index 60b90ea..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/AutoInstall.pm
+++ /dev/null
@@ -1,820 +0,0 @@
-#line 1
-package Module::AutoInstall;
-
-use strict;
-use Cwd                 ();
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION};
-BEGIN {
-	$VERSION = '1.03';
-}
-
-# special map on pre-defined feature sets
-my %FeatureMap = (
-    ''      => 'Core Features',    # XXX: deprecated
-    '-core' => 'Core Features',
-);
-
-# various lexical flags
-my ( @Missing, @Existing,  %DisabledTests, $UnderCPAN,     $HasCPANPLUS );
-my (
-    $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
-);
-my ( $PostambleActions, $PostambleUsed );
-
-# See if it's a testing or non-interactive session
-_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN ); 
-_init();
-
-sub _accept_default {
-    $AcceptDefault = shift;
-}
-
-sub missing_modules {
-    return @Missing;
-}
-
-sub do_install {
-    __PACKAGE__->install(
-        [
-            $Config
-            ? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
-            : ()
-        ],
-        @Missing,
-    );
-}
-
-# initialize various flags, and/or perform install
-sub _init {
-    foreach my $arg (
-        @ARGV,
-        split(
-            /[\s\t]+/,
-            $ENV{PERL_AUTOINSTALL} || $ENV{PERL_EXTUTILS_AUTOINSTALL} || ''
-        )
-      )
-    {
-        if ( $arg =~ /^--config=(.*)$/ ) {
-            $Config = [ split( ',', $1 ) ];
-        }
-        elsif ( $arg =~ /^--installdeps=(.*)$/ ) {
-            __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
-            exit 0;
-        }
-        elsif ( $arg =~ /^--default(?:deps)?$/ ) {
-            $AcceptDefault = 1;
-        }
-        elsif ( $arg =~ /^--check(?:deps)?$/ ) {
-            $CheckOnly = 1;
-        }
-        elsif ( $arg =~ /^--skip(?:deps)?$/ ) {
-            $SkipInstall = 1;
-        }
-        elsif ( $arg =~ /^--test(?:only)?$/ ) {
-            $TestOnly = 1;
-        }
-        elsif ( $arg =~ /^--all(?:deps)?$/ ) {
-            $AllDeps = 1;
-        }
-    }
-}
-
-# overrides MakeMaker's prompt() to automatically accept the default choice
-sub _prompt {
-    goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault;
-
-    my ( $prompt, $default ) = @_;
-    my $y = ( $default =~ /^[Yy]/ );
-
-    print $prompt, ' [', ( $y ? 'Y' : 'y' ), '/', ( $y ? 'n' : 'N' ), '] ';
-    print "$default\n";
-    return $default;
-}
-
-# the workhorse
-sub import {
-    my $class = shift;
-    my @args  = @_ or return;
-    my $core_all;
-
-    print "*** $class version " . $class->VERSION . "\n";
-    print "*** Checking for Perl dependencies...\n";
-
-    my $cwd = Cwd::cwd();
-
-    $Config = [];
-
-    my $maxlen = length(
-        (
-            sort   { length($b) <=> length($a) }
-              grep { /^[^\-]/ }
-              map  {
-                ref($_)
-                  ? ( ( ref($_) eq 'HASH' ) ? keys(%$_) : @{$_} )
-                  : ''
-              }
-              map { +{@args}->{$_} }
-              grep { /^[^\-]/ or /^-core$/i } keys %{ +{@args} }
-        )[0]
-    );
-
-    # We want to know if we're under CPAN early to avoid prompting, but
-    # if we aren't going to try and install anything anyway then skip the
-    # check entirely since we don't want to have to load (and configure)
-    # an old CPAN just for a cosmetic message
-
-    $UnderCPAN = _check_lock(1) unless $SkipInstall;
-
-    while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
-        my ( @required, @tests, @skiptests );
-        my $default  = 1;
-        my $conflict = 0;
-
-        if ( $feature =~ m/^-(\w+)$/ ) {
-            my $option = lc($1);
-
-            # check for a newer version of myself
-            _update_to( $modules, @_ ) and return if $option eq 'version';
-
-            # sets CPAN configuration options
-            $Config = $modules if $option eq 'config';
-
-            # promote every features to core status
-            $core_all = ( $modules =~ /^all$/i ) and next
-              if $option eq 'core';
-
-            next unless $option eq 'core';
-        }
-
-        print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n";
-
-        $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' );
-
-        unshift @$modules, -default => &{ shift(@$modules) }
-          if ( ref( $modules->[0] ) eq 'CODE' );    # XXX: bugward combatability
-
-        while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) {
-            if ( $mod =~ m/^-(\w+)$/ ) {
-                my $option = lc($1);
-
-                $default   = $arg    if ( $option eq 'default' );
-                $conflict  = $arg    if ( $option eq 'conflict' );
-                @tests     = @{$arg} if ( $option eq 'tests' );
-                @skiptests = @{$arg} if ( $option eq 'skiptests' );
-
-                next;
-            }
-
-            printf( "- %-${maxlen}s ...", $mod );
-
-            if ( $arg and $arg =~ /^\D/ ) {
-                unshift @$modules, $arg;
-                $arg = 0;
-            }
-
-            # XXX: check for conflicts and uninstalls(!) them.
-            my $cur = _load($mod);
-            if (_version_cmp ($cur, $arg) >= 0)
-            {
-                print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
-                push @Existing, $mod => $arg;
-                $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
-            }
-            else {
-                if (not defined $cur)   # indeed missing
-                {
-                    print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
-                }
-                else
-                {
-                    # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
-                    print "too old. ($cur < $arg)\n";
-                }
-
-                push @required, $mod => $arg;
-            }
-        }
-
-        next unless @required;
-
-        my $mandatory = ( $feature eq '-core' or $core_all );
-
-        if (
-            !$SkipInstall
-            and (
-                $CheckOnly
-                or ($mandatory and $UnderCPAN)
-                or $AllDeps
-                or _prompt(
-                    qq{==> Auto-install the }
-                      . ( @required / 2 )
-                      . ( $mandatory ? ' mandatory' : ' optional' )
-                      . qq{ module(s) from CPAN?},
-                    $default ? 'y' : 'n',
-                ) =~ /^[Yy]/
-            )
-          )
-        {
-            push( @Missing, @required );
-            $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
-        }
-
-        elsif ( !$SkipInstall
-            and $default
-            and $mandatory
-            and
-            _prompt( qq{==> The module(s) are mandatory! Really skip?}, 'n', )
-            =~ /^[Nn]/ )
-        {
-            push( @Missing, @required );
-            $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
-        }
-
-        else {
-            $DisabledTests{$_} = 1 for map { glob($_) } @tests;
-        }
-    }
-
-    if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
-        require Config;
-        print
-"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n";
-
-        # make an educated guess of whether we'll need root permission.
-        print "    (You may need to do that as the 'root' user.)\n"
-          if eval '$>';
-    }
-    print "*** $class configuration finished.\n";
-
-    chdir $cwd;
-
-    # import to main::
-    no strict 'refs';
-    *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
-
-    return (@Existing, @Missing);
-}
-
-sub _running_under {
-    my $thing = shift;
-    print <<"END_MESSAGE";
-*** Since we're running under ${thing}, I'll just let it take care
-    of the dependency's installation later.
-END_MESSAGE
-    return 1;
-}
-
-# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
-# if we are, then we simply let it taking care of our dependencies
-sub _check_lock {
-    return unless @Missing or @_;
-
-    my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
-
-    if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
-        return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS');
-    }
-
-    require CPAN;
-
-    if ($CPAN::VERSION > '1.89') {
-        if ($cpan_env) {
-            return _running_under('CPAN');
-        }
-        return; # CPAN.pm new enough, don't need to check further
-    }
-
-    # last ditch attempt, this -will- configure CPAN, very sorry
-
-    _load_cpan(1); # force initialize even though it's already loaded
-
-    # Find the CPAN lock-file
-    my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
-    return unless -f $lock;
-
-    # Check the lock
-    local *LOCK;
-    return unless open(LOCK, $lock);
-
-    if (
-            ( $^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid() )
-        and ( $CPAN::Config->{prerequisites_policy} || '' ) ne 'ignore'
-    ) {
-        print <<'END_MESSAGE';
-
-*** Since we're running under CPAN, I'll just let it take care
-    of the dependency's installation later.
-END_MESSAGE
-        return 1;
-    }
-
-    close LOCK;
-    return;
-}
-
-sub install {
-    my $class = shift;
-
-    my $i;    # used below to strip leading '-' from config keys
-    my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } );
-
-    my ( @modules, @installed );
-    while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
-
-        # grep out those already installed
-        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
-            push @installed, $pkg;
-        }
-        else {
-            push @modules, $pkg, $ver;
-        }
-    }
-
-    return @installed unless @modules;  # nothing to do
-    return @installed if _check_lock(); # defer to the CPAN shell
-
-    print "*** Installing dependencies...\n";
-
-    return unless _connected_to('cpan.org');
-
-    my %args = @config;
-    my %failed;
-    local *FAILED;
-    if ( $args{do_once} and open( FAILED, '.#autoinstall.failed' ) ) {
-        while (<FAILED>) { chomp; $failed{$_}++ }
-        close FAILED;
-
-        my @newmod;
-        while ( my ( $k, $v ) = splice( @modules, 0, 2 ) ) {
-            push @newmod, ( $k => $v ) unless $failed{$k};
-        }
-        @modules = @newmod;
-    }
-
-    if ( _has_cpanplus() and not $ENV{PERL_AUTOINSTALL_PREFER_CPAN} ) {
-        _install_cpanplus( \@modules, \@config );
-    } else {
-        _install_cpan( \@modules, \@config );
-    }
-
-    print "*** $class installation finished.\n";
-
-    # see if we have successfully installed them
-    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
-        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
-            push @installed, $pkg;
-        }
-        elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
-            print FAILED "$pkg\n";
-        }
-    }
-
-    close FAILED if $args{do_once};
-
-    return @installed;
-}
-
-sub _install_cpanplus {
-    my @modules   = @{ +shift };
-    my @config    = _cpanplus_config( @{ +shift } );
-    my $installed = 0;
-
-    require CPANPLUS::Backend;
-    my $cp   = CPANPLUS::Backend->new;
-    my $conf = $cp->configure_object;
-
-    return unless $conf->can('conf') # 0.05x+ with "sudo" support
-               or _can_write($conf->_get_build('base'));  # 0.04x
-
-    # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
-    my $makeflags = $conf->get_conf('makeflags') || '';
-    if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) {
-        # 0.03+ uses a hashref here
-        $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST};
-
-    } else {
-        # 0.02 and below uses a scalar
-        $makeflags = join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
-          if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
-
-    }
-    $conf->set_conf( makeflags => $makeflags );
-    $conf->set_conf( prereqs   => 1 );
-
-    
-
-    while ( my ( $key, $val ) = splice( @config, 0, 2 ) ) {
-        $conf->set_conf( $key, $val );
-    }
-
-    my $modtree = $cp->module_tree;
-    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
-        print "*** Installing $pkg...\n";
-
-        MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
-
-        my $success;
-        my $obj = $modtree->{$pkg};
-
-        if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
-            my $pathname = $pkg;
-            $pathname =~ s/::/\\W/;
-
-            foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
-                delete $INC{$inc};
-            }
-
-            my $rv = $cp->install( modules => [ $obj->{module} ] );
-
-            if ( $rv and ( $rv->{ $obj->{module} } or $rv->{ok} ) ) {
-                print "*** $pkg successfully installed.\n";
-                $success = 1;
-            } else {
-                print "*** $pkg installation cancelled.\n";
-                $success = 0;
-            }
-
-            $installed += $success;
-        } else {
-            print << ".";
-*** Could not find a version $ver or above for $pkg; skipping.
-.
-        }
-
-        MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
-    }
-
-    return $installed;
-}
-
-sub _cpanplus_config {
-	my @config = ();
-	while ( @_ ) {
-		my ($key, $value) = (shift(), shift());
-		if ( $key eq 'prerequisites_policy' ) {
-			if ( $value eq 'follow' ) {
-				$value = CPANPLUS::Internals::Constants::PREREQ_INSTALL();
-			} elsif ( $value eq 'ask' ) {
-				$value = CPANPLUS::Internals::Constants::PREREQ_ASK();
-			} elsif ( $value eq 'ignore' ) {
-				$value = CPANPLUS::Internals::Constants::PREREQ_IGNORE();
-			} else {
-				die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n";
-			}
-		} else {
-			die "*** Cannot convert option $key to CPANPLUS version.\n";
-		}
-	}
-	return @config;
-}
-
-sub _install_cpan {
-    my @modules   = @{ +shift };
-    my @config    = @{ +shift };
-    my $installed = 0;
-    my %args;
-
-    _load_cpan();
-    require Config;
-
-    if (CPAN->VERSION < 1.80) {
-        # no "sudo" support, probe for writableness
-        return unless _can_write( MM->catfile( $CPAN::Config->{cpan_home}, 'sources' ) )
-                  and _can_write( $Config::Config{sitelib} );
-    }
-
-    # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
-    my $makeflags = $CPAN::Config->{make_install_arg} || '';
-    $CPAN::Config->{make_install_arg} =
-      join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
-      if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
-
-    # don't show start-up info
-    $CPAN::Config->{inhibit_startup_message} = 1;
-
-    # set additional options
-    while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
-        ( $args{$opt} = $arg, next )
-          if $opt =~ /^force$/;    # pseudo-option
-        $CPAN::Config->{$opt} = $arg;
-    }
-
-    local $CPAN::Config->{prerequisites_policy} = 'follow';
-
-    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
-        MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
-
-        print "*** Installing $pkg...\n";
-
-        my $obj     = CPAN::Shell->expand( Module => $pkg );
-        my $success = 0;
-
-        if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
-            my $pathname = $pkg;
-            $pathname =~ s/::/\\W/;
-
-            foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
-                delete $INC{$inc};
-            }
-
-            my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
-                                  : CPAN::Shell->install($pkg);
-            $rv ||= eval {
-                $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
-                  ->{install}
-                  if $CPAN::META;
-            };
-
-            if ( $rv eq 'YES' ) {
-                print "*** $pkg successfully installed.\n";
-                $success = 1;
-            }
-            else {
-                print "*** $pkg installation failed.\n";
-                $success = 0;
-            }
-
-            $installed += $success;
-        }
-        else {
-            print << ".";
-*** Could not find a version $ver or above for $pkg; skipping.
-.
-        }
-
-        MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
-    }
-
-    return $installed;
-}
-
-sub _has_cpanplus {
-    return (
-        $HasCPANPLUS = (
-            $INC{'CPANPLUS/Config.pm'}
-              or _load('CPANPLUS::Shell::Default')
-        )
-    );
-}
-
-# make guesses on whether we're under the CPAN installation directory
-sub _under_cpan {
-    require Cwd;
-    require File::Spec;
-
-    my $cwd  = File::Spec->canonpath( Cwd::cwd() );
-    my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} );
-
-    return ( index( $cwd, $cpan ) > -1 );
-}
-
-sub _update_to {
-    my $class = __PACKAGE__;
-    my $ver   = shift;
-
-    return
-      if _version_cmp( _load($class), $ver ) >= 0;  # no need to upgrade
-
-    if (
-        _prompt( "==> A newer version of $class ($ver) is required. Install?",
-            'y' ) =~ /^[Nn]/
-      )
-    {
-        die "*** Please install $class $ver manually.\n";
-    }
-
-    print << ".";
-*** Trying to fetch it from CPAN...
-.
-
-    # install ourselves
-    _load($class) and return $class->import(@_)
-      if $class->install( [], $class, $ver );
-
-    print << '.'; exit 1;
-
-*** Cannot bootstrap myself. :-( Installation terminated.
-.
-}
-
-# check if we're connected to some host, using inet_aton
-sub _connected_to {
-    my $site = shift;
-
-    return (
-        ( _load('Socket') and Socket::inet_aton($site) ) or _prompt(
-            qq(
-*** Your host cannot resolve the domain name '$site', which
-    probably means the Internet connections are unavailable.
-==> Should we try to install the required module(s) anyway?), 'n'
-          ) =~ /^[Yy]/
-    );
-}
-
-# check if a directory is writable; may create it on demand
-sub _can_write {
-    my $path = shift;
-    mkdir( $path, 0755 ) unless -e $path;
-
-    return 1 if -w $path;
-
-    print << ".";
-*** You are not allowed to write to the directory '$path';
-    the installation may fail due to insufficient permissions.
-.
-
-    if (
-        eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt(
-            qq(
-==> Should we try to re-execute the autoinstall process with 'sudo'?),
-            ((-t STDIN) ? 'y' : 'n')
-        ) =~ /^[Yy]/
-      )
-    {
-
-        # try to bootstrap ourselves from sudo
-        print << ".";
-*** Trying to re-execute the autoinstall process with 'sudo'...
-.
-        my $missing = join( ',', @Missing );
-        my $config = join( ',',
-            UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
-          if $Config;
-
-        return
-          unless system( 'sudo', $^X, $0, "--config=$config",
-            "--installdeps=$missing" );
-
-        print << ".";
-*** The 'sudo' command exited with error!  Resuming...
-.
-    }
-
-    return _prompt(
-        qq(
-==> Should we try to install the required module(s) anyway?), 'n'
-    ) =~ /^[Yy]/;
-}
-
-# load a module and return the version it reports
-sub _load {
-    my $mod  = pop;    # class/instance doesn't matter
-    my $file = $mod;
-
-    $file =~ s|::|/|g;
-    $file .= '.pm';
-
-    local $@;
-    return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
-}
-
-# Load CPAN.pm and it's configuration
-sub _load_cpan {
-    return if $CPAN::VERSION and $CPAN::Config and not @_;
-    require CPAN;
-
-    # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to
-    #    CPAN::HandleConfig->load. CPAN reports that the redirection
-    #    is deprecated in a warning printed at the user.
-
-    # CPAN-1.81 expects CPAN::HandleConfig->load, does not have
-    #   $CPAN::HandleConfig::VERSION but cannot handle
-    #   CPAN::Config->load
-
-    # Which "versions expect CPAN::Config->load?
-
-    if ( $CPAN::HandleConfig::VERSION
-        || CPAN::HandleConfig->can('load')
-    ) {
-        # Newer versions of CPAN have a HandleConfig module
-        CPAN::HandleConfig->load;
-    } else {
-    	# Older versions had the load method in Config directly
-        CPAN::Config->load;
-    }
-}
-
-# compare two versions, either use Sort::Versions or plain comparison
-# return values same as <=>
-sub _version_cmp {
-    my ( $cur, $min ) = @_;
-    return -1 unless defined $cur;  # if 0 keep comparing
-    return 1 unless $min;
-
-    $cur =~ s/\s+$//;
-
-    # check for version numbers that are not in decimal format
-    if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
-        if ( ( $version::VERSION or defined( _load('version') )) and
-             version->can('new') 
-            ) {
-
-            # use version.pm if it is installed.
-            return version->new($cur) <=> version->new($min);
-        }
-        elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) )
-        {
-
-            # use Sort::Versions as the sorting algorithm for a.b.c versions
-            return Sort::Versions::versioncmp( $cur, $min );
-        }
-
-        warn "Cannot reliably compare non-decimal formatted versions.\n"
-          . "Please install version.pm or Sort::Versions.\n";
-    }
-
-    # plain comparison
-    local $^W = 0;    # shuts off 'not numeric' bugs
-    return $cur <=> $min;
-}
-
-# nothing; this usage is deprecated.
-sub main::PREREQ_PM { return {}; }
-
-sub _make_args {
-    my %args = @_;
-
-    $args{PREREQ_PM} = { %{ $args{PREREQ_PM} || {} }, @Existing, @Missing }
-      if $UnderCPAN or $TestOnly;
-
-    if ( $args{EXE_FILES} and -e 'MANIFEST' ) {
-        require ExtUtils::Manifest;
-        my $manifest = ExtUtils::Manifest::maniread('MANIFEST');
-
-        $args{EXE_FILES} =
-          [ grep { exists $manifest->{$_} } @{ $args{EXE_FILES} } ];
-    }
-
-    $args{test}{TESTS} ||= 't/*.t';
-    $args{test}{TESTS} = join( ' ',
-        grep { !exists( $DisabledTests{$_} ) }
-          map { glob($_) } split( /\s+/, $args{test}{TESTS} ) );
-
-    my $missing = join( ',', @Missing );
-    my $config =
-      join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
-      if $Config;
-
-    $PostambleActions = (
-        ($missing and not $UnderCPAN)
-        ? "\$(PERL) $0 --config=$config --installdeps=$missing"
-        : "\$(NOECHO) \$(NOOP)"
-    );
-
-    return %args;
-}
-
-# a wrapper to ExtUtils::MakeMaker::WriteMakefile
-sub Write {
-    require Carp;
-    Carp::croak "WriteMakefile: Need even number of args" if @_ % 2;
-
-    if ($CheckOnly) {
-        print << ".";
-*** Makefile not written in check-only mode.
-.
-        return;
-    }
-
-    my %args = _make_args(@_);
-
-    no strict 'refs';
-
-    $PostambleUsed = 0;
-    local *MY::postamble = \&postamble unless defined &MY::postamble;
-    ExtUtils::MakeMaker::WriteMakefile(%args);
-
-    print << "." unless $PostambleUsed;
-*** WARNING: Makefile written with customized MY::postamble() without
-    including contents from Module::AutoInstall::postamble() --
-    auto installation features disabled.  Please contact the author.
-.
-
-    return 1;
-}
-
-sub postamble {
-    $PostambleUsed = 1;
-
-    return <<"END_MAKE";
-
-config :: installdeps
-\t\$(NOECHO) \$(NOOP)
-
-checkdeps ::
-\t\$(PERL) $0 --checkdeps
-
-installdeps ::
-\t$PostambleActions
-
-END_MAKE
-
-}
-
-1;
-
-__END__
-
-#line 1071
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install.pm
deleted file mode 100644
index af32a30..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install.pm
+++ /dev/null
@@ -1,466 +0,0 @@
-#line 1
-package Module::Install;
-
-# For any maintainers:
-# The load order for Module::Install is a bit magic.
-# It goes something like this...
-#
-# IF ( host has Module::Install installed, creating author mode ) {
-#     1. Makefile.PL calls "use inc::Module::Install"
-#     2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
-#     3. The installed version of inc::Module::Install loads
-#     4. inc::Module::Install calls "require Module::Install"
-#     5. The ./inc/ version of Module::Install loads
-# } ELSE {
-#     1. Makefile.PL calls "use inc::Module::Install"
-#     2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
-#     3. The ./inc/ version of Module::Install loads
-# }
-
-use 5.005;
-use strict 'vars';
-use Cwd        ();
-use File::Find ();
-use File::Path ();
-
-use vars qw{$VERSION $MAIN};
-BEGIN {
-	# All Module::Install core packages now require synchronised versions.
-	# This will be used to ensure we don't accidentally load old or
-	# different versions of modules.
-	# This is not enforced yet, but will be some time in the next few
-	# releases once we can make sure it won't clash with custom
-	# Module::Install extensions.
-	$VERSION = '0.99';
-
-	# Storage for the pseudo-singleton
-	$MAIN    = undef;
-
-	*inc::Module::Install::VERSION = *VERSION;
-	@inc::Module::Install::ISA     = __PACKAGE__;
-
-}
-
-sub import {
-	my $class = shift;
-	my $self  = $class->new(@_);
-	my $who   = $self->_caller;
-
-	#-------------------------------------------------------------
-	# all of the following checks should be included in import(),
-	# to allow "eval 'require Module::Install; 1' to test
-	# installation of Module::Install. (RT #51267)
-	#-------------------------------------------------------------
-
-	# Whether or not inc::Module::Install is actually loaded, the
-	# $INC{inc/Module/Install.pm} is what will still get set as long as
-	# the caller loaded module this in the documented manner.
-	# If not set, the caller may NOT have loaded the bundled version, and thus
-	# they may not have a MI version that works with the Makefile.PL. This would
-	# result in false errors or unexpected behaviour. And we don't want that.
-	my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
-	unless ( $INC{$file} ) { die <<"END_DIE" }
-
-Please invoke ${\__PACKAGE__} with:
-
-	use inc::${\__PACKAGE__};
-
-not:
-
-	use ${\__PACKAGE__};
-
-END_DIE
-
-	# This reportedly fixes a rare Win32 UTC file time issue, but
-	# as this is a non-cross-platform XS module not in the core,
-	# we shouldn't really depend on it. See RT #24194 for detail.
-	# (Also, this module only supports Perl 5.6 and above).
-	eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006;
-
-	# If the script that is loading Module::Install is from the future,
-	# then make will detect this and cause it to re-run over and over
-	# again. This is bad. Rather than taking action to touch it (which
-	# is unreliable on some platforms and requires write permissions)
-	# for now we should catch this and refuse to run.
-	if ( -f $0 ) {
-		my $s = (stat($0))[9];
-
-		# If the modification time is only slightly in the future,
-		# sleep briefly to remove the problem.
-		my $a = $s - time;
-		if ( $a > 0 and $a < 5 ) { sleep 5 }
-
-		# Too far in the future, throw an error.
-		my $t = time;
-		if ( $s > $t ) { die <<"END_DIE" }
-
-Your installer $0 has a modification time in the future ($s > $t).
-
-This is known to create infinite loops in make.
-
-Please correct this, then run $0 again.
-
-END_DIE
-	}
-
-
-	# Build.PL was formerly supported, but no longer is due to excessive
-	# difficulty in implementing every single feature twice.
-	if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
-
-Module::Install no longer supports Build.PL.
-
-It was impossible to maintain duel backends, and has been deprecated.
-
-Please remove all Build.PL files and only use the Makefile.PL installer.
-
-END_DIE
-
-	#-------------------------------------------------------------
-
-	# To save some more typing in Module::Install installers, every...
-	# use inc::Module::Install
-	# ...also acts as an implicit use strict.
-	$^H |= strict::bits(qw(refs subs vars));
-
-	#-------------------------------------------------------------
-
-	unless ( -f $self->{file} ) {
-		foreach my $key (keys %INC) {
-			delete $INC{$key} if $key =~ /Module\/Install/;
-		}
-
-		local $^W;
-		require "$self->{path}/$self->{dispatch}.pm";
-		File::Path::mkpath("$self->{prefix}/$self->{author}");
-		$self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
-		$self->{admin}->init;
-		@_ = ($class, _self => $self);
-		goto &{"$self->{name}::import"};
-	}
-
-	local $^W;
-	*{"${who}::AUTOLOAD"} = $self->autoload;
-	$self->preload;
-
-	# Unregister loader and worker packages so subdirs can use them again
-	delete $INC{'inc/Module/Install.pm'};
-	delete $INC{'Module/Install.pm'};
-
-	# Save to the singleton
-	$MAIN = $self;
-
-	return 1;
-}
-
-sub autoload {
-	my $self = shift;
-	my $who  = $self->_caller;
-	my $cwd  = Cwd::cwd();
-	my $sym  = "${who}::AUTOLOAD";
-	$sym->{$cwd} = sub {
-		my $pwd = Cwd::cwd();
-		if ( my $code = $sym->{$pwd} ) {
-			# Delegate back to parent dirs
-			goto &$code unless $cwd eq $pwd;
-		}
-		unless ($$sym =~ s/([^:]+)$//) {
-			# XXX: it looks like we can't retrieve the missing function
-			# via $$sym (usually $main::AUTOLOAD) in this case.
-			# I'm still wondering if we should slurp Makefile.PL to
-			# get some context or not ...
-			my ($package, $file, $line) = caller;
-			die <<"EOT";
-Unknown function is found at $file line $line.
-Execution of $file aborted due to runtime errors.
-
-If you're a contributor to a project, you may need to install
-some Module::Install extensions from CPAN (or other repository).
-If you're a user of a module, please contact the author.
-EOT
-		}
-		my $method = $1;
-		if ( uc($method) eq $method ) {
-			# Do nothing
-			return;
-		} elsif ( $method =~ /^_/ and $self->can($method) ) {
-			# Dispatch to the root M:I class
-			return $self->$method(@_);
-		}
-
-		# Dispatch to the appropriate plugin
-		unshift @_, ( $self, $1 );
-		goto &{$self->can('call')};
-	};
-}
-
-sub preload {
-	my $self = shift;
-	unless ( $self->{extensions} ) {
-		$self->load_extensions(
-			"$self->{prefix}/$self->{path}", $self
-		);
-	}
-
-	my @exts = @{$self->{extensions}};
-	unless ( @exts ) {
-		@exts = $self->{admin}->load_all_extensions;
-	}
-
-	my %seen;
-	foreach my $obj ( @exts ) {
-		while (my ($method, $glob) = each %{ref($obj) . '::'}) {
-			next unless $obj->can($method);
-			next if $method =~ /^_/;
-			next if $method eq uc($method);
-			$seen{$method}++;
-		}
-	}
-
-	my $who = $self->_caller;
-	foreach my $name ( sort keys %seen ) {
-		local $^W;
-		*{"${who}::$name"} = sub {
-			${"${who}::AUTOLOAD"} = "${who}::$name";
-			goto &{"${who}::AUTOLOAD"};
-		};
-	}
-}
-
-sub new {
-	my ($class, %args) = @_;
-
-    delete $INC{'FindBin.pm'};
-    require FindBin;
-
-	# ignore the prefix on extension modules built from top level.
-	my $base_path = Cwd::abs_path($FindBin::Bin);
-	unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
-		delete $args{prefix};
-	}
-	return $args{_self} if $args{_self};
-
-	$args{dispatch} ||= 'Admin';
-	$args{prefix}   ||= 'inc';
-	$args{author}   ||= ($^O eq 'VMS' ? '_author' : '.author');
-	$args{bundle}   ||= 'inc/BUNDLES';
-	$args{base}     ||= $base_path;
-	$class =~ s/^\Q$args{prefix}\E:://;
-	$args{name}     ||= $class;
-	$args{version}  ||= $class->VERSION;
-	unless ( $args{path} ) {
-		$args{path}  = $args{name};
-		$args{path}  =~ s!::!/!g;
-	}
-	$args{file}     ||= "$args{base}/$args{prefix}/$args{path}.pm";
-	$args{wrote}      = 0;
-
-	bless( \%args, $class );
-}
-
-sub call {
-	my ($self, $method) = @_;
-	my $obj = $self->load($method) or return;
-        splice(@_, 0, 2, $obj);
-	goto &{$obj->can($method)};
-}
-
-sub load {
-	my ($self, $method) = @_;
-
-	$self->load_extensions(
-		"$self->{prefix}/$self->{path}", $self
-	) unless $self->{extensions};
-
-	foreach my $obj (@{$self->{extensions}}) {
-		return $obj if $obj->can($method);
-	}
-
-	my $admin = $self->{admin} or die <<"END_DIE";
-The '$method' method does not exist in the '$self->{prefix}' path!
-Please remove the '$self->{prefix}' directory and run $0 again to load it.
-END_DIE
-
-	my $obj = $admin->load($method, 1);
-	push @{$self->{extensions}}, $obj;
-
-	$obj;
-}
-
-sub load_extensions {
-	my ($self, $path, $top) = @_;
-
-	my $should_reload = 0;
-	unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
-		unshift @INC, $self->{prefix};
-		$should_reload = 1;
-	}
-
-	foreach my $rv ( $self->find_extensions($path) ) {
-		my ($file, $pkg) = @{$rv};
-		next if $self->{pathnames}{$pkg};
-
-		local $@;
-		my $new = eval { local $^W; require $file; $pkg->can('new') };
-		unless ( $new ) {
-			warn $@ if $@;
-			next;
-		}
-		$self->{pathnames}{$pkg} =
-			$should_reload ? delete $INC{$file} : $INC{$file};
-		push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
-	}
-
-	$self->{extensions} ||= [];
-}
-
-sub find_extensions {
-	my ($self, $path) = @_;
-
-	my @found;
-	File::Find::find( sub {
-		my $file = $File::Find::name;
-		return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
-		my $subpath = $1;
-		return if lc($subpath) eq lc($self->{dispatch});
-
-		$file = "$self->{path}/$subpath.pm";
-		my $pkg = "$self->{name}::$subpath";
-		$pkg =~ s!/!::!g;
-
-		# If we have a mixed-case package name, assume case has been preserved
-		# correctly.  Otherwise, root through the file to locate the case-preserved
-		# version of the package name.
-		if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
-			my $content = Module::Install::_read($subpath . '.pm');
-			my $in_pod  = 0;
-			foreach ( split //, $content ) {
-				$in_pod = 1 if /^=\w/;
-				$in_pod = 0 if /^=cut/;
-				next if ($in_pod || /^=cut/);  # skip pod text
-				next if /^\s*#/;               # and comments
-				if ( m/^\s*package\s+($pkg)\s*;/i ) {
-					$pkg = $1;
-					last;
-				}
-			}
-		}
-
-		push @found, [ $file, $pkg ];
-	}, $path ) if -d $path;
-
-	@found;
-}
-
-
-
-
-
-#####################################################################
-# Common Utility Functions
-
-sub _caller {
-	my $depth = 0;
-	my $call  = caller($depth);
-	while ( $call eq __PACKAGE__ ) {
-		$depth++;
-		$call = caller($depth);
-	}
-	return $call;
-}
-
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
-sub _read {
-	local *FH;
-	open( FH, '<', $_[0] ) or die "open($_[0]): $!";
-	my $string = do { local $/; <FH> };
-	close FH or die "close($_[0]): $!";
-	return $string;
-}
-END_NEW
-sub _read {
-	local *FH;
-	open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
-	my $string = do { local $/; <FH> };
-	close FH or die "close($_[0]): $!";
-	return $string;
-}
-END_OLD
-
-sub _readperl {
-	my $string = Module::Install::_read($_[0]);
-	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
-	$string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s;
-	$string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg;
-	return $string;
-}
-
-sub _readpod {
-	my $string = Module::Install::_read($_[0]);
-	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
-	return $string if $_[0] =~ /\.pod\z/;
-	$string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg;
-	$string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg;
-	$string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg;
-	$string =~ s/^\n+//s;
-	return $string;
-}
-
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
-sub _write {
-	local *FH;
-	open( FH, '>', $_[0] ) or die "open($_[0]): $!";
-	foreach ( 1 .. $#_ ) {
-		print FH $_[$_] or die "print($_[0]): $!";
-	}
-	close FH or die "close($_[0]): $!";
-}
-END_NEW
-sub _write {
-	local *FH;
-	open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
-	foreach ( 1 .. $#_ ) {
-		print FH $_[$_] or die "print($_[0]): $!";
-	}
-	close FH or die "close($_[0]): $!";
-}
-END_OLD
-
-# _version is for processing module versions (eg, 1.03_05) not
-# Perl versions (eg, 5.8.1).
-sub _version ($) {
-	my $s = shift || 0;
-	my $d =()= $s =~ /(\.)/g;
-	if ( $d >= 2 ) {
-		# Normalise multipart versions
-		$s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg;
-	}
-	$s =~ s/^(\d+)\.?//;
-	my $l = $1 || 0;
-	my @v = map {
-		$_ . '0' x (3 - length $_)
-	} $s =~ /(\d{1,3})\D?/g;
-	$l = $l . '.' . join '', @v if @v;
-	return $l + 0;
-}
-
-sub _cmp ($$) {
-	_version($_[0]) <=> _version($_[1]);
-}
-
-# Cloned from Params::Util::_CLASS
-sub _CLASS ($) {
-	(
-		defined $_[0]
-		and
-		! ref $_[0]
-		and
-		$_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s
-	) ? $_[0] : undef;
-}
-
-1;
-
-# Copyright 2008 - 2010 Adam Kennedy.
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/AutoInstall.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/AutoInstall.pm
deleted file mode 100644
index aa9f258..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/AutoInstall.pm
+++ /dev/null
@@ -1,74 +0,0 @@
-#line 1
-package Module::Install::AutoInstall;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '0.99';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub AutoInstall { $_[0] }
-
-sub run {
-    my $self = shift;
-    $self->auto_install_now(@_);
-}
-
-sub write {
-    my $self = shift;
-    $self->auto_install(@_);
-}
-
-sub auto_install {
-    my $self = shift;
-    return if $self->{done}++;
-
-    # Flatten array of arrays into a single array
-    my @core = map @$_, map @$_, grep ref,
-               $self->build_requires, $self->requires;
-
-    my @config = @_;
-
-    # We'll need Module::AutoInstall
-    $self->include('Module::AutoInstall');
-    require Module::AutoInstall;
-
-    my @features_require = Module::AutoInstall->import(
-        (@config ? (-config => \@config) : ()),
-        (@core   ? (-core   => \@core)   : ()),
-        $self->features,
-    );
-
-    my %seen;
-    my @requires = map @$_, map @$_, grep ref, $self->requires;
-    while (my ($mod, $ver) = splice(@requires, 0, 2)) {
-        $seen{$mod}{$ver}++;
-    }
-
-    my @deduped;
-    while (my ($mod, $ver) = splice(@features_require, 0, 2)) {
-        push @deduped, $mod => $ver unless $seen{$mod}{$ver}++;
-    }
-
-    $self->requires(@deduped);
-
-    $self->makemaker_args( Module::AutoInstall::_make_args() );
-
-    my $class = ref($self);
-    $self->postamble(
-        "# --- $class section:\n" .
-        Module::AutoInstall::postamble()
-    );
-}
-
-sub auto_install_now {
-    my $self = shift;
-    $self->auto_install(@_);
-    Module::AutoInstall::do_install();
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Base.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Base.pm
deleted file mode 100644
index c86c197..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Base.pm
+++ /dev/null
@@ -1,83 +0,0 @@
-#line 1
-package Module::Install::Base;
-
-use strict 'vars';
-use vars qw{$VERSION};
-BEGIN {
-	$VERSION = '0.99';
-}
-
-# Suspend handler for "redefined" warnings
-BEGIN {
-	my $w = $SIG{__WARN__};
-	$SIG{__WARN__} = sub { $w };
-}
-
-#line 42
-
-sub new {
-	my $class = shift;
-	unless ( defined &{"${class}::call"} ) {
-		*{"${class}::call"} = sub { shift->_top->call(@_) };
-	}
-	unless ( defined &{"${class}::load"} ) {
-		*{"${class}::load"} = sub { shift->_top->load(@_) };
-	}
-	bless { @_ }, $class;
-}
-
-#line 61
-
-sub AUTOLOAD {
-	local $@;
-	my $func = eval { shift->_top->autoload } or return;
-	goto &$func;
-}
-
-#line 75
-
-sub _top {
-	$_[0]->{_top};
-}
-
-#line 90
-
-sub admin {
-	$_[0]->_top->{admin}
-	or
-	Module::Install::Base::FakeAdmin->new;
-}
-
-#line 106
-
-sub is_admin {
-	! $_[0]->admin->isa('Module::Install::Base::FakeAdmin');
-}
-
-sub DESTROY {}
-
-package Module::Install::Base::FakeAdmin;
-
-use vars qw{$VERSION};
-BEGIN {
-	$VERSION = $Module::Install::Base::VERSION;
-}
-
-my $fake;
-
-sub new {
-	$fake ||= bless(\@_, $_[0]);
-}
-
-sub AUTOLOAD {}
-
-sub DESTROY {}
-
-# Restore warning handler
-BEGIN {
-	$SIG{__WARN__} = $SIG{__WARN__}->();
-}
-
-1;
-
-#line 159
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Can.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Can.pm
deleted file mode 100644
index 994dd3f..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Can.pm
+++ /dev/null
@@ -1,81 +0,0 @@
-#line 1
-package Module::Install::Can;
-
-use strict;
-use Config                ();
-use File::Spec            ();
-use ExtUtils::MakeMaker   ();
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '0.99';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-# check if we can load some module
-### Upgrade this to not have to load the module if possible
-sub can_use {
-	my ($self, $mod, $ver) = @_;
-	$mod =~ s{::|\\}{/}g;
-	$mod .= '.pm' unless $mod =~ /\.pm$/i;
-
-	my $pkg = $mod;
-	$pkg =~ s{/}{::}g;
-	$pkg =~ s{\.pm$}{}i;
-
-	local $@;
-	eval { require $mod; $pkg->VERSION($ver || 0); 1 };
-}
-
-# check if we can run some command
-sub can_run {
-	my ($self, $cmd) = @_;
-
-	my $_cmd = $cmd;
-	return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
-
-	for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
-		next if $dir eq '';
-		my $abs = File::Spec->catfile($dir, $_[1]);
-		return $abs if (-x $abs or $abs = MM->maybe_command($abs));
-	}
-
-	return;
-}
-
-# can we locate a (the) C compiler
-sub can_cc {
-	my $self   = shift;
-	my @chunks = split(/ /, $Config::Config{cc}) or return;
-
-	# $Config{cc} may contain args; try to find out the program part
-	while (@chunks) {
-		return $self->can_run("@chunks") || (pop(@chunks), next);
-	}
-
-	return;
-}
-
-# Fix Cygwin bug on maybe_command();
-if ( $^O eq 'cygwin' ) {
-	require ExtUtils::MM_Cygwin;
-	require ExtUtils::MM_Win32;
-	if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
-		*ExtUtils::MM_Cygwin::maybe_command = sub {
-			my ($self, $file) = @_;
-			if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
-				ExtUtils::MM_Win32->maybe_command($file);
-			} else {
-				ExtUtils::MM_Unix->maybe_command($file);
-			}
-		}
-	}
-}
-
-1;
-
-__END__
-
-#line 156
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Fetch.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Fetch.pm
deleted file mode 100644
index df357b2..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Fetch.pm
+++ /dev/null
@@ -1,93 +0,0 @@
-#line 1
-package Module::Install::Fetch;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '0.99';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub get_file {
-    my ($self, %args) = @_;
-    my ($scheme, $host, $path, $file) =
-        $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
-
-    if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
-        $args{url} = $args{ftp_url}
-            or (warn("LWP support unavailable!\n"), return);
-        ($scheme, $host, $path, $file) =
-            $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
-    }
-
-    $|++;
-    print "Fetching '$file' from $host... ";
-
-    unless (eval { require Socket; Socket::inet_aton($host) }) {
-        warn "'$host' resolve failed!\n";
-        return;
-    }
-
-    return unless $scheme eq 'ftp' or $scheme eq 'http';
-
-    require Cwd;
-    my $dir = Cwd::getcwd();
-    chdir $args{local_dir} or return if exists $args{local_dir};
-
-    if (eval { require LWP::Simple; 1 }) {
-        LWP::Simple::mirror($args{url}, $file);
-    }
-    elsif (eval { require Net::FTP; 1 }) { eval {
-        # use Net::FTP to get past firewall
-        my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600);
-        $ftp->login("anonymous", 'anonymous at example.com');
-        $ftp->cwd($path);
-        $ftp->binary;
-        $ftp->get($file) or (warn("$!\n"), return);
-        $ftp->quit;
-    } }
-    elsif (my $ftp = $self->can_run('ftp')) { eval {
-        # no Net::FTP, fallback to ftp.exe
-        require FileHandle;
-        my $fh = FileHandle->new;
-
-        local $SIG{CHLD} = 'IGNORE';
-        unless ($fh->open("|$ftp -n")) {
-            warn "Couldn't open ftp: $!\n";
-            chdir $dir; return;
-        }
-
-        my @dialog = split(/\n/, <<"END_FTP");
-open $host
-user anonymous anonymous\@example.com
-cd $path
-binary
-get $file $file
-quit
-END_FTP
-        foreach (@dialog) { $fh->print("$_\n") }
-        $fh->close;
-    } }
-    else {
-        warn "No working 'ftp' program available!\n";
-        chdir $dir; return;
-    }
-
-    unless (-f $file) {
-        warn "Fetching failed: $@\n";
-        chdir $dir; return;
-    }
-
-    return if exists $args{size} and -s $file != $args{size};
-    system($args{run}) if exists $args{run};
-    unlink($file) if $args{remove};
-
-    print(((!exists $args{check_for} or -e $args{check_for})
-        ? "done!" : "failed! ($!)"), "\n");
-    chdir $dir; return !$?;
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Include.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Include.pm
deleted file mode 100644
index 1aa5589..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Include.pm
+++ /dev/null
@@ -1,34 +0,0 @@
-#line 1
-package Module::Install::Include;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '0.99';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub include {
-	shift()->admin->include(@_);
-}
-
-sub include_deps {
-	shift()->admin->include_deps(@_);
-}
-
-sub auto_include {
-	shift()->admin->auto_include(@_);
-}
-
-sub auto_include_deps {
-	shift()->admin->auto_include_deps(@_);
-}
-
-sub auto_include_dependent_dists {
-	shift()->admin->auto_include_dependent_dists(@_);
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Makefile.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Makefile.pm
deleted file mode 100644
index a3536a4..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Makefile.pm
+++ /dev/null
@@ -1,415 +0,0 @@
-#line 1
-package Module::Install::Makefile;
-
-use strict 'vars';
-use ExtUtils::MakeMaker   ();
-use Module::Install::Base ();
-use Fcntl qw/:flock :seek/;
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '0.99';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-sub Makefile { $_[0] }
-
-my %seen = ();
-
-sub prompt {
-	shift;
-
-	# Infinite loop protection
-	my @c = caller();
-	if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
-		die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
-	}
-
-	# In automated testing or non-interactive session, always use defaults
-	if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) {
-		local $ENV{PERL_MM_USE_DEFAULT} = 1;
-		goto &ExtUtils::MakeMaker::prompt;
-	} else {
-		goto &ExtUtils::MakeMaker::prompt;
-	}
-}
-
-# Store a cleaned up version of the MakeMaker version,
-# since we need to behave differently in a variety of
-# ways based on the MM version.
-my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
-
-# If we are passed a param, do a "newer than" comparison.
-# Otherwise, just return the MakeMaker version.
-sub makemaker {
-	( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
-}
-
-# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified
-# as we only need to know here whether the attribute is an array
-# or a hash or something else (which may or may not be appendable).
-my %makemaker_argtype = (
- C                  => 'ARRAY',
- CONFIG             => 'ARRAY',
-# CONFIGURE          => 'CODE', # ignore
- DIR                => 'ARRAY',
- DL_FUNCS           => 'HASH',
- DL_VARS            => 'ARRAY',
- EXCLUDE_EXT        => 'ARRAY',
- EXE_FILES          => 'ARRAY',
- FUNCLIST           => 'ARRAY',
- H                  => 'ARRAY',
- IMPORTS            => 'HASH',
- INCLUDE_EXT        => 'ARRAY',
- LIBS               => 'ARRAY', # ignore ''
- MAN1PODS           => 'HASH',
- MAN3PODS           => 'HASH',
- META_ADD           => 'HASH',
- META_MERGE         => 'HASH',
- PL_FILES           => 'HASH',
- PM                 => 'HASH',
- PMLIBDIRS          => 'ARRAY',
- PMLIBPARENTDIRS    => 'ARRAY',
- PREREQ_PM          => 'HASH',
- CONFIGURE_REQUIRES => 'HASH',
- SKIP               => 'ARRAY',
- TYPEMAPS           => 'ARRAY',
- XS                 => 'HASH',
-# VERSION            => ['version',''],  # ignore
-# _KEEP_AFTER_FLUSH  => '',
-
- clean      => 'HASH',
- depend     => 'HASH',
- dist       => 'HASH',
- dynamic_lib=> 'HASH',
- linkext    => 'HASH',
- macro      => 'HASH',
- postamble  => 'HASH',
- realclean  => 'HASH',
- test       => 'HASH',
- tool_autosplit => 'HASH',
-
- # special cases where you can use makemaker_append
- CCFLAGS   => 'APPENDABLE',
- DEFINE    => 'APPENDABLE',
- INC       => 'APPENDABLE',
- LDDLFLAGS => 'APPENDABLE',
- LDFROM    => 'APPENDABLE',
-);
-
-sub makemaker_args {
-	my ($self, %new_args) = @_;
-	my $args = ( $self->{makemaker_args} ||= {} );
-	foreach my $key (keys %new_args) {
-		if ($makemaker_argtype{$key}) {
-			if ($makemaker_argtype{$key} eq 'ARRAY') {
-				$args->{$key} = [] unless defined $args->{$key};
-				unless (ref $args->{$key} eq 'ARRAY') {
-					$args->{$key} = [$args->{$key}]
-				}
-				push @{$args->{$key}},
-					ref $new_args{$key} eq 'ARRAY'
-						? @{$new_args{$key}}
-						: $new_args{$key};
-			}
-			elsif ($makemaker_argtype{$key} eq 'HASH') {
-				$args->{$key} = {} unless defined $args->{$key};
-				foreach my $skey (keys %{ $new_args{$key} }) {
-					$args->{$key}{$skey} = $new_args{$key}{$skey};
-				}
-			}
-			elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
-				$self->makemaker_append($key => $new_args{$key});
-			}
-		}
-		else {
-			if (defined $args->{$key}) {
-				warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n};
-			}
-			$args->{$key} = $new_args{$key};
-		}
-	}
-	return $args;
-}
-
-# For mm args that take multiple space-seperated args,
-# append an argument to the current list.
-sub makemaker_append {
-	my $self = shift;
-	my $name = shift;
-	my $args = $self->makemaker_args;
-	$args->{$name} = defined $args->{$name}
-		? join( ' ', $args->{$name}, @_ )
-		: join( ' ', @_ );
-}
-
-sub build_subdirs {
-	my $self    = shift;
-	my $subdirs = $self->makemaker_args->{DIR} ||= [];
-	for my $subdir (@_) {
-		push @$subdirs, $subdir;
-	}
-}
-
-sub clean_files {
-	my $self  = shift;
-	my $clean = $self->makemaker_args->{clean} ||= {};
-	  %$clean = (
-		%$clean,
-		FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
-	);
-}
-
-sub realclean_files {
-	my $self      = shift;
-	my $realclean = $self->makemaker_args->{realclean} ||= {};
-	  %$realclean = (
-		%$realclean,
-		FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
-	);
-}
-
-sub libs {
-	my $self = shift;
-	my $libs = ref $_[0] ? shift : [ shift ];
-	$self->makemaker_args( LIBS => $libs );
-}
-
-sub inc {
-	my $self = shift;
-	$self->makemaker_args( INC => shift );
-}
-
-sub _wanted_t {
-}
-
-sub tests_recursive {
-	my $self = shift;
-	my $dir = shift || 't';
-	unless ( -d $dir ) {
-		die "tests_recursive dir '$dir' does not exist";
-	}
-	my %tests = map { $_ => 1 } split / /, ($self->tests || '');
-	require File::Find;
-	File::Find::find(
-        sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 },
-        $dir
-    );
-	$self->tests( join ' ', sort keys %tests );
-}
-
-sub write {
-	my $self = shift;
-	die "&Makefile->write() takes no arguments\n" if @_;
-
-	# Check the current Perl version
-	my $perl_version = $self->perl_version;
-	if ( $perl_version ) {
-		eval "use $perl_version; 1"
-			or die "ERROR: perl: Version $] is installed, "
-			. "but we need version >= $perl_version";
-	}
-
-	# Make sure we have a new enough MakeMaker
-	require ExtUtils::MakeMaker;
-
-	if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
-		# MakeMaker can complain about module versions that include
-		# an underscore, even though its own version may contain one!
-		# Hence the funny regexp to get rid of it.  See RT #35800
-		# for details.
-		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
-		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
-	} else {
-		# Allow legacy-compatibility with 5.005 by depending on the
-		# most recent EU:MM that supported 5.005.
-		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
-	}
-
-	# Generate the MakeMaker params
-	my $args = $self->makemaker_args;
-	$args->{DISTNAME} = $self->name;
-	$args->{NAME}     = $self->module_name || $self->name;
-	$args->{NAME}     =~ s/-/::/g;
-	$args->{VERSION}  = $self->version or die <<'EOT';
-ERROR: Can't determine distribution version. Please specify it
-explicitly via 'version' in Makefile.PL, or set a valid $VERSION
-in a module, and provide its file path via 'version_from' (or
-'all_from' if you prefer) in Makefile.PL.
-EOT
-
-	$DB::single = 1;
-	if ( $self->tests ) {
-		my @tests = split ' ', $self->tests;
-		my %seen;
-		$args->{test} = {
-			TESTS => (join ' ', grep {!$seen{$_}++} @tests),
-		};
-    } elsif ( $Module::Install::ExtraTests::use_extratests ) {
-        # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness.
-        # So, just ignore our xt tests here.
-	} elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
-		$args->{test} = {
-			TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
-		};
-	}
-	if ( $] >= 5.005 ) {
-		$args->{ABSTRACT} = $self->abstract;
-		$args->{AUTHOR}   = join ', ', @{$self->author || []};
-	}
-	if ( $self->makemaker(6.10) ) {
-		$args->{NO_META}   = 1;
-		#$args->{NO_MYMETA} = 1;
-	}
-	if ( $self->makemaker(6.17) and $self->sign ) {
-		$args->{SIGN} = 1;
-	}
-	unless ( $self->is_admin ) {
-		delete $args->{SIGN};
-	}
-	if ( $self->makemaker(6.31) and $self->license ) {
-		$args->{LICENSE} = $self->license;
-	}
-
-	my $prereq = ($args->{PREREQ_PM} ||= {});
-	%$prereq = ( %$prereq,
-		map { @$_ } # flatten [module => version]
-		map { @$_ }
-		grep $_,
-		($self->requires)
-	);
-
-	# Remove any reference to perl, PREREQ_PM doesn't support it
-	delete $args->{PREREQ_PM}->{perl};
-
-	# Merge both kinds of requires into BUILD_REQUIRES
-	my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
-	%$build_prereq = ( %$build_prereq,
-		map { @$_ } # flatten [module => version]
-		map { @$_ }
-		grep $_,
-		($self->configure_requires, $self->build_requires)
-	);
-
-	# Remove any reference to perl, BUILD_REQUIRES doesn't support it
-	delete $args->{BUILD_REQUIRES}->{perl};
-
-	# Delete bundled dists from prereq_pm, add it to Makefile DIR
-	my $subdirs = ($args->{DIR} || []);
-	if ($self->bundles) {
-		my %processed;
-		foreach my $bundle (@{ $self->bundles }) {
-			my ($mod_name, $dist_dir) = @$bundle;
-			delete $prereq->{$mod_name};
-			$dist_dir = File::Basename::basename($dist_dir); # dir for building this module
-			if (not exists $processed{$dist_dir}) {
-				if (-d $dist_dir) {
-					# List as sub-directory to be processed by make
-					push @$subdirs, $dist_dir;
-				}
-				# Else do nothing: the module is already present on the system
-				$processed{$dist_dir} = undef;
-			}
-		}
-	}
-
-	unless ( $self->makemaker('6.55_03') ) {
-		%$prereq = (%$prereq,%$build_prereq);
-		delete $args->{BUILD_REQUIRES};
-	}
-
-	if ( my $perl_version = $self->perl_version ) {
-		eval "use $perl_version; 1"
-			or die "ERROR: perl: Version $] is installed, "
-			. "but we need version >= $perl_version";
-
-		if ( $self->makemaker(6.48) ) {
-			$args->{MIN_PERL_VERSION} = $perl_version;
-		}
-	}
-
-	if ($self->installdirs) {
-		warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS};
-		$args->{INSTALLDIRS} = $self->installdirs;
-	}
-
-	my %args = map {
-		( $_ => $args->{$_} ) } grep {defined($args->{$_} )
-	} keys %$args;
-
-	my $user_preop = delete $args{dist}->{PREOP};
-	if ( my $preop = $self->admin->preop($user_preop) ) {
-		foreach my $key ( keys %$preop ) {
-			$args{dist}->{$key} = $preop->{$key};
-		}
-	}
-
-	my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
-	$self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
-}
-
-sub fix_up_makefile {
-	my $self          = shift;
-	my $makefile_name = shift;
-	my $top_class     = ref($self->_top) || '';
-	my $top_version   = $self->_top->VERSION || '';
-
-	my $preamble = $self->preamble
-		? "# Preamble by $top_class $top_version\n"
-			. $self->preamble
-		: '';
-	my $postamble = "# Postamble by $top_class $top_version\n"
-		. ($self->postamble || '');
-
-	local *MAKEFILE;
-	open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
-	eval { flock MAKEFILE, LOCK_EX };
-	my $makefile = do { local $/; <MAKEFILE> };
-
-	$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
-	$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
-	$makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
-	$makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
-	$makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
-
-	# Module::Install will never be used to build the Core Perl
-	# Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
-	# PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
-	$makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
-	#$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
-
-	# Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
-	$makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g;
-
-	# XXX - This is currently unused; not sure if it breaks other MM-users
-	# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
-
-	seek MAKEFILE, 0, SEEK_SET;
-	truncate MAKEFILE, 0;
-	print MAKEFILE  "$preamble$makefile$postamble" or die $!;
-	close MAKEFILE  or die $!;
-
-	1;
-}
-
-sub preamble {
-	my ($self, $text) = @_;
-	$self->{preamble} = $text . $self->{preamble} if defined $text;
-	$self->{preamble};
-}
-
-sub postamble {
-	my ($self, $text) = @_;
-	$self->{postamble} ||= $self->admin->postamble;
-	$self->{postamble} .= $text if defined $text;
-	$self->{postamble}
-}
-
-1;
-
-__END__
-
-#line 541
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Metadata.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Metadata.pm
deleted file mode 100644
index bdeb367..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Metadata.pm
+++ /dev/null
@@ -1,715 +0,0 @@
-#line 1
-package Module::Install::Metadata;
-
-use strict 'vars';
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '0.99';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-my @boolean_keys = qw{
-	sign
-};
-
-my @scalar_keys = qw{
-	name
-	module_name
-	abstract
-	version
-	distribution_type
-	tests
-	installdirs
-};
-
-my @tuple_keys = qw{
-	configure_requires
-	build_requires
-	requires
-	recommends
-	bundles
-	resources
-};
-
-my @resource_keys = qw{
-	homepage
-	bugtracker
-	repository
-};
-
-my @array_keys = qw{
-	keywords
-	author
-};
-
-*authors = \&author;
-
-sub Meta              { shift          }
-sub Meta_BooleanKeys  { @boolean_keys  }
-sub Meta_ScalarKeys   { @scalar_keys   }
-sub Meta_TupleKeys    { @tuple_keys    }
-sub Meta_ResourceKeys { @resource_keys }
-sub Meta_ArrayKeys    { @array_keys    }
-
-foreach my $key ( @boolean_keys ) {
-	*$key = sub {
-		my $self = shift;
-		if ( defined wantarray and not @_ ) {
-			return $self->{values}->{$key};
-		}
-		$self->{values}->{$key} = ( @_ ? $_[0] : 1 );
-		return $self;
-	};
-}
-
-foreach my $key ( @scalar_keys ) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} if defined wantarray and !@_;
-		$self->{values}->{$key} = shift;
-		return $self;
-	};
-}
-
-foreach my $key ( @array_keys ) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} if defined wantarray and !@_;
-		$self->{values}->{$key} ||= [];
-		push @{$self->{values}->{$key}}, @_;
-		return $self;
-	};
-}
-
-foreach my $key ( @resource_keys ) {
-	*$key = sub {
-		my $self = shift;
-		unless ( @_ ) {
-			return () unless $self->{values}->{resources};
-			return map  { $_->[1] }
-			       grep { $_->[0] eq $key }
-			       @{ $self->{values}->{resources} };
-		}
-		return $self->{values}->{resources}->{$key} unless @_;
-		my $uri = shift or die(
-			"Did not provide a value to $key()"
-		);
-		$self->resources( $key => $uri );
-		return 1;
-	};
-}
-
-foreach my $key ( grep { $_ ne "resources" } @tuple_keys) {
-	*$key = sub {
-		my $self = shift;
-		return $self->{values}->{$key} unless @_;
-		my @added;
-		while ( @_ ) {
-			my $module  = shift or last;
-			my $version = shift || 0;
-			push @added, [ $module, $version ];
-		}
-		push @{ $self->{values}->{$key} }, @added;
-		return map {@$_} @added;
-	};
-}
-
-# Resource handling
-my %lc_resource = map { $_ => 1 } qw{
-	homepage
-	license
-	bugtracker
-	repository
-};
-
-sub resources {
-	my $self = shift;
-	while ( @_ ) {
-		my $name  = shift or last;
-		my $value = shift or next;
-		if ( $name eq lc $name and ! $lc_resource{$name} ) {
-			die("Unsupported reserved lowercase resource '$name'");
-		}
-		$self->{values}->{resources} ||= [];
-		push @{ $self->{values}->{resources} }, [ $name, $value ];
-	}
-	$self->{values}->{resources};
-}
-
-# Aliases for build_requires that will have alternative
-# meanings in some future version of META.yml.
-sub test_requires     { shift->build_requires(@_) }
-sub install_requires  { shift->build_requires(@_) }
-
-# Aliases for installdirs options
-sub install_as_core   { $_[0]->installdirs('perl')   }
-sub install_as_cpan   { $_[0]->installdirs('site')   }
-sub install_as_site   { $_[0]->installdirs('site')   }
-sub install_as_vendor { $_[0]->installdirs('vendor') }
-
-sub dynamic_config {
-	my $self = shift;
-	unless ( @_ ) {
-		warn "You MUST provide an explicit true/false value to dynamic_config\n";
-		return $self;
-	}
-	$self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
-	return 1;
-}
-
-sub perl_version {
-	my $self = shift;
-	return $self->{values}->{perl_version} unless @_;
-	my $version = shift or die(
-		"Did not provide a value to perl_version()"
-	);
-
-	# Normalize the version
-	$version = $self->_perl_version($version);
-
-	# We don't support the reall old versions
-	unless ( $version >= 5.005 ) {
-		die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
-	}
-
-	$self->{values}->{perl_version} = $version;
-}
-
-sub all_from {
-	my ( $self, $file ) = @_;
-
-	unless ( defined($file) ) {
-		my $name = $self->name or die(
-			"all_from called with no args without setting name() first"
-		);
-		$file = join('/', 'lib', split(/-/, $name)) . '.pm';
-		$file =~ s{.*/}{} unless -e $file;
-		unless ( -e $file ) {
-			die("all_from cannot find $file from $name");
-		}
-	}
-	unless ( -f $file ) {
-		die("The path '$file' does not exist, or is not a file");
-	}
-
-	$self->{values}{all_from} = $file;
-
-	# Some methods pull from POD instead of code.
-	# If there is a matching .pod, use that instead
-	my $pod = $file;
-	$pod =~ s/\.pm$/.pod/i;
-	$pod = $file unless -e $pod;
-
-	# Pull the different values
-	$self->name_from($file)         unless $self->name;
-	$self->version_from($file)      unless $self->version;
-	$self->perl_version_from($file) unless $self->perl_version;
-	$self->author_from($pod)        unless @{$self->author || []};
-	$self->license_from($pod)       unless $self->license;
-	$self->abstract_from($pod)      unless $self->abstract;
-
-	return 1;
-}
-
-sub provides {
-	my $self     = shift;
-	my $provides = ( $self->{values}->{provides} ||= {} );
-	%$provides = (%$provides, @_) if @_;
-	return $provides;
-}
-
-sub auto_provides {
-	my $self = shift;
-	return $self unless $self->is_admin;
-	unless (-e 'MANIFEST') {
-		warn "Cannot deduce auto_provides without a MANIFEST, skipping\n";
-		return $self;
-	}
-	# Avoid spurious warnings as we are not checking manifest here.
-	local $SIG{__WARN__} = sub {1};
-	require ExtUtils::Manifest;
-	local *ExtUtils::Manifest::manicheck = sub { return };
-
-	require Module::Build;
-	my $build = Module::Build->new(
-		dist_name    => $self->name,
-		dist_version => $self->version,
-		license      => $self->license,
-	);
-	$self->provides( %{ $build->find_dist_packages || {} } );
-}
-
-sub feature {
-	my $self     = shift;
-	my $name     = shift;
-	my $features = ( $self->{values}->{features} ||= [] );
-	my $mods;
-
-	if ( @_ == 1 and ref( $_[0] ) ) {
-		# The user used ->feature like ->features by passing in the second
-		# argument as a reference.  Accomodate for that.
-		$mods = $_[0];
-	} else {
-		$mods = \@_;
-	}
-
-	my $count = 0;
-	push @$features, (
-		$name => [
-			map {
-				ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_
-			} @$mods
-		]
-	);
-
-	return @$features;
-}
-
-sub features {
-	my $self = shift;
-	while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
-		$self->feature( $name, @$mods );
-	}
-	return $self->{values}->{features}
-		? @{ $self->{values}->{features} }
-		: ();
-}
-
-sub no_index {
-	my $self = shift;
-	my $type = shift;
-	push @{ $self->{values}->{no_index}->{$type} }, @_ if $type;
-	return $self->{values}->{no_index};
-}
-
-sub read {
-	my $self = shift;
-	$self->include_deps( 'YAML::Tiny', 0 );
-
-	require YAML::Tiny;
-	my $data = YAML::Tiny::LoadFile('META.yml');
-
-	# Call methods explicitly in case user has already set some values.
-	while ( my ( $key, $value ) = each %$data ) {
-		next unless $self->can($key);
-		if ( ref $value eq 'HASH' ) {
-			while ( my ( $module, $version ) = each %$value ) {
-				$self->can($key)->($self, $module => $version );
-			}
-		} else {
-			$self->can($key)->($self, $value);
-		}
-	}
-	return $self;
-}
-
-sub write {
-	my $self = shift;
-	return $self unless $self->is_admin;
-	$self->admin->write_meta;
-	return $self;
-}
-
-sub version_from {
-	require ExtUtils::MM_Unix;
-	my ( $self, $file ) = @_;
-	$self->version( ExtUtils::MM_Unix->parse_version($file) );
-
-	# for version integrity check
-	$self->makemaker_args( VERSION_FROM => $file );
-}
-
-sub abstract_from {
-	require ExtUtils::MM_Unix;
-	my ( $self, $file ) = @_;
-	$self->abstract(
-		bless(
-			{ DISTNAME => $self->name },
-			'ExtUtils::MM_Unix'
-		)->parse_abstract($file)
-	);
-}
-
-# Add both distribution and module name
-sub name_from {
-	my ($self, $file) = @_;
-	if (
-		Module::Install::_read($file) =~ m/
-		^ \s*
-		package \s*
-		([\w:]+)
-		\s* ;
-		/ixms
-	) {
-		my ($name, $module_name) = ($1, $1);
-		$name =~ s{::}{-}g;
-		$self->name($name);
-		unless ( $self->module_name ) {
-			$self->module_name($module_name);
-		}
-	} else {
-		die("Cannot determine name from $file\n");
-	}
-}
-
-sub _extract_perl_version {
-	if (
-		$_[0] =~ m/
-		^\s*
-		(?:use|require) \s*
-		v?
-		([\d_\.]+)
-		\s* ;
-		/ixms
-	) {
-		my $perl_version = $1;
-		$perl_version =~ s{_}{}g;
-		return $perl_version;
-	} else {
-		return;
-	}
-}
-
-sub perl_version_from {
-	my $self = shift;
-	my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
-	if ($perl_version) {
-		$self->perl_version($perl_version);
-	} else {
-		warn "Cannot determine perl version info from $_[0]\n";
-		return;
-	}
-}
-
-sub author_from {
-	my $self    = shift;
-	my $content = Module::Install::_read($_[0]);
-	if ($content =~ m/
-		=head \d \s+ (?:authors?)\b \s*
-		([^\n]*)
-		|
-		=head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s*
-		.*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s*
-		([^\n]*)
-	/ixms) {
-		my $author = $1 || $2;
-
-		# XXX: ugly but should work anyway...
-		if (eval "require Pod::Escapes; 1") {
-			# Pod::Escapes has a mapping table.
-			# It's in core of perl >= 5.9.3, and should be installed
-			# as one of the Pod::Simple's prereqs, which is a prereq
-			# of Pod::Text 3.x (see also below).
-			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
-			{
-				defined $2
-				? chr($2)
-				: defined $Pod::Escapes::Name2character_number{$1}
-				? chr($Pod::Escapes::Name2character_number{$1})
-				: do {
-					warn "Unknown escape: E<$1>";
-					"E<$1>";
-				};
-			}gex;
-		}
-		elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) {
-			# Pod::Text < 3.0 has yet another mapping table,
-			# though the table name of 2.x and 1.x are different.
-			# (1.x is in core of Perl < 5.6, 2.x is in core of
-			# Perl < 5.9.3)
-			my $mapping = ($Pod::Text::VERSION < 2)
-				? \%Pod::Text::HTML_Escapes
-				: \%Pod::Text::ESCAPES;
-			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
-			{
-				defined $2
-				? chr($2)
-				: defined $mapping->{$1}
-				? $mapping->{$1}
-				: do {
-					warn "Unknown escape: E<$1>";
-					"E<$1>";
-				};
-			}gex;
-		}
-		else {
-			$author =~ s{E<lt>}{<}g;
-			$author =~ s{E<gt>}{>}g;
-		}
-		$self->author($author);
-	} else {
-		warn "Cannot determine author info from $_[0]\n";
-	}
-}
-
-#Stolen from M::B
-my %license_urls = (
-    perl         => 'http://dev.perl.org/licenses/',
-    apache       => 'http://apache.org/licenses/LICENSE-2.0',
-    apache_1_1   => 'http://apache.org/licenses/LICENSE-1.1',
-    artistic     => 'http://opensource.org/licenses/artistic-license.php',
-    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
-    lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
-    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
-    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
-    bsd          => 'http://opensource.org/licenses/bsd-license.php',
-    gpl          => 'http://opensource.org/licenses/gpl-license.php',
-    gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
-    gpl3         => 'http://opensource.org/licenses/gpl-3.0.html',
-    mit          => 'http://opensource.org/licenses/mit-license.php',
-    mozilla      => 'http://opensource.org/licenses/mozilla1.1.php',
-    open_source  => undef,
-    unrestricted => undef,
-    restrictive  => undef,
-    unknown      => undef,
-);
-
-sub license {
-	my $self = shift;
-	return $self->{values}->{license} unless @_;
-	my $license = shift or die(
-		'Did not provide a value to license()'
-	);
-	$license = __extract_license($license) || lc $license;
-	$self->{values}->{license} = $license;
-
-	# Automatically fill in license URLs
-	if ( $license_urls{$license} ) {
-		$self->resources( license => $license_urls{$license} );
-	}
-
-	return 1;
-}
-
-sub _extract_license {
-	my $pod = shift;
-	my $matched;
-	return __extract_license(
-		($matched) = $pod =~ m/
-			(=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?)
-			(=head \d.*|=cut.*|)\z
-		/xms
-	) || __extract_license(
-		($matched) = $pod =~ m/
-			(=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?)
-			(=head \d.*|=cut.*|)\z
-		/xms
-	);
-}
-
-sub __extract_license {
-	my $license_text = shift or return;
-	my @phrases      = (
-		'(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1,
-		'(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
-		'Artistic and GPL'                   => 'perl',         1,
-		'GNU general public license'         => 'gpl',          1,
-		'GNU public license'                 => 'gpl',          1,
-		'GNU lesser general public license'  => 'lgpl',         1,
-		'GNU lesser public license'          => 'lgpl',         1,
-		'GNU library general public license' => 'lgpl',         1,
-		'GNU library public license'         => 'lgpl',         1,
-		'GNU Free Documentation license'     => 'unrestricted', 1,
-		'GNU Affero General Public License'  => 'open_source',  1,
-		'(?:Free)?BSD license'               => 'bsd',          1,
-		'Artistic license'                   => 'artistic',     1,
-		'Apache (?:Software )?license'       => 'apache',       1,
-		'GPL'                                => 'gpl',          1,
-		'LGPL'                               => 'lgpl',         1,
-		'BSD'                                => 'bsd',          1,
-		'Artistic'                           => 'artistic',     1,
-		'MIT'                                => 'mit',          1,
-		'Mozilla Public License'             => 'mozilla',      1,
-		'Q Public License'                   => 'open_source',  1,
-		'OpenSSL License'                    => 'unrestricted', 1,
-		'SSLeay License'                     => 'unrestricted', 1,
-		'zlib License'                       => 'open_source',  1,
-		'proprietary'                        => 'proprietary',  0,
-	);
-	while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
-		$pattern =~ s#\s+#\\s+#gs;
-		if ( $license_text =~ /\b$pattern\b/i ) {
-			return $license;
-		}
-	}
-	return '';
-}
-
-sub license_from {
-	my $self = shift;
-	if (my $license=_extract_license(Module::Install::_read($_[0]))) {
-		$self->license($license);
-	} else {
-		warn "Cannot determine license info from $_[0]\n";
-		return 'unknown';
-	}
-}
-
-sub _extract_bugtracker {
-	my @links   = $_[0] =~ m#L<(
-	 \Qhttp://rt.cpan.org/\E[^>]+|
-	 \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
-	 \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
-	 )>#gx;
-	my %links;
-	@links{@links}=();
-	@links=keys %links;
-	return @links;
-}
-
-sub bugtracker_from {
-	my $self    = shift;
-	my $content = Module::Install::_read($_[0]);
-	my @links   = _extract_bugtracker($content);
-	unless ( @links ) {
-		warn "Cannot determine bugtracker info from $_[0]\n";
-		return 0;
-	}
-	if ( @links > 1 ) {
-		warn "Found more than one bugtracker link in $_[0]\n";
-		return 0;
-	}
-
-	# Set the bugtracker
-	bugtracker( $links[0] );
-	return 1;
-}
-
-sub requires_from {
-	my $self     = shift;
-	my $content  = Module::Install::_readperl($_[0]);
-	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
-	while ( @requires ) {
-		my $module  = shift @requires;
-		my $version = shift @requires;
-		$self->requires( $module => $version );
-	}
-}
-
-sub test_requires_from {
-	my $self     = shift;
-	my $content  = Module::Install::_readperl($_[0]);
-	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
-	while ( @requires ) {
-		my $module  = shift @requires;
-		my $version = shift @requires;
-		$self->test_requires( $module => $version );
-	}
-}
-
-# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
-# numbers (eg, 5.006001 or 5.008009).
-# Also, convert double-part versions (eg, 5.8)
-sub _perl_version {
-	my $v = $_[-1];
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
-	$v =~ s/(\.\d\d\d)000$/$1/;
-	$v =~ s/_.+$//;
-	if ( ref($v) ) {
-		# Numify
-		$v = $v + 0;
-	}
-	return $v;
-}
-
-sub add_metadata {
-    my $self = shift;
-    my %hash = @_;
-    for my $key (keys %hash) {
-        warn "add_metadata: $key is not prefixed with 'x_'.\n" .
-             "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/;
-        $self->{values}->{$key} = $hash{$key};
-    }
-}
-
-
-######################################################################
-# MYMETA Support
-
-sub WriteMyMeta {
-	die "WriteMyMeta has been deprecated";
-}
-
-sub write_mymeta_yaml {
-	my $self = shift;
-
-	# We need YAML::Tiny to write the MYMETA.yml file
-	unless ( eval { require YAML::Tiny; 1; } ) {
-		return 1;
-	}
-
-	# Generate the data
-	my $meta = $self->_write_mymeta_data or return 1;
-
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.yml\n";
-	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
-}
-
-sub write_mymeta_json {
-	my $self = shift;
-
-	# We need JSON to write the MYMETA.json file
-	unless ( eval { require JSON; 1; } ) {
-		return 1;
-	}
-
-	# Generate the data
-	my $meta = $self->_write_mymeta_data or return 1;
-
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.json\n";
-	Module::Install::_write(
-		'MYMETA.json',
-		JSON->new->pretty(1)->canonical->encode($meta),
-	);
-}
-
-sub _write_mymeta_data {
-	my $self = shift;
-
-	# If there's no existing META.yml there is nothing we can do
-	return undef unless -f 'META.yml';
-
-	# We need Parse::CPAN::Meta to load the file
-	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
-		return undef;
-	}
-
-	# Merge the perl version into the dependencies
-	my $val  = $self->Meta->{values};
-	my $perl = delete $val->{perl_version};
-	if ( $perl ) {
-		$val->{requires} ||= [];
-		my $requires = $val->{requires};
-
-		# Canonize to three-dot version after Perl 5.6
-		if ( $perl >= 5.006 ) {
-			$perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e
-		}
-		unshift @$requires, [ perl => $perl ];
-	}
-
-	# Load the advisory META.yml file
-	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
-	my $meta = $yaml[0];
-
-	# Overwrite the non-configure dependency hashs
-	delete $meta->{requires};
-	delete $meta->{build_requires};
-	delete $meta->{recommends};
-	if ( exists $val->{requires} ) {
-		$meta->{requires} = { map { @$_ } @{ $val->{requires} } };
-	}
-	if ( exists $val->{build_requires} ) {
-		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
-	}
-
-	return $meta;
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Win32.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Win32.pm
deleted file mode 100644
index a9417aa..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/Win32.pm
+++ /dev/null
@@ -1,64 +0,0 @@
-#line 1
-package Module::Install::Win32;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '0.99';
-	@ISA     = 'Module::Install::Base';
-	$ISCORE  = 1;
-}
-
-# determine if the user needs nmake, and download it if needed
-sub check_nmake {
-	my $self = shift;
-	$self->load('can_run');
-	$self->load('get_file');
-
-	require Config;
-	return unless (
-		$^O eq 'MSWin32'                     and
-		$Config::Config{make}                and
-		$Config::Config{make} =~ /^nmake\b/i and
-		! $self->can_run('nmake')
-	);
-
-	print "The required 'nmake' executable not found, fetching it...\n";
-
-	require File::Basename;
-	my $rv = $self->get_file(
-		url       => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
-		ftp_url   => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
-		local_dir => File::Basename::dirname($^X),
-		size      => 51928,
-		run       => 'Nmake15.exe /o > nul',
-		check_for => 'Nmake.exe',
-		remove    => 1,
-	);
-
-	die <<'END_MESSAGE' unless $rv;
-
--------------------------------------------------------------------------------
-
-Since you are using Microsoft Windows, you will need the 'nmake' utility
-before installation. It's available at:
-
-  http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe
-      or
-  ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe
-
-Please download the file manually, save it to a directory in %PATH% (e.g.
-C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to
-that directory, and run "Nmake15.exe" from there; that will create the
-'nmake.exe' file needed by this module.
-
-You may then resume the installation process described in README.
-
--------------------------------------------------------------------------------
-END_MESSAGE
-
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/WriteAll.pm b/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/WriteAll.pm
deleted file mode 100644
index 75a089f..0000000
--- a/sources/Catalyst-Controller-FormBuilder/inc/Module/Install/WriteAll.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-#line 1
-package Module::Install::WriteAll;
-
-use strict;
-use Module::Install::Base ();
-
-use vars qw{$VERSION @ISA $ISCORE};
-BEGIN {
-	$VERSION = '0.99';
-	@ISA     = qw{Module::Install::Base};
-	$ISCORE  = 1;
-}
-
-sub WriteAll {
-	my $self = shift;
-	my %args = (
-		meta        => 1,
-		sign        => 0,
-		inline      => 0,
-		check_nmake => 1,
-		@_,
-	);
-
-	$self->sign(1)                if $args{sign};
-	$self->admin->WriteAll(%args) if $self->is_admin;
-
-	$self->check_nmake if $args{check_nmake};
-	unless ( $self->makemaker_args->{PL_FILES} ) {
-		# XXX: This still may be a bit over-defensive...
-		unless ($self->makemaker(6.25)) {
-			$self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL';
-		}
-	}
-
-	# Until ExtUtils::MakeMaker support MYMETA.yml, make sure
-	# we clean it up properly ourself.
-	$self->realclean_files('MYMETA.yml');
-
-	if ( $args{inline} ) {
-		$self->Inline->write;
-	} else {
-		$self->Makefile->write;
-	}
-
-	# The Makefile write process adds a couple of dependencies,
-	# so write the META.yml files after the Makefile.
-	if ( $args{meta} ) {
-		$self->Meta->write;
-	}
-
-	# Experimental support for MYMETA
-	if ( $ENV{X_MYMETA} ) {
-		if ( $ENV{X_MYMETA} eq 'JSON' ) {
-			$self->Meta->write_mymeta_json;
-		} else {
-			$self->Meta->write_mymeta_yaml;
-		}
-	}
-
-	return 1;
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder.pm b/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder.pm
deleted file mode 100644
index 3b3de4e..0000000
--- a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder.pm
+++ /dev/null
@@ -1,440 +0,0 @@
-package Catalyst::Controller::FormBuilder;
-
-use strict;
-use base qw/Catalyst::Controller/;
-use MRO::Compat;
-use mro 'c3';
-
-our $VERSION = "0.06";
-
-__PACKAGE__->mk_accessors(qw/_fb_setup/);
-
-sub new {
-    my $class = shift;
-    my $self  = $class->next::method(@_);
-    $self->__setup();
-    return $self;
-}
-
-sub __setup {
-    my $self   = shift;
-    my $class  = ref $self;
-
-    my $config = $self->config->{'Controller::FormBuilder'} || {};
-
-    my $tmpl_type = $config->{template_type} || "TT";
-    my $method = $config->{method_name} || 'formbuilder';
-    my $action = $config->{action}
-      || "Catalyst::Controller::FormBuilder::Action::$tmpl_type";
-
-    $self->_fb_setup(
-        {
-            method_name => $method,
-            stash_name  => $config->{stash_name} || 'formbuilder',
-            obj_name    => $config->{obj_name} || 'FormBuilder',
-            action      => $action,
-            attr_name   => $config->{attr_name} || 'Form',
-            source_type => $config->{source_type} || undef,
-            template_type => $tmpl_type,
-        }
-    );
-    no strict 'refs';
-    *{"$class\::$method"} = $class->make_accessor($method);
-}
-
-sub _formbuilder {
-    my $self   = shift;
-    my $method = $self->_fb_setup->{method_name};
-    $self->$method(@_);
-}
-
-sub create_action {
-    my $self = shift;
-    my %args = @_;
-
-    my $attr_name = $self->_fb_setup->{attr_name};
-
-    if ( exists $args{attributes}{$attr_name} ) {
-        $args{_attr_params} = delete $args{attributes}{$attr_name};
-        if ( my $source_type = $self->_fb_setup->{source_type} ) {
-            $args{_source_type} = $source_type;
-        }
-        push @{ $args{attributes}{ActionClass} }, $self->_fb_setup->{action};
-    }
-
-    $self->SUPER::create_action(%args);
-}
-
-1;
-
-__END__
-
-# Copyright (c) 2006 Juan Camacho <formbuilder at suspenda.com>. All Rights Reserved.
-
-=head1 NAME
-
-Catalyst::Controller::FormBuilder - Catalyst FormBuilder Base Controller
-
-=head1 SYNOPSIS
-
-    package MyApp::Controller::Books;
-    use base 'Catalyst::Controller::FormBuilder';
-
-    # optional config setup
-    __PACKAGE__->config(
-        'Controller::FormBuilder' = {
-            template_type => 'HTML::Template',    # default is 'TT' (e.g. TT2)
-        }
-    );
-
-    # looks for books/edit.fb form configuration file, based on the presence of
-    # the ":Form" attribute.
-    sub edit : Local Form {
-        my ( $self, $c, @args ) = @_;
-
-        my $form = $self->formbuilder;
-
-        # add email form field to fields already defined edit.fb
-        $form->field( name => 'email', validate => 'EMAIL' );
-
-        if ( $form->submitted ) {
-            if ( $form->validate ) {
-                return $c->response->body("VALID FORM");
-            }
-            else {
-                $c->stash->{ERROR}          = "INVALID FORM";
-                $c->stash->{invalid_fields} =
-                  [ grep { !$_->validate } $form->fields ];
-            }
-        }
-    }
-
-    # explicitedly use books/edit.fb, otherwise books/view.fb is used
-    sub view : Local Form('/books/edit') {
-        my ( $self, $c ) = @_;
-        $c->stash->{template} = "books/edit.tt" # TT2 template;
-    }
-
-=cut
-
-
-=head1 DESCRIPTION
-
-This base controller merges the functionality of B<CGI::FormBuilder> with
-Catalyst and the following templating systems: Template Toolkit, Mason and
-HTML::Template. This gives you access to all of FormBuilder's niceties,
-such as controllablefield stickiness, multilingual support, and Javascript
-generation. For more details, see L<CGI::FormBuilder> or the website at:
-
-    http://www.formbuilder.org
-
-FormBuilder usage within Catalyst is straightforward. Since Catalyst handles
-page rendering, you don't call FormBuilder's C<render()> method, as you
-would normally. Instead, you simply add a C<:Form> attribute to each method
-that you want to associate with a form. This will give you access to a
-FormBuilder C<< $self->formbuilder >> object within that controller method:
-
-    # An editing screen for books
-    sub edit : Local Form {
-        my ( $self, $c ) = @_;
-        $self->formbuilder->method('post');   # set form method
-    }
-
-The out-of-the-box setup is to look for a form configuration file that follows
-the L<CGI::FormBuilder::Source::File> format (essentially YAML), named for the
-current action url. So, if you were serving C</books/edit>, this plugin
-would look for:
-
-    root/forms/books/edit.fb
-
-(The path is configurable.) If no source file is found, then it is assumed
-you'll be setting up your fields manually. In your controller, you will
-have to use the C<< $self->formbuilder >> object to create your fields,
-validation, and so on.
-
-Here is an example C<edit.fb> file:
-
-    # Form config file root/forms/books/edit.fb
-    name: books_edit
-    method: post
-    fields:
-        title:
-            label: Book Title
-            type:  text
-            size:  40
-            required: 1
-        author:
-            label: Author's Name
-            type:  text
-            size:  80
-            validate: NAME
-            required: 1
-        isbn:
-            label: ISBN#
-            type:  text
-            size:  20
-            validate: /^(\d{10}|\d{13})$/
-            required: 1
-        desc:
-            label: Description
-            type:  textarea
-            cols:  80
-            rows:  5
-
-    submit: Save New Book
-
-This will automatically create a complete form for you, using the
-specified fields. Note that the C<root/forms> path is configurable;
-this path is used by default to integrate with the C<TTSite> helper.
-
-Within your controller, you can call any method that you would on a
-normal C<CGI::FormBuilder> object on the C<< $self->formbuilder >> object.
-To manipulate the field named C<desc>, simply call the C<field()>
-method:
-
-    # Change our desc field dynamically
-    $self->formbuilder->field(
-        name     => 'desc',
-        label    => 'Book Description',
-        required => 1
-    );
-
-To populate field options for C<country>, you might use something like
-this to iterate through the database:
-
-    $self->formbuilder->field(
-        name    => 'country',
-        options =>
-          [ map { [ $_->id, $_->name ] } $c->model('MyApp::Country')->all ],
-        other => 1,    # create "Other:" box
-    );
-
-This would create a select list with the last element as "Other:" to allow
-the addition of more countries. See L<CGI::FormBuilder> for methods
-available to the form object.
-
-The FormBuilder methodolody is to handle both rendering and validation
-of the form. As such, the form will "loop back" onto the same controller
-method. Within your controller, you would then use the standard FormBuilder
-submit/validate check:
-
-    if ( $self->formbuilder->submitted && $self->formbuilder->validate ) {
-        $c->forward('/books/save');
-    }
-
-This would forward to C</books/save> if the form was submitted and
-passed field validation. Otherwise, it would automatically re-render the
-form with invalid fields highlighted, leaving the database unchanged.
-
-To render the form in your tt2 template for example, you can use C<render>
-to get a default table-based form:
-
-    <!-- root/src/books/edit.tt -->
-    [% FormBuilder.render %]
-
-You can also get fine-tuned control over your form layout from within
-your template.
-
-=head1 TEMPLATES
-
-The simplest way to get your form into HTML is to reference the
-C<FormBuilder.render> method, as shown above. However, frequently you
-want more control.
-
-Only Template Toolkit, Mason and HTML::Template are currently supported, but
-if your templating system's stash requirements are identical to one of these,
-simply choose and define it via the C<template_type> config option.  Of course,
-make sure you have a View to support the template, since this module does not
-render templates.
-
-From within your template, you can reference any of FormBuilder's
-methods to manipulate form HTML, JavaScript, and so forth. For example,
-you might want exact control over fields, rendering them in a C<< <div> >>
-instead of a table. You could do something like this:
-
-    <!-- root/src/books/edit.tt -->
-    <head>
-      <title>[% formbuilder.title %]</title>
-      [% formbuilder.jshead %]<!-- javascript -->
-    </head>
-     <body>
-      [% formbuilder.start -%]
-      <div id="form">
-        [% FOREACH field IN formbuilder.fields -%]
-        <p>
-            <label>
-               <span [% IF field.required %]class="required"[%END%]>[%field.label%]</span>
-            </label>
-          [% field.field %]
-          [% IF field.invalid -%]
-              <span class="error">
-                  Missing or invalid entry, please try again.
-              </span>
-          [% END %]
-          </p>
-        [% END %]
-        <div id="submit">[% formbuilder.submit %]</div>
-        <div id="reset">[% formbuilder.reset %]</div>
-        </div>
-      </div>
-      [% formbuilder.end -%]
-    </body>
-
-In this case, you would B<not> call C<FormBuilder.render>, since that would
-only result in a duplicate form (once using the above expansion, and
-a second time using FormBuilder's default rendering).
-
-Note that the above form could become a generic C<form.tt> template
-which you simply included in all your files, since there is nothing
-specific to a given form hardcoded in (that's the idea, after all).
-
-You can also get some ideas based on FormBuilder's native Template Toolkit
-support at L<CGI::FormBuilder::Template::TT2>.
-
-=head1 CONFIGURATION
-
-You can set defaults for your forms using Catalyst's config method inside
-your controller.
-
-    __PACKAGE__->config(
-        'Controller::FormBuilder' => {
-            new => {
-                method     => 'post',
-                # stylesheet => 1,
-                messages   => '/locale/fr_FR/form_messages.txt',
-            },
-            form_path =>
-              File::Spec->catfile( $c->config->{home}, 'root', 'forms' ),
-            method_name   => 'form',
-            template_type => 'HTML::Template',
-            stash_name    => 'form',
-            obj_name      => 'FormBuilder',
-            form_suffix   => 'fb',
-            attr_name     => 'Form',
-            source_type   => 'CGI::FormBuilder::Source::File',
-        }
-    );
-
-=over
-
-=item C<new>
-
-This accepts the exact same options as FormBuilder's C<new()> method
-(which is a lot). See L<CGI::FormBuilder> for a full list of options.
-
-=item C<form_path>
-
-The path to configuration files. This should be set to an absolute
-path to prevent problems. By default, it is set to:
-
-    File::Spec->catfile( $c->config->{home}, 'root', 'forms' )
-
-This can be a colon-separated list of directories if you want to
-specify multiple paths (ie, "/templates1:/template2"), or an array
-ref (ie, [qw/template1 templates2/]).
-
-=item C<form_suffix>
-
-The suffix that configuration files have. By default, it is C<fb>.
-
-=item C<method_name>
-
-Accessor method name available in your controller. By default, it is
-C<formbuilder>.
-
-=item C<template_type>
-
-Defines the Catalyst View that the stash will be prepared for. Possible
-values are: HTML::Template, Mason, TT. By default, it is C<TT>.
-
-=item C<stash_name>
-
-Not applicable for HTML::Template view.  By default, it is C<formbuilder>.
-e.g. $c->stash->{formbuilder} = $formbuilder->prepare.
-
-=item C<obj_name>
-
-Not applicable for HTML::Template view. By default, it is C<FormBuilder>.
-e.g. $c->stash->{FormBuilder} = $formbuilder.
-
-=item C<attr_name>
-
-The attribute name. By default, it is C<Form>.
-e.g. sub edit : Form { ... }
-
-=item C<source_type>
-
-The source adapter class name. By default, it is
-C<CGI::FormBuilder::Source::File>. See L<CGI::FormBuilder::Source>
-
-=back
-
-In addition, the following FormBuilder options are automatically set for you:
-
-=over
-
-=item C<action>
-
-This is set to the URL for the current action. B<FormBuilder> is designed
-to handle a full request cycle, meaning both rendering and submission. If
-you want to override this, simply use the C<< $self->formbuilder >> object:
-
-    $self->formbuilder->action('/action/url');
-
-The default setting is C<< $c->req->path >>.
-
-=item C<cookies>
-
-Handling these are disabled (use Catalyst).
-
-=item C<debug>
-
-This is set to correspond with Catalyst's debug setting.
-
-=item C<header>
-
-This is disabled. Instead, use Catalyst's header routines.
-
-=item C<params>
-
-This is set to get parameters from Catalyst, using C<< $c->req >>.
-To override this, use the C<< $self->formbuilder >> object:
-
-    $self->formbuilder->params(\%param_hashref);
-
-Overriding this is not recommended.
-
-=item C<source>
-
-This determines which source file is loaded, to setup your form. By
-default, this is set to the name of the action URL, with C<.fb> appended.
-For example, C<edit_form()> would be associated with an C<edit_form.fb>
-source file.
-
-To override this, include the path as the argument to the method attribute:
-
-    sub edit : Local Form('/books/myEditForm') { }
-
-If no source file is found, then it is assumed you'll be setting up your
-fields manually. In your controller, you will have to use the
-C<< $self->formbuilder >> object to create your fields, validation, and so on.
-
-=back
-
-=head1 SEE ALSO
-
-L<CGI::FormBuilder>, L<CGI::FormBuilder::Source::File>,
-L<CGI::FormBuilder::Template::TT2>, L<Catalyst::Manual>,
-L<Catalyst::Request>, L<Catalyst::Response>
-
-=head1 AUTHOR
-
-Copyright (c) 2006 Juan Camacho <formbuilder at suspenda.com>. All Rights Reserved.
-
-Thanks to Laurent Dami and Roy-Magne Mo for suggestions.
-
-This library is free software, you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
-
diff --git a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action.pm b/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action.pm
deleted file mode 100644
index be476b7..0000000
--- a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action.pm
+++ /dev/null
@@ -1,143 +0,0 @@
-package Catalyst::Controller::FormBuilder::Action;
-
-use strict;
-use CGI::FormBuilder;
-use CGI::FormBuilder::Source::File;
-use File::Spec;
-use Class::Inspector;
-use MRO::Compat;
-use Scalar::Util ();
-
-use base qw/Catalyst::Action Class::Data::Inheritable/;
-
-__PACKAGE__->mk_classdata(qw/_source_class/);
-__PACKAGE__->mk_accessors(qw/_attr_params _source_type/);
-__PACKAGE__->_source_class('CGI::FormBuilder::Source::File');
-
-sub _setup_form {
-    my ( $self, $controller, $c ) = @_;
-
-    # Load configured defaults from the user, and add in some
-    # custom settings needed to meld FormBuilder with Catalyst
-    my $config = $controller->config->{'Controller::FormBuilder'} || {};
-
-    my %attr = (
-        debug   => $c->debug ? 2 : 0,
-        %{ $config->{new} || {} },
-        %{ $self->_source_conf_data( $controller, $c ) || {} },
-        params  => $c->req,
-        action  => $c->req->uri->path,
-        header  => 0,                    # always disable headers
-        cookies => 0,                    # and cookies
-        title   => __PACKAGE__,
-        c       => $c,                   # allow \&validate to get $c,
-    );
-
-    $self->_create_formbuilder(\%attr);
-}
-
-sub _source_conf_data {
-    my $self = shift;
-
-    if ( my $source = $self->_source(@_) ) {
-        s/^\.*/./ if $_;    # XX workaround for CGI::FormBuilder::Source::File bug
-        my $adapter = $self->_create_source_adapter();
-        return { $adapter->parse($source) };
-    }
-}
-
-sub _create_formbuilder {
-    my $self = shift;
-
-    return CGI::FormBuilder->new( @_ );
-}
-
-sub _create_source_adapter {
-    my $self = shift;
-
-    my $class = $self->_source_type || $self->_source_class;
-    unless ( Class::Inspector->loaded($class) ) {
-        require Class::Inspector->filename($class);
-    }
-
-    return $class->new();
-}
-
-sub _source {
-    my ( $self, $controller, $c ) = @_;
-
-    my $config = $controller->config->{'Controller::FormBuilder'} || {};
-    my $name  = $self->_attr_params->[0] || $self->reverse;
-
-    # remove leading and trailing slashes
-    $name =~ s#^/+##;
-    $name =~ s#/+$##;
-
-    my $fbdir = $self->_form_path($controller, $c);
-
-    # Attempt to autoload config and template files
-    # Cleanup suffix to allow ".fb" or "fb" in config
-
-    my $fbsuf = exists( $config->{form_suffix} ) ? $config->{form_suffix} : 'fb';
-    $fbsuf =~ s/^\.*/./ if $fbsuf;
-    my $fbfile = "$name$fbsuf";
-
-    $c->log->debug("Form ($name): Looking for config file $fbfile")
-      if $c->debug;
-
-    # Look for files relative to our current action url (/books/edit)
-    for my $dir ( @$fbdir ) {
-        my $conf = File::Spec->catfile( $dir, $fbfile );
-        if ( -f $conf && -r _ ) {
-            $c->log->debug("Form ($name): Found form config $conf")
-              if $c->debug;
-            return $conf;
-        }
-    }
-
-    my $err = sprintf( "Form (%s): Can't find form config $fbfile in: %s",
-        $name, join( ", ", @$fbdir ) );
-
-    if ( $self->_attr_params->[0] ) {
-        $c->log->error($err);
-        $c->error($err);
-    }
-    else {
-        $c->log->debug($err) if $c->debug;
-    }
-
-    return;
-}
-
-sub _form_path {
-    my ( $self, $controller, $c ) = @_;
-
-    my $config = $controller->config->{'Controller::FormBuilder'} || {};
-    my $fbdir = [ File::Spec->catfile( $c->config->{home}, 'root', 'forms' ) ];
-
-    if ( my $dir = $config->{form_path} ) {
-        $fbdir = ref $dir ? $dir : [ split /\s*:\s*/, $dir ];
-    }
-
-    return $fbdir;
-}
-
-sub execute {
-    my $self = shift;
-    my ( $controller, $c ) = @_;
-
-    return $self->maybe::next::method(@_)
-      unless exists $self->attributes->{ActionClass}
-      && $self->attributes->{ActionClass}[0] eq
-      $controller->_fb_setup->{action};
-
-    my $form = $self->_setup_form(@_);
-    Scalar::Util::weaken($form->{c});
-    $controller->_formbuilder($form);
-    $self->maybe::next::method(@_);
-    $controller->_formbuilder($form);   # keep the same form in case of forwards
-
-    $self->setup_template_vars( @_ );
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/HTML/Template.pm b/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/HTML/Template.pm
deleted file mode 100644
index a7a45d4..0000000
--- a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/HTML/Template.pm
+++ /dev/null
@@ -1,136 +0,0 @@
-package Catalyst::Controller::FormBuilder::Action::HTML::Template;
-
-use strict;
-use Tie::IxHash;
-use base qw/Catalyst::Controller::FormBuilder::Action/;
-use CGI::FormBuilder::Util qw/toname ismember optval/;
-
-our %FORM_VARS;
-# ensuring order to avoid FB's script before start warning msg
-tie(
-    %FORM_VARS, 'Tie::IxHash',
-    'form-jshead'     => 'script',
-    'js-head'         => 'script',
-    'form-title'      => 'title',
-    'form-start'      => 'start',
-    'form-submit'     => 'submit',
-    'form-reset'      => 'reset',
-    'form-end'        => 'end',
-    'form-invalid'    => 'invalid',
-    'form-required'   => 'required',
-    'form-statetags'  => 'statetags',
-    'form-keepextras' => 'keepextras',
-);
-
-our %FIELD_VARS = (
-    'cleanopts' => 'cleanopts-%s',
-    'value'     => 'value-%s',
-    'missing'   => 'missing-%s',
-    'nameopts'  => 'nameopts-%s',
-    'comment'   => 'comment-%s',
-    'required'  => 'required-%s',
-    'error'     => 'error-%s',
-    'label'     => 'label-%s',
-    'type'      => 'type-%s',
-    'tag'       => 'field-%s',
-    'invalid'   => 'invalid-%s'
-);
-
-sub setup_template_vars {
-    my ( $self, $controller, $c ) = @_;
-
-    my $tvar = {};
-    my $form = $controller->_formbuilder;
-
-    while ( my ( $to, $from ) = each %FORM_VARS ) {
-        $tvar->{$to} = $form->$from;
-    }
-
-    #
-    # For HTML::Template, each data struct is manually assigned
-    # to a separate <tmpl_var> and <tmpl_loop> tag
-    #
-    my @fieldlist;
-    for my $field ( $form->fields ) {
-
-        # Field name is usually a good idea
-        my $name = $field->name;
-
-        # Get all values
-        my @value   = $field->values;
-        my @options = $field->options;
-
-        #
-        # Auto-expand all of our field tags, such as field, label, value
-        # comment, error, etc, etc
-        #
-
-        while ( my ( $key, $str ) = each %FIELD_VARS ) {
-            my $var = sprintf $str, $name;
-            $tvar->{$var} = $field->$key;
-        }
-
-        #
-        # Create a <tmpl_loop> for multi-values/multi-opts
-        # we can't include the field, really, since this would involve
-        # too much effort knowing what type
-        #
-        my @tmpl_loop = ();
-        for my $opt (@options) {
-
-            # Since our data structure is a series of ['',''] things,
-            # we get the name from that. If not, then it's a list
-            # of regular old data that we _toname if nameopts => 1
-            my ( $o, $n ) = optval $opt;
-
-            $n ||=
-              $form->{"nameopts-$name"}
-              ? toname($o)
-              : $o;
-
-            my ( $slct, $chk ) =
-              ismember( $o, @value )
-              ? ( 'selected', 'checked' )
-              : ( '', '' );
-
-            push @tmpl_loop,
-              {
-                label    => $n,
-                value    => $o,
-                checked  => $chk,
-                selected => $slct,
-              };
-        }
-
-        # Now assign our loop-field
-        $form->{"loop-$name"} = \@tmpl_loop;
-
-        # Finally, push onto a top-level loop named "fields"
-        push @fieldlist,
-          {
-            field    => $tvar->{"field-$name"},
-            value    => $tvar->{"value-$name"},
-            values   => \@value,
-            options  => \@options,
-            label    => $tvar->{"label-$name"},
-            comment  => $tvar->{"comment-$name"},
-            error    => $tvar->{"error-$name"},
-            required => $tvar->{"required-$name"},
-            missing  => $tvar->{"missing-$name"},
-            loop     => \@tmpl_loop
-          };
-    }
-
-    # use Data::Dumper;
-    # print STDERR Dumper( $fieldlist[0] );
-
-    # kill our previous fields list
-    $tvar->{fields} = \@fieldlist;
-
-    # loop thru each field we have and set the tmpl_param
-    while ( my ( $param, $tag ) = each %$tvar ) {
-        $c->stash->{$param} = $tag;
-    }
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/Mason.pm b/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/Mason.pm
deleted file mode 100644
index 8e1f92f..0000000
--- a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/Mason.pm
+++ /dev/null
@@ -1,16 +0,0 @@
-package Catalyst::Controller::FormBuilder::Action::Mason;
-
-use strict;
-use base qw/Catalyst::Controller::FormBuilder::Action/;
-
-sub setup_template_vars {
-    my ( $self, $controller, $c ) = @_;
-
-    my $stash_name = $controller->_fb_setup->{stash_name};
-    $c->stash->{$stash_name} = $controller->_formbuilder->prepare;
-
-    $c->stash->{ $controller->_fb_setup->{obj_name} } =
-      $controller->_formbuilder;
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/TT.pm b/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/TT.pm
deleted file mode 100644
index c46e783..0000000
--- a/sources/Catalyst-Controller-FormBuilder/lib/Catalyst/Controller/FormBuilder/Action/TT.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package Catalyst::Controller::FormBuilder::Action::TT;
-
-use strict;
-use base qw/Catalyst::Controller::FormBuilder::Action/;
-
-sub setup_template_vars {
-    my ( $self, $controller, $c ) = @_;
-
-    my $stash_name = $controller->_fb_setup->{stash_name};
-    $c->stash->{$stash_name} = $controller->_formbuilder->prepare;
-    $c->stash->{ $controller->_fb_setup->{obj_name} } =
-      $controller->_formbuilder;
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/00-load.t b/sources/Catalyst-Controller-FormBuilder/t/00-load.t
deleted file mode 100644
index 9223adb..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/00-load.t
+++ /dev/null
@@ -1,9 +0,0 @@
-use Test::More tests => 1;
-
-BEGIN {
-    use_ok('Catalyst::Controller::FormBuilder');
-}
-
-diag(
-"Testing Catalyst::Controller::FormBuilder $Catalyst::Controller::FormBuilder::VERSION"
-);
diff --git a/sources/Catalyst-Controller-FormBuilder/t/01-basic.t b/sources/Catalyst-Controller-FormBuilder/t/01-basic.t
deleted file mode 100644
index 9a7051c..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/01-basic.t
+++ /dev/null
@@ -1,22 +0,0 @@
-package main;
-
-use FindBin;
-use lib "$FindBin::Bin/lib";
-
-use Test::More tests => 4;
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-my $page = "books/basic";
-$mech->get_ok( "http://localhost/$page", "GET /$page" );
-
-my $form = $mech->current_form;
-ok( $form, "Form found" ) or BAIL_OUT("Can't do anything without a form");
-
-my @inputs = $form->inputs;
-
-is( scalar(@inputs), 3, "Form has expected number of fields" );
-
-my $email = $form->find_input( "email", "text" );
-ok( $email, "Found email field" );
-
diff --git a/sources/Catalyst-Controller-FormBuilder/t/02-edit.t b/sources/Catalyst-Controller-FormBuilder/t/02-edit.t
deleted file mode 100644
index d6fa1e3..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/02-edit.t
+++ /dev/null
@@ -1,70 +0,0 @@
-package main;
-
-use FindBin;
-use lib "$FindBin::Bin/lib";
-
-use Test::More tests => 8;
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-my $page = "books/edit";
-$mech->get_ok( "http://localhost/$page?isbn=1234", "GET /$page" );
-
-my $form = $mech->current_form;
-
-ok( $form, "Form found" ) or BAIL_OUT("Can't do anything without a form");
-
-is( $form->method, "GET", "Form set to POST method" );
-
-my @inputs = $form->inputs;
-
-is( scalar(@inputs), 7, "Form has expected number of fields" );
-
-my $email = $form->find_input( "email", "text" );
-ok( $email, "Found email field" );
-
-if ( my $isbn = $form->find_input( "isbn", "text" ) ) {
-    is( $isbn->value, "1234", "ISBN field stickiness set" );
-}
-else {
-    fail("ISBN field not found");
-}
-
-$mech->submit();
-
-if ( my $form = $mech->current_form ) {
-
-    my %data = (
-        'desc'   => '',
-        'title'  => 'A Nestorian Collection of Christological Texts (Syriac)',
-        'author' => 'Luise Abramowski',
-        'isbn'   => '0521075785',
-        'email'  => 'publisher at cambridge.org',
-    );
-
-    if ( my $_invalid_fields = $form->find_input( '_invalid_fields', 'hidden' ) ) {
-        my @flds = split( /\|/, $_invalid_fields->value );
-        ok( eq_array( [ sort @flds ], [qw/author isbn title/] ),
-            "Expected invalid fields match" );
-    }
-    else {
-        fail("Hidden field with piped list of invalid field names missing");
-    }
-
-    while ( my ( $k, $v ) = each %data ) {
-        if ( my @input = $form->find_input($k) ) {
-            $_->value($v) for @input;
-        }
-        else {
-            fail("Missing '$k' field");
-        }
-    }
-
-    $mech->submit();
-    ok( $mech->content eq "VALID FORM", "Form submission expected to be valid" );
-}
-else {
-    fail("Form is supposed to be redisplayed");
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/03-attr_param.t b/sources/Catalyst-Controller-FormBuilder/t/03-attr_param.t
deleted file mode 100644
index 24d67ed..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/03-attr_param.t
+++ /dev/null
@@ -1,21 +0,0 @@
-package main;
-
-use FindBin;
-use lib "$FindBin::Bin/lib";
-
-# test usage of: sub edit_item : Local Form('/books/edit2') ...
-
-use Test::More tests => 3;
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-my $page = "books/edit_item";
-$mech->get_ok( "http://localhost/$page", "GET /$page" );
-
-my $form = $mech->current_form;
-ok( $form, "Form found" ) or BAIL_OUT("Can't do anything without a form");
-
-my @inputs = $form->inputs;
-
-# 2 fields from form and 1 hidden state field, 1 submit button
-is( scalar(@inputs), 4, "Form has expected number of fields" );
diff --git a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp.pm b/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp.pm
deleted file mode 100644
index 0cbc7b3..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp.pm
+++ /dev/null
@@ -1,30 +0,0 @@
-package TestApp;
-use strict;
-use warnings;
-use Catalyst;
-use Class::Inspector;
-use FindBin;
-
-our @TEMPLATES = ( 'HTML::Template', 'Mason', 'TT' );
-
-my ( @except, $template_type );
-for (@TEMPLATES) {
-    unless ( Class::Inspector->installed( "Catalyst::View::" . $_ ) ) {
-        push @except, "TestApp::Component::$_";
-    }
-    else {
-        $template_type = $_;
-    }
-}
-
-__PACKAGE__->config(
-    name             => 'TestApp',
-    home             => $FindBin::Bin,
-    setup_components =>
-      { search_extra => ['TestApp::Component'], except => \@except },
-    template_type => $template_type || 'Rendered',
-);
-
-__PACKAGE__->setup();
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/HTML/Template.pm b/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/HTML/Template.pm
deleted file mode 100644
index 7aa676e..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/HTML/Template.pm
+++ /dev/null
@@ -1,22 +0,0 @@
-package TestApp::Component::HTML::Template;
-
-use strict;
-use base 'Catalyst::View::HTML::Template';
-
-use MRO::Compat;
-
-sub new {
-    my $self = shift;
-
-    $self->config(
-        {
-            die_on_bad_params => 0,
-            path              => 
-                TestApp->path_to( 'root', 'src', 'tmpl' ) . '',
-        },
-    );
-    
-    return $self = $self->maybe::next::method(@_)
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Mason.pm b/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Mason.pm
deleted file mode 100644
index 0754228..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Mason.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package TestApp::Component::Mason;
-
-use strict;
-use base 'Catalyst::View::Mason';
-
-use MRO::Compat;
-
-sub new {
-    my $self = shift;
-
-    my $comp_root = TestApp->path_to( 'root', 'src', 'mason' );
-    $self->config->{comp_root} = "$comp_root";
-
-    return $self = $self->maybe::next::method(@_)
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Rendered.pm b/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Rendered.pm
deleted file mode 100644
index f8d4761..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/Rendered.pm
+++ /dev/null
@@ -1,12 +0,0 @@
-package TestApp::Component::Rendered;
-
-use strict;
-use base 'Catalyst::View';
-
-sub process {
-    my ( $self, $c ) = @_;
-
-    $c->response->body( $c->stash->{FormBuilder}->render() );
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/TT.pm b/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/TT.pm
deleted file mode 100644
index d906169..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Component/TT.pm
+++ /dev/null
@@ -1,25 +0,0 @@
-package TestApp::Component::TT;
-
-use strict;
-use base 'Catalyst::View::TT';
-
-use MRO::Compat;
-
-sub new {
-    my $self = shift;
-    $self->config(
-        {
-            INCLUDE_PATH => [
-                TestApp->path_to( 'root', 'src', 'tt2' ),
-                TestApp->path_to( 'root', 'lib', 'tt2' ),
-            ],
-            TEMPLATE_EXTENSION => '.tt',
-            CATALYST_VAR       => 'Catalyst',
-            TIMER              => 0,
-        }
-    );
-    
-    return $self = $self->maybe::next::method(@_)
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Controller/Base.pm b/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Controller/Base.pm
deleted file mode 100644
index 67fc570..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Controller/Base.pm
+++ /dev/null
@@ -1,41 +0,0 @@
-package TestApp::Controller::Base;
-
-use strict;
-use base qw/Catalyst::Controller::FormBuilder/;
-
-# setup is only necessary for running tests
-# since the template system is not known
-
-our @TEMPLATES = ( 'HTML::Template', 'Mason', 'TT' );
-
-sub _get_view : Local {
-    my ( $self, $c ) = @_;
-
-    # default to 'Rendered' view when no template plugin is available
-    # Rendered simply prints FormBuilder->render
-    my $type = $c->config->{template_type};
-
-    my $my_view = "TestApp::Component::$type";
-    if ( $c->component($my_view) ) {
-        return $my_view;
-    }
-}
-
-sub end : Private {
-    my ( $self, $c ) = @_;
-
-    if ( !$c->response->content_type ) {
-        $c->response->content_type('text/html; charset=utf-8');
-    }
-    return 1 if $c->req->method eq 'HEAD';
-    return 1 if length( $c->response->body );
-    return 1 if scalar @{ $c->error } && !$c->stash->{template};
-    return 1 if $c->response->status =~ /^(?:204|3\d\d)$/;
-
-    my $my_view = $c->forward('_get_view')
-      or die "Could not find a view to forward to.\n";
-
-    $c->forward($my_view);
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Controller/Books.pm b/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Controller/Books.pm
deleted file mode 100644
index bf50996..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/lib/TestApp/Controller/Books.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-package TestApp::Controller::Books;
-
-use strict;
-use base qw/TestApp::Controller::Base/;
-
-__PACKAGE__->config(
-    'Controller::FormBuilder' => {
-        method_name => 'formbuilder',
-        stash_name  => 'form',
-    },
-);
-
-sub edit : Local Form {
-    my ( $self, $c, @args ) = @_;
-
-    my $form = $self->formbuilder;
-    $form->field( name => 'email', validate => \&_validate_email );
-
-    if ( $form->submitted ) {
-        if ( $form->validate ) {
-            return $c->response->body("VALID FORM");
-        }
-        else {
-            $c->stash->{ERROR} = "INVALID FORM";
-            $form->field(
-                name  => '_invalid_fields',
-                type  => 'hidden',
-                value => join( "|", grep { !$_->validate } $form->fields )
-            );
-        }
-    }
-
-    $form->method('GET');
-    $c->stash->{template} = "books/edit.tt";
-}
-
-sub _validate_email {
-    my ($email,$c) = @_;
-
-    unless (ref $c eq "TestApp") {
-        die "\$c reference not passed to validate callback";
-    }
-
-    unless ($email =~ /\@/) {
-        return 0;
-    }
-    return 1;
-}
-
-sub edit_item : Local Form('/books/edit2') {
-    my ( $self, $c ) = @_;
-    $c->stash->{template} = "books/edit.tt";
-}
-
-sub basic : Local Form {
-    my ( $self, $c ) = @_;
-
-    $c->stash->{template} = "books/basic.tt";
-    my $form = $self->formbuilder;
-    $form->field( name => 'email', validate => 'EMAIL' );
-}
-
-1;
diff --git a/sources/Catalyst-Controller-FormBuilder/t/root/forms/books/edit.fb b/sources/Catalyst-Controller-FormBuilder/t/root/forms/books/edit.fb
deleted file mode 100644
index 9c5b492..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/root/forms/books/edit.fb
+++ /dev/null
@@ -1,26 +0,0 @@
-name: books_edit
-method: post
-fields:
-    title:
-        label: Book Title
-        type:  text
-        size:  40
-        required: 1
-    author:
-        label: Author's Name
-        type:  text
-        size:  80
-        required: 1
-    isbn:
-        label: ISBN#
-        type:  text
-        size:  20
-        validate: /^(\d{10}|\d{13})$/
-        required: 1
-    desc:
-        label: Description
-        type:  textarea
-        cols:  80
-        rows:  5
-
-submit: Save New Book
\ No newline at end of file
diff --git a/sources/Catalyst-Controller-FormBuilder/t/root/forms/books/edit2.fb b/sources/Catalyst-Controller-FormBuilder/t/root/forms/books/edit2.fb
deleted file mode 100644
index 9f820a0..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/root/forms/books/edit2.fb
+++ /dev/null
@@ -1,15 +0,0 @@
-name: books_edit
-method: post
-fields:
-    title:
-        label: Book Title
-        type:  text
-        size:  40
-        required: 1
-    author:
-        label: Author's Name
-        type:  text
-        size:  80
-        required: 1
-
-submit: Save New Book
\ No newline at end of file
diff --git a/sources/Catalyst-Controller-FormBuilder/t/root/src/mason/books/basic.tt b/sources/Catalyst-Controller-FormBuilder/t/root/src/mason/books/basic.tt
deleted file mode 100644
index 4b48df7..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/root/src/mason/books/basic.tt
+++ /dev/null
@@ -1,7 +0,0 @@
-<%args>
-$form
-</%args>
-<% $form->{start} %>
-<% $form->{field}{email}{label} %> <% $form->{field}{email}{field} %>
-<% $form->{submit} %>
-<% $form->{end} %>
diff --git a/sources/Catalyst-Controller-FormBuilder/t/root/src/mason/books/edit.tt b/sources/Catalyst-Controller-FormBuilder/t/root/src/mason/books/edit.tt
deleted file mode 100644
index 3686e39..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/root/src/mason/books/edit.tt
+++ /dev/null
@@ -1,43 +0,0 @@
-<%args>
-$form
-</%args>
-
-<head>
-  <title><% $form->{title} %></title>
-  <% $form->{jshead} %>
-</head>
-<body>
-
-  <div id="form">
-  <% $form->{start} %>
-
-% my $fields = $form->{fields} || [];
-% for my $field (@$fields) {
-    <div id="<% $field->{name} %>">
-      <div class="label">
-        <% $field->{required}
-              ? "<span class='required'>$field->{label}</span>"
-              : $field->{label}
-        %>
-      </div>
-      <div class="field">
-        <% $field->{field} %>
-        % if ( $field->{invalid} ) {
-            <span class="error">
-                Missing or invalid entry, please try again.
-            </error>
-        % }
-      </div>
-    </div>
-
-% }
-    <div id="submit"><% $form->{submit} %></div>
-    <div id="reset"><% $form->{reset} %></div>
-    <div id="state">
-      <% # The following two tags include state information %>
-      <% $form->{statetags}  %>
-      <% $form->{keepextras} %>
-    </div>
-  <% $form->{end} %>
-  </div>
-</body>
\ No newline at end of file
diff --git a/sources/Catalyst-Controller-FormBuilder/t/root/src/tmpl/books/basic.tt b/sources/Catalyst-Controller-FormBuilder/t/root/src/tmpl/books/basic.tt
deleted file mode 100644
index 870d4fd..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/root/src/tmpl/books/basic.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-<tmpl_var form-start>
-<tmpl_var form-statetags>
-<tmpl_var form-keepextras>
-<tmpl_var label-email> <tmpl_var field-email>
-<tmpl_var form-submit>
-<tmpl_var form-end>
diff --git a/sources/Catalyst-Controller-FormBuilder/t/root/src/tmpl/books/edit.tt b/sources/Catalyst-Controller-FormBuilder/t/root/src/tmpl/books/edit.tt
deleted file mode 100644
index 3880763..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/root/src/tmpl/books/edit.tt
+++ /dev/null
@@ -1,28 +0,0 @@
-<head>
-  <title><tmpl_var form-title></title>
-  <tmpl_var form-jshead>
-</head>
-<body>
-
-  <div id="form">
-  <tmpl_var form-start>
-    <tmpl_loop fields>
-      <div class="label">
-       <tmpl_var NAME=label>
-      </div>
-      <div class="field">
-       <tmpl_var NAME=field>
-      </div>
-    </tmpl_loop>
-
-    <div id="submit"><tmpl_var form-submit></div>
-    <div id="reset"><tmpl_var form-reset></div>
-    <div id="state">
-      <tmpl_var form-statetags>
-      <tmpl_var form-keepextras>
-    </div>
-
-  <tmpl_var form-end>
-  </div>
-</body>
-</html>
diff --git a/sources/Catalyst-Controller-FormBuilder/t/root/src/tt2/books/basic.tt b/sources/Catalyst-Controller-FormBuilder/t/root/src/tt2/books/basic.tt
deleted file mode 100644
index c3461a8..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/root/src/tt2/books/basic.tt
+++ /dev/null
@@ -1,4 +0,0 @@
-[% form.start %]
-[% form.field.email.label %] [% form.field.email.field %]
-[% form.submit %]
-[% form.end %]
diff --git a/sources/Catalyst-Controller-FormBuilder/t/root/src/tt2/books/edit.tt b/sources/Catalyst-Controller-FormBuilder/t/root/src/tt2/books/edit.tt
deleted file mode 100755
index 6890cc0..0000000
--- a/sources/Catalyst-Controller-FormBuilder/t/root/src/tt2/books/edit.tt
+++ /dev/null
@@ -1,37 +0,0 @@
-<head>
-  <title>[% form.title %]</title>
-  [% form.jshead %]
-</head>
-<body>
-  [% IF ERROR %]<span id="error">[% ERROR %]</span>[% END %]
-
-  <div id="form">
-  [% form.start %]
-    [% FOREACH field IN form.fields %]
-    <div id="[%- field.name -%]">
-      <div class="label">
-        [% field.required
-              ? "<span class='required'>$field.label</span>"
-              : field.label
-        %]
-      </div>
-      <div class="field">
-        [% field.field %]
-        [% IF field.invalid %]
-            <span class="error">
-                Missing or invalid entry, please try again.
-            </error>
-        [% END %]
-      </div>
-    </div>
-    [% END %]
-    <div id="submit">[% form.submit %]</div>
-    <div id="reset">[% form.reset %]</div>
-    <div id="state">
-      [% # The following two tags include state information %]
-      [% form.statetags  %]
-      [% form.keepextras %]
-    </div>
-  [% form.end %]
-  </div>
-</body>
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatalyst-modules-perl.git



More information about the Pkg-perl-cvs-commits mailing list