[libcatalyst-modules-perl] 01/01: replace bundled Catalyst-Controller-HTML-FormFu with a dependency on libcatalyst-controller-html-formfu-perl

Damyan Ivanov dmn at moszumanska.debian.org
Wed May 14 20:46:33 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 37bf9cde7497178deffbbe687cf3c4c509b3f607
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed May 14 20:46:27 2014 +0000

    replace bundled Catalyst-Controller-HTML-FormFu with a dependency on libcatalyst-controller-html-formfu-perl
---
 bundle/05/Catalyst-Controller-HTML-FormFu          |   1 -
 debian/control                                     |   1 +
 debian/copyright                                   |   5 -
 sources/Catalyst-Controller-HTML-FormFu/Changes    | 130 ----
 sources/Catalyst-Controller-HTML-FormFu/LICENSE    | 379 -----------
 sources/Catalyst-Controller-HTML-FormFu/MANIFEST   |  48 --
 sources/Catalyst-Controller-HTML-FormFu/META.yml   |  39 --
 .../Catalyst-Controller-HTML-FormFu/Makefile.PL    |  91 ---
 sources/Catalyst-Controller-HTML-FormFu/README     |  13 -
 sources/Catalyst-Controller-HTML-FormFu/dist.ini   |  41 --
 .../lib/Catalyst/Controller/HTML/FormFu.pm         | 754 ---------------------
 .../Catalyst/Controller/HTML/FormFu/Action/Form.pm |  36 -
 .../Controller/HTML/FormFu/Action/FormConfig.pm    |  55 --
 .../Controller/HTML/FormFu/Action/FormMethod.pm    |  46 --
 .../Controller/HTML/FormFu/Action/MultiForm.pm     |  38 --
 .../HTML/FormFu/Action/MultiFormConfig.pm          |  58 --
 .../HTML/FormFu/Action/MultiFormMethod.pm          |  48 --
 .../Controller/HTML/FormFu/ActionBase/Form.pm      | 143 ----
 .../lib/Catalyst/Helper/HTML/FormFu.pm             |  96 ---
 .../lib/HTML/FormFu/Constraint/RequestToken.pm     |  23 -
 .../lib/HTML/FormFu/Element/RequestToken.pm        | 167 -----
 .../lib/HTML/FormFu/Plugin/RequestToken.pm         |  32 -
 .../t-aggregate/01basic-form.t                     |  17 -
 .../t-aggregate/01basic-formconfig.t               |  49 --
 .../t-aggregate/01basic-formconfig_conf_ext.t      |  16 -
 .../t-aggregate/01basic-formmethod.t               |  17 -
 .../t-aggregate/01basic-token.t                    |  76 ---
 .../t-aggregate/02multiform-multiformconfig.t      |  69 --
 .../t-aggregate/02multiform-multiformmethod.t      |  69 --
 .../t-aggregate/02multiform-token.t                |  60 --
 .../t-aggregate/03instancepercontext.t             |  15 -
 .../t-aggregate/elements/requesttoken.t            |  31 -
 .../t-aggregate/elements/requesttoken.yml          |   4 -
 .../t-aggregate/multiform-file-upload.t            |  82 ---
 .../Catalyst-Controller-HTML-FormFu/t/aggregate.t  |  10 -
 .../t/btn_120x50_built.png                         | Bin 3826 -> 0 bytes
 .../t/btn_88x31_built.png                          | Bin 2517 -> 0 bytes
 .../t/lib/TestApp.pm                               |  22 -
 .../t/lib/TestApp/Controller/Basic.pm              |  64 --
 .../t/lib/TestApp/Controller/MultiForm.pm          |  89 ---
 .../t/lib/TestApp/Controller/MultiFormToken.pm     |  59 --
 .../t/lib/TestApp/Controller/Root.pm               |  12 -
 .../t/lib/TestApp/Controller/Token.pm              |  38 --
 .../t/lib/TestApp/Controller/TokenExpire.pm        |  32 -
 .../t/lib/TestApp/View/TT.pm                       |   8 -
 .../Catalyst-Controller-HTML-FormFu/t/root/form.tt |   6 -
 .../t/root/forms/basic/formconfig.yml              |   9 -
 .../t/root/forms/basic/formconfig_conf_ext.yml     |   3 -
 .../t/root/forms/multiform/file_upload.yml         |  17 -
 .../t/root/forms/multiform/formconfig.yml          |  15 -
 .../t/root/multiform.tt                            |  10 -
 51 files changed, 1 insertion(+), 3142 deletions(-)

diff --git a/bundle/05/Catalyst-Controller-HTML-FormFu b/bundle/05/Catalyst-Controller-HTML-FormFu
deleted file mode 120000
index 8e49e91..0000000
--- a/bundle/05/Catalyst-Controller-HTML-FormFu
+++ /dev/null
@@ -1 +0,0 @@
-../../sources/Catalyst-Controller-HTML-FormFu
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 17efa14..c26f206 100644
--- a/debian/control
+++ b/debian/control
@@ -107,6 +107,7 @@ Depends: ${misc:Depends},
          libcatalyst-authentication-store-dbix-class-perl,
          libcatalyst-component-instancepercontext-perl,
          libcatalyst-controller-formbuilder-perl,
+         libcatalyst-controller-html-formfu-perl,
          libcatalyst-model-dbi-perl,
          libcatalyst-model-dbic-schema-perl,
          libcatalyst-plugin-authentication-perl,
diff --git a/debian/copyright b/debian/copyright
index aaedda0..43d4d7f 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-HTML-FormFu
-Copyright: 2013, Carl Franks <cfranks at cpan.org>
-X-Upstream-Maintainers: Carl Franks <cfranks at cpan.org>
-License: Artistic or GPL-1+
-
 Files: sources/Catalyst-Plugin-Authorization-ACL
 Copyright: 2005-2009, Yuval Kogman <nothingmuch at woobling.org>
  2005-2009, Jess Robinson <cpan at desert-island.me.uk>
diff --git a/sources/Catalyst-Controller-HTML-FormFu/Changes b/sources/Catalyst-Controller-HTML-FormFu/Changes
deleted file mode 100644
index 176c57d..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/Changes
+++ /dev/null
@@ -1,130 +0,0 @@
-1.00 2013-12-16
-
-    - Updated for HTML-FormFu v1.00
-    
-    - Only require MultiForm at runtime when needed
-
-0.09004 2012-09-11
-
-    - switch from MooseX::ChainedAccessors to MooseX::Attribute::Chained
-
-0.09003 2011-05-12
-
-     - depend on HTML::FormFu 0.09
-
-0.09002 2011-05-11
-
-    - fixes #67404 (Missing dependency on MooseX::ChainedAccessors)
-
-    - fixes #67571 (Minimum requirement for HTML::FormFu is 0.9002)
-      actually it just requires MooseX::ChainedAccessors
-
-    - hopefully fixes 539965f0-7b0f-11e0-b729-7181c0b02281
-
-0.09001 2011-05-10
-
-    - fixed problem with build_per_context_instance that caused errors
-      like http://paste.scsys.co.uk/102966
-
-0.09000 2011-03-29
-
-    - Fix mem leak
-    
-    - Resolve Moose extends/runtime bug RT #55780
-    
-    - fix RequestToken classes to work with new Moosified HTML-FormFu
-
-0.08002 2010-09-22
-
-    - Incompatible Change: removed all previously deprecated methods.
-
-0.06001 2009-12-10
-
-    - Test setting __uri_for(x)__ in a config file.
-
-0.06000 2009-11-25
-
-    - MultiForm actions now also always stash $multi->current_form
-      to $c->stash->{form}.
-      (key-name configurable via 'form_stash' config option).
-    
-    - New method suffixes such as "_FORM_VALID", "_FORM_SUBMITTED" to allow
-      blocks of code that will only be run under certain circumstances.
-
-0.05000 2009-07-06
-
-    - Fix RequestToken to be a hidden field.
-    
-    - Fix compatibility problem with moosified controllers.
-    
-    - use tests_recursive() so all tests are run correctly.
-
-0.04003 2009-04-20
-
-    - Fix missing prereqs
-
-0.04002 2009-04-20
-
-    - Switch to use MRO::Compat
-
-0.04001 2009-04-15
-
-    - New RequestToken feature to stop double-submissions of data.
-    
-    - Silence "Reference is already weak" warnings.
-    
-    - Add distribution description to pod (RT #41568)
-
-0.03007 2008-12-08
-
-    - Bump required version no. of HTML-FormFu to 0.03007
-
-0.03006 2008-12-03
-
-    - Deprecated config setting $config->{config_file_path}
-      use $config->{constructor}{config_file_path} instead.
-    
-    - Bumped HTML-FormFu prereq - need 0.03004 for load_config_filestem()
-      support.
-
-0.03004 2008-09-03
-
-    - 'config_file_ext' config setting has been removed.
-    
-    - Automatically search for form config files with any extension
-      supported by Config::Any.
-    
-    - Add __config()__ callback.
-    
-    - Support filestems (without extensions) in the FormConfig('file')
-      attribute syntax.
-    
-    - Forms returned by form() now have the query set with the Catalyst
-      request object.
-    
-    - Switched from ACCEPT_CONTEXT to using
-      Catalyst::Component::InstancePerContext - recommended by mst.
-    
-    - Changed config examples to Config::General, to match Catalyst's
-      core documentation.
-
-0.03000 2008-06-19
-
-	- Documented 'model_stash' option.
-	- New Multi* actions - not documented yet - need further testing.
-
-0.02000 2007-12-12
-
-	- Only set INCLUDE_PATH if it's not already set, and if 'root/formfu' 
-	  exists.
-	- Use of $form->render_class_args() changed to tt_args()
-	- Added support for expanding __path_to()__ in config callback
-
-0.01002 2007-09-12
-
-	- No longer use HTML::FormFu::Preload - tradeoff CPU for RAM
-	- Fix circular reference / memory leak
-
-0.01001	2007-08-22
-
-	- First CPAN release
diff --git a/sources/Catalyst-Controller-HTML-FormFu/LICENSE b/sources/Catalyst-Controller-HTML-FormFu/LICENSE
deleted file mode 100644
index ce33785..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/LICENSE
+++ /dev/null
@@ -1,379 +0,0 @@
-This software is copyright (c) 2013 by Carl Franks.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
-Terms of the Perl programming language system itself
-
-a) the GNU General Public License as published by the Free
-   Software Foundation; either version 1, or (at your option) any
-   later version, or
-b) the "Artistic License"
-
---- The GNU General Public License, Version 1, February 1989 ---
-
-This software is Copyright (c) 2013 by Carl Franks.
-
-This is free software, licensed under:
-
-  The GNU General Public License, Version 1, February 1989
-
-                    GNU GENERAL PUBLIC LICENSE
-                     Version 1, February 1989
-
- Copyright (C) 1989 Free Software Foundation, Inc.
- 51 Franklin St, Suite 500, Boston, MA  02110-1335  USA
-
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The license agreements of most software companies try to keep users
-at the mercy of those companies.  By contrast, our General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  The
-General Public License applies to the Free Software Foundation's
-software and to any other program whose authors commit to using it.
-You can use it for your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Specifically, the General Public License is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free
-programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of a such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must tell them their rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any program or other work which
-contains a notice placed by the copyright holder saying it may be
-distributed under the terms of this General Public License.  The
-"Program", below, refers to any such program or work, and a "work based
-on the Program" means either the Program or any work containing the
-Program or a portion of it, either verbatim or with modifications.  Each
-licensee is addressed as "you".
-
-  1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-General Public License and to the absence of any warranty; and give any
-other recipients of the Program a copy of this General Public License
-along with the Program.  You may charge a fee for the physical act of
-transferring a copy.
-
-  2. You may modify your copy or copies of the Program or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
-    a) cause the modified files to carry prominent notices stating that
-    you changed the files and the date of any change; and
-
-    b) cause the whole of any work that you distribute or publish, that
-    in whole or in part contains the Program or any part thereof, either
-    with or without modifications, to be licensed at no charge to all
-    third parties under the terms of this General Public License (except
-    that you may choose to grant warranty protection to some or all
-    third parties, at your option).
-
-    c) If the modified program normally reads commands interactively when
-    run, you must cause it, when started running for such interactive use
-    in the simplest and most usual way, to print or display an
-    announcement including an appropriate copyright notice and a notice
-    that there is no warranty (or else, saying that you provide a
-    warranty) and that users may redistribute the program under these
-    conditions, and telling the user how to view a copy of this General
-    Public License.
-
-    d) You may charge a fee for the physical act of transferring a
-    copy, and you may at your option offer warranty protection in
-    exchange for a fee.
-
-Mere aggregation of another independent work with the Program (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
-  3. You may copy and distribute the Program (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
-    a) accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    b) accompany it with a written offer, valid for at least three
-    years, to give any third party free (except for a nominal charge
-    for the cost of distribution) a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    c) accompany it with the information you received as to where the
-    corresponding source code may be obtained.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it.  For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
-  4. You may not copy, modify, sublicense, distribute or transfer the
-Program except as expressly provided under this General Public License.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Program is void, and will automatically terminate your rights to use
-the Program under this License.  However, parties who have received
-copies, or rights to use copies, from you under this General Public
-License will not have their licenses terminated so long as such parties
-remain in full compliance.
-
-  5. By copying, distributing or modifying the Program (or any work based
-on the Program) you indicate your acceptance of this license to do so,
-and all its terms and conditions.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these
-terms and conditions.  You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein.
-
-  7. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of the license which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-the license, you may choose any version ever published by the Free Software
-Foundation.
-
-  8. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-        Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to humanity, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-  To do so, attach the following notices to the program.  It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19xx name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  program `Gnomovision' (a program to direct compilers to make passes
-  at assemblers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
---- The Artistic License 1.0 ---
-
-This software is Copyright (c) 2013 by Carl Franks.
-
-This is free software, licensed under:
-
-  The Artistic License 1.0
-
-The Artistic License
-
-Preamble
-
-The intent of this document is to state the conditions under which a Package
-may be copied, such that the Copyright Holder maintains some semblance of
-artistic control over the development of the package, while giving the users of
-the package the right to use and distribute the Package in a more-or-less
-customary fashion, plus the right to make reasonable modifications.
-
-Definitions:
-
-  - "Package" refers to the collection of files distributed by the Copyright
-    Holder, and derivatives of that collection of files created through
-    textual modification. 
-  - "Standard Version" refers to such a Package if it has not been modified,
-    or has been modified in accordance with the wishes of the Copyright
-    Holder. 
-  - "Copyright Holder" is whoever is named in the copyright or copyrights for
-    the package. 
-  - "You" is you, if you're thinking about copying or distributing this Package.
-  - "Reasonable copying fee" is whatever you can justify on the basis of media
-    cost, duplication charges, time of people involved, and so on. (You will
-    not be required to justify it to the Copyright Holder, but only to the
-    computing community at large as a market that must bear the fee.) 
-  - "Freely Available" means that no fee is charged for the item itself, though
-    there may be fees involved in handling the item. It also means that
-    recipients of the item may redistribute it under the same conditions they
-    received it. 
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications derived
-from the Public Domain or from the Copyright Holder. A Package modified in such
-a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided that
-you insert a prominent notice in each changed file stating how and when you
-changed that file, and provided that you do at least ONE of the following:
-
-  a) place your modifications in the Public Domain or otherwise make them
-     Freely Available, such as by posting said modifications to Usenet or an
-     equivalent medium, or placing the modifications on a major archive site
-     such as ftp.uu.net, or by allowing the Copyright Holder to include your
-     modifications in the Standard Version of the Package.
-
-  b) use the modified Package only within your corporation or organization.
-
-  c) rename any non-standard executables so the names do not conflict with
-     standard executables, which must also be provided, and provide a separate
-     manual page for each non-standard executable that clearly documents how it
-     differs from the Standard Version.
-
-  d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or executable
-form, provided that you do at least ONE of the following:
-
-  a) distribute a Standard Version of the executables and library files,
-     together with instructions (in the manual page or equivalent) on where to
-     get the Standard Version.
-
-  b) accompany the distribution with the machine-readable source of the Package
-     with your modifications.
-
-  c) accompany any non-standard executables with their corresponding Standard
-     Version executables, giving the non-standard executables non-standard
-     names, and clearly documenting the differences in manual pages (or
-     equivalent), together with instructions on where to get the Standard
-     Version.
-
-  d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this Package. You
-may not charge a fee for this Package itself. However, you may distribute this
-Package in aggregate with other (possibly commercial) programs as part of a
-larger (possibly commercial) software distribution provided that you do not
-advertise this Package as a product of your own.
-
-6. The scripts and library files supplied as input to or produced as output
-from the programs of this Package do not automatically fall under the copyright
-of this Package, but belong to whomever generated them, and may be sold
-commercially, and may be aggregated with this Package.
-
-7. C or perl subroutines supplied by you and linked into this Package shall not
-be considered part of this Package.
-
-8. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-The End
-
diff --git a/sources/Catalyst-Controller-HTML-FormFu/MANIFEST b/sources/Catalyst-Controller-HTML-FormFu/MANIFEST
deleted file mode 100644
index 8b77ceb..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/MANIFEST
+++ /dev/null
@@ -1,48 +0,0 @@
-Changes
-LICENSE
-MANIFEST
-META.yml
-Makefile.PL
-README
-dist.ini
-lib/Catalyst/Controller/HTML/FormFu.pm
-lib/Catalyst/Controller/HTML/FormFu/Action/Form.pm
-lib/Catalyst/Controller/HTML/FormFu/Action/FormConfig.pm
-lib/Catalyst/Controller/HTML/FormFu/Action/FormMethod.pm
-lib/Catalyst/Controller/HTML/FormFu/Action/MultiForm.pm
-lib/Catalyst/Controller/HTML/FormFu/Action/MultiFormConfig.pm
-lib/Catalyst/Controller/HTML/FormFu/Action/MultiFormMethod.pm
-lib/Catalyst/Controller/HTML/FormFu/ActionBase/Form.pm
-lib/Catalyst/Helper/HTML/FormFu.pm
-lib/HTML/FormFu/Constraint/RequestToken.pm
-lib/HTML/FormFu/Element/RequestToken.pm
-lib/HTML/FormFu/Plugin/RequestToken.pm
-t-aggregate/01basic-form.t
-t-aggregate/01basic-formconfig.t
-t-aggregate/01basic-formconfig_conf_ext.t
-t-aggregate/01basic-formmethod.t
-t-aggregate/01basic-token.t
-t-aggregate/02multiform-multiformconfig.t
-t-aggregate/02multiform-multiformmethod.t
-t-aggregate/02multiform-token.t
-t-aggregate/03instancepercontext.t
-t-aggregate/elements/requesttoken.t
-t-aggregate/elements/requesttoken.yml
-t-aggregate/multiform-file-upload.t
-t/aggregate.t
-t/btn_120x50_built.png
-t/btn_88x31_built.png
-t/lib/TestApp.pm
-t/lib/TestApp/Controller/Basic.pm
-t/lib/TestApp/Controller/MultiForm.pm
-t/lib/TestApp/Controller/MultiFormToken.pm
-t/lib/TestApp/Controller/Root.pm
-t/lib/TestApp/Controller/Token.pm
-t/lib/TestApp/Controller/TokenExpire.pm
-t/lib/TestApp/View/TT.pm
-t/root/form.tt
-t/root/forms/basic/formconfig.yml
-t/root/forms/basic/formconfig_conf_ext.yml
-t/root/forms/multiform/file_upload.yml
-t/root/forms/multiform/formconfig.yml
-t/root/multiform.tt
diff --git a/sources/Catalyst-Controller-HTML-FormFu/META.yml b/sources/Catalyst-Controller-HTML-FormFu/META.yml
deleted file mode 100644
index deab978..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/META.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-abstract: 'Catalyst integration for HTML::FormFu'
-author:
-  - 'Carl Franks <cpan at fireartist.com>'
-build_requires:
-  Catalyst::Action::RenderView: 0
-  Catalyst::Plugin::Session: 0
-  Catalyst::Plugin::Session::State::Cookie: 0
-  Catalyst::Plugin::Session::Store::File: 0
-  Catalyst::View::TT: 0
-  Template: 0
-  Test::Aggregate::Nested: 0.371
-  Test::More: 0.92
-  Test::WWW::Mechanize: 1.16
-  Test::WWW::Mechanize::Catalyst: 0
-configure_requires:
-  ExtUtils::MakeMaker: 6.30
-dynamic_config: 0
-generated_by: 'Dist::Zilla version 5.006, CPAN::Meta::Converter version 2.133380'
-license: perl
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
-name: Catalyst-Controller-HTML-FormFu
-requires:
-  Catalyst::Component::InstancePerContext: 0
-  Catalyst::Runtime: 5.71001
-  Config::Any: 0
-  File::Spec: 0
-  HTML::FormFu: 1.00
-  Moose: 1.00
-  MooseX::Attribute::Chained: v1.0.1
-  Regexp::Assemble: 0
-  Scalar::Util: 0
-  Task::Weaken: 0
-  namespace::autoclean: 0
-resources:
-  repository: git://github.com/fireartist/Catalyst-Controller-HTML-FormFu.git
-version: 1.00
diff --git a/sources/Catalyst-Controller-HTML-FormFu/Makefile.PL b/sources/Catalyst-Controller-HTML-FormFu/Makefile.PL
deleted file mode 100644
index 10e62d5..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/Makefile.PL
+++ /dev/null
@@ -1,91 +0,0 @@
-
-use strict;
-use warnings;
-
-
-
-use ExtUtils::MakeMaker 6.30;
-
-
-
-my %WriteMakefileArgs = (
-  "ABSTRACT" => "Catalyst integration for HTML::FormFu",
-  "AUTHOR" => "Carl Franks <cpan\@fireartist.com>",
-  "BUILD_REQUIRES" => {},
-  "CONFIGURE_REQUIRES" => {
-    "ExtUtils::MakeMaker" => "6.30"
-  },
-  "DISTNAME" => "Catalyst-Controller-HTML-FormFu",
-  "EXE_FILES" => [],
-  "LICENSE" => "perl",
-  "NAME" => "Catalyst::Controller::HTML::FormFu",
-  "PREREQ_PM" => {
-    "Catalyst::Component::InstancePerContext" => 0,
-    "Catalyst::Runtime" => "5.71001",
-    "Config::Any" => 0,
-    "File::Spec" => 0,
-    "HTML::FormFu" => "1.00",
-    "Moose" => "1.00",
-    "MooseX::Attribute::Chained" => "v1.0.1",
-    "Regexp::Assemble" => 0,
-    "Scalar::Util" => 0,
-    "Task::Weaken" => 0,
-    "namespace::autoclean" => 0
-  },
-  "TEST_REQUIRES" => {
-    "Catalyst::Action::RenderView" => 0,
-    "Catalyst::Plugin::Session" => 0,
-    "Catalyst::Plugin::Session::State::Cookie" => 0,
-    "Catalyst::Plugin::Session::Store::File" => 0,
-    "Catalyst::View::TT" => 0,
-    "Template" => 0,
-    "Test::Aggregate::Nested" => "0.371",
-    "Test::More" => "0.92",
-    "Test::WWW::Mechanize" => "1.16",
-    "Test::WWW::Mechanize::Catalyst" => 0
-  },
-  "VERSION" => "1.00",
-  "test" => {
-    "TESTS" => "t/*.t"
-  }
-);
-
-
-my %FallbackPrereqs = (
-  "Catalyst::Action::RenderView" => 0,
-  "Catalyst::Component::InstancePerContext" => 0,
-  "Catalyst::Plugin::Session" => 0,
-  "Catalyst::Plugin::Session::State::Cookie" => 0,
-  "Catalyst::Plugin::Session::Store::File" => 0,
-  "Catalyst::Runtime" => "5.71001",
-  "Catalyst::View::TT" => 0,
-  "Config::Any" => 0,
-  "File::Spec" => 0,
-  "HTML::FormFu" => "1.00",
-  "Moose" => "1.00",
-  "MooseX::Attribute::Chained" => "v1.0.1",
-  "Regexp::Assemble" => 0,
-  "Scalar::Util" => 0,
-  "Task::Weaken" => 0,
-  "Template" => 0,
-  "Test::Aggregate::Nested" => "0.371",
-  "Test::More" => "0.92",
-  "Test::WWW::Mechanize" => "1.16",
-  "Test::WWW::Mechanize::Catalyst" => 0,
-  "namespace::autoclean" => 0
-);
-
-
-unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
-  delete $WriteMakefileArgs{TEST_REQUIRES};
-  delete $WriteMakefileArgs{BUILD_REQUIRES};
-  $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
-}
-
-delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
-  unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
-
-WriteMakefile(%WriteMakefileArgs);
-
-
-
diff --git a/sources/Catalyst-Controller-HTML-FormFu/README b/sources/Catalyst-Controller-HTML-FormFu/README
deleted file mode 100644
index 24c7cd7..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/README
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-This archive contains the distribution Catalyst-Controller-HTML-FormFu,
-version 1.00:
-
-  Catalyst integration for HTML::FormFu
-
-This software is copyright (c) 2013 by Carl Franks.
-
-This is free software; you can redistribute it and/or modify it under
-the same terms as the Perl 5 programming language system itself.
-
-
diff --git a/sources/Catalyst-Controller-HTML-FormFu/dist.ini b/sources/Catalyst-Controller-HTML-FormFu/dist.ini
deleted file mode 100644
index 2b4c3e7..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/dist.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-name    = Catalyst-Controller-HTML-FormFu
-author  = Carl Franks <cpan at fireartist.com>
-license = Perl_5
-copyright_holder = Carl Franks
-copyright_year   = 2013
-
-version = 1.00
-
-[Prereqs]
-Catalyst::Runtime = 5.71001
-Catalyst::Component::InstancePerContext = 0
-Config::Any = 0
-File::Spec = 0
-HTML::FormFu = 1.00
-Moose = 1.00
-MooseX::Attribute::Chained = 1.0.1
-Regexp::Assemble = 0
-Scalar::Util = 0
-Task::Weaken = 0 ; make sure Scalar::Util has weaken()
-namespace::autoclean = 0
-
-[Prereqs / TestRequires]
-Catalyst::Action::RenderView = 0
-Catalyst::Plugin::Session = 0
-Catalyst::Plugin::Session::State::Cookie = 0
-Catalyst::Plugin::Session::Store::File = 0
-Catalyst::View::TT = 0
-Template = 0
-Test::Aggregate::Nested = 0.371
-Test::WWW::Mechanize::Catalyst = 0
-Test::WWW::Mechanize = 1.16 ; post_ok came in 1.16
-Test::More = 0.92 ; done_testing
-
-[PkgVersion]
-
-[NextRelease]
-format = %v %{yyyy-MM-dd}d
-
-[Repository]
-
-[@Basic]
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu.pm
deleted file mode 100644
index c88d5ad..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu.pm
+++ /dev/null
@@ -1,754 +0,0 @@
-package Catalyst::Controller::HTML::FormFu;
-{
-  $Catalyst::Controller::HTML::FormFu::VERSION = '1.00';
-}
-use Moose;
-
-use HTML::FormFu;
-use Config::Any;
-use Regexp::Assemble;
-use Scalar::Util qw/ isweak weaken /;
-use Carp qw/ croak /;
-
-use namespace::autoclean;
-
-# see https://rt.cpan.org/Ticket/Display.html?id=55780
-BEGIN {
-    extends 'Catalyst::Controller';
-}
-
-with 'Catalyst::Component::InstancePerContext';
-
-has _html_formfu_config => ( is => 'rw' );
-
-sub build_per_context_instance {
-    my ( $self, $c ) = @_;
-    return $self unless(ref $c);
-    $self->{c} = $c;
-    
-    weaken( $self->{c} )
-        if !isweak( $self->{c} );
-
-    return $self;
-}
-
-sub BUILD {}
-
-after BUILD => sub {
-    my ( $self ) = @_;
-
-    my $app = $self->_app;
-    my $self_config   = $self->config->{'Controller::HTML::FormFu'} || {};
-    my $parent_config = $app->config->{'Controller::HTML::FormFu'}  || {};
-
-    my %defaults = (
-        request_token_enable          => 0,
-        request_token_field_name      => '_token',
-        request_token_session_key     => '__token',
-        request_token_expiration_time => 3600,
-        form_method                   => 'form',
-        form_stash                    => 'form',
-        form_attr                     => 'Form',
-        config_attr                   => 'FormConfig',
-        method_attr                   => 'FormMethod',
-        form_action => "Catalyst::Controller::HTML::FormFu::Action::Form",
-        config_action =>
-            "Catalyst::Controller::HTML::FormFu::Action::FormConfig",
-        method_action =>
-            "Catalyst::Controller::HTML::FormFu::Action::FormMethod",
-
-        multiform_method      => 'multiform',
-        multiform_stash       => 'multiform',
-        multiform_attr        => 'MultiForm',
-        multiform_config_attr => 'MultiFormConfig',
-        multiform_method_attr => 'MultiFormMethod',
-        multiform_action =>
-            "Catalyst::Controller::HTML::FormFu::Action::MultiForm",
-        multiform_config_action =>
-            "Catalyst::Controller::HTML::FormFu::Action::MultiFormConfig",
-        multiform_method_action =>
-            "Catalyst::Controller::HTML::FormFu::Action::MultiFormMethod",
-
-        context_stash => 'context',
-
-        model_stash => {},
-
-        constructor           => {},
-        multiform_constructor => {},
-
-        config_callback => 1,
-    );
-
-    my %args = ( %defaults, %$parent_config, %$self_config );
-
-    my $local_path = $app->path_to( 'root', 'formfu' );
-
-    if (   !exists $args{constructor}{tt_args}
-        || !exists $args{constructor}{tt_args}{INCLUDE_PATH} && -d $local_path )
-    {
-        $args{constructor}{tt_args}{INCLUDE_PATH} = [$local_path];
-    }
-
-    $args{constructor}{query_type} ||= 'Catalyst';
-
-    if ( !exists $args{constructor}{config_file_path} ) {
-        $args{constructor}{config_file_path} = $app->path_to( 'root', 'forms' );
-    }
-
-    # build regexp of file extensions
-    my $regex_builder = Regexp::Assemble->new;
-
-    map { $regex_builder->add($_) } Config::Any->extensions;
-
-    $args{_file_ext_regex} = $regex_builder->re;
-
-    # save config for use by action classes
-    $self->_html_formfu_config( \%args );
-
-    # add controller methods
-    no strict 'refs';
-    *{"$args{form_method}"}      = \&_form;
-    *{"$args{multiform_method}"} = \&_multiform;
-};
-
-sub _form {
-    my $self   = shift;
-    my $config = $self->_html_formfu_config;
-    my $form   = HTML::FormFu->new( {
-            %{ $self->_html_formfu_config->{constructor} },
-            ( @_ ? %{ $_[0] } : () ),
-        } );
-
-    $self->_common_construction($form);
-
-    if ( $config->{request_token_enable} ) {
-        $form->plugins( {
-                type            => 'RequestToken',
-                context         => $config->{context_stash},
-                field_name      => $config->{request_token_field_name},
-                session_key     => $config->{request_token_session_key},
-                expiration_time => $config->{request_token_expiration_time} } );
-    }
-
-    return $form;
-}
-
-sub _multiform {
-    my $self = shift;
-
-    require HTML::FormFu::MultiForm;
-
-    my $multi = HTML::FormFu::MultiForm->new( {
-            %{ $self->_html_formfu_config->{constructor} },
-            %{ $self->_html_formfu_config->{multiform_constructor} },
-            ( @_ ? %{ $_[0] } : () ),
-        } );
-
-    $self->_common_construction($multi);
-
-    return $multi;
-}
-
-sub _common_construction {
-    my ( $self, $form ) = @_;
-
-    croak "form or multi arg required" if !defined $form;
-
-    $form->query( $self->{c}->request );
-
-    my $config = $self->_html_formfu_config;
-
-    if ( $config->{config_callback} ) {
-        $form->config_callback( {
-                plain_value => sub {
-                    return if !defined $_;
-                    s{__uri_for\((.+?)\)__}
-                     { $self->{c}->uri_for( split( '\s*,\s*', $1 ) ) }eg
-                        if /__uri_for\(/;
-                    
-                    s{__path_to\(\s*(.+?)\s*\)__}
-                     { $self->{c}->path_to( split( '\s*,\s*', $1 ) ) }eg
-                        if /__path_to\(/;
-                    
-                    s{__config\((.+?)\)__}
-                     { $self->{c}->config->{$1}  }eg
-                        if /__config\(/;
-                    }
-            } );
-
-        weaken( $self->{c} )
-            if !isweak( $self->{c} );
-    }
-
-    if ( $config->{languages_from_context} ) {
-        $form->languages( $self->{c}->languages );
-    }
-
-    if ( $config->{localize_from_context} ) {
-        $form->add_localize_object( $self->{c} );
-    }
-
-    if ( $config->{default_action_use_name} ) {
-        my $action = $self->{c}->uri_for( $self->{c}->{action}->name );
-
-        $self->{c}
-            ->log->debug( "FormFu - Setting default action by name: $action" )
-            if $self->{c}->debug;
-
-        $form->action($action);
-    }
-    elsif ( $config->{default_action_use_path} ) {
-        my $action = $self->{c}->{request}->base . $self->{c}->{request}->path;
-
-        $self->{c}
-            ->log->debug( "FormFu - Setting default action by path: $action" )
-            if $self->{c}->debug;
-
-        $form->action($action);
-    }
-
-    my $context_stash = $config->{context_stash};
-    $form->stash->{$context_stash} = $self->{c};
-    weaken( $form->stash->{$context_stash} );
-
-    my $model_stash = $config->{model_stash};
-
-    for my $model ( keys %$model_stash ) {
-        $form->stash->{$model} = $self->{c}->model( $model_stash->{$model} );
-    }
-
-    return;
-}
-
-sub create_action {
-    my $self = shift;
-    my %args = @_;
-
-    my $config = $self->_html_formfu_config;
-
-    for my $type (
-        qw/
-        form
-        config
-        method
-        multiform
-        multiform_config
-        multiform_method /
-        )
-    {
-        my $attr = $config->{"${type}_attr"};
-
-        if ( exists $args{attributes}{$attr} ) {
-            $args{_attr_params} = delete $args{attributes}{$attr};
-        }
-        elsif ( exists $args{attributes}{"$attr()"} ) {
-            $args{_attr_params} = delete $args{attributes}{"$attr()"};
-        }
-        else {
-            next;
-        }
-
-        push @{ $args{attributes}{ActionClass} }, $config->{"${type}_action"};
-        last;
-    }
-
-    $self->SUPER::create_action(%args);
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Catalyst::Controller::HTML::FormFu - Catalyst integration for HTML::FormFu
-
-=head1 SYNOPSIS
-
-    package MyApp::Controller::My::Controller;
-    
-    use base 'Catalyst::Controller::HTML::FormFu';
-    
-    sub index : Local {
-        my ( $self, $c ) = @_;
-        
-        # doesn't use an Attribute to make a form
-        # can get an empty form from $self->form()
-        
-        my $form = $self->form();
-    }
-    
-    sub foo : Local : Form {
-        my ( $self, $c ) = @_;
-        
-        # using the Form attribute is equivalent to:
-        #
-        # my $form = $self->form;
-        #
-        # $form->process;
-        # 
-        # $c->stash->{form} = $form;
-    }
-    
-    sub bar : Local : FormConfig {
-        my ( $self, $c ) = @_;
-        
-        # using the FormConfig attribute is equivalent to:
-        #
-        # my $form = $self->form;
-        #
-        # $form->load_config_filestem('root/forms/my/controller/bar');
-        #
-        # $form->process;
-        #
-        # $c->stash->{form} = $form;
-        #
-        # so you only need to do the following...
-        
-        my $form = $c->stash->{form};
-        
-        if ( $form->submitted_and_valid ) {
-            do_something();
-        }
-    }
-    
-    sub baz : Local : FormConfig('my_config') {
-        my ( $self, $c ) = @_;
-        
-        # using the FormConfig attribute with an argument is equivalent to:
-        #
-        # my $form = $self->form;
-        #
-        # $form->load_config_filestem('root/forms/my_config');
-        #
-        # $form->process;
-        #
-        # $c->stash->{form} = $form;
-        #
-        # so you only need to do the following...
-        
-        my $form = $c->stash->{form};
-        
-        if ( $form->submitted_and_valid ) {
-            do_something();
-        }
-    }
-    
-    sub quux : Local : FormMethod('load_form') {
-        my ( $self, $c ) = @_;
-        
-        # using the FormMethod attribute with an argument is equivalent to:
-        #
-        # my $form = $self->form;
-        #
-        # $form->populate( $c->load_form );
-        #
-        # $form->process;
-        #
-        # $c->stash->{form} = $form;
-        #
-        # so you only need to do the following...
-        
-        my $form = $c->stash->{form};
-        
-        if ( $form->submitted_and_valid ) {
-            do_something();
-        }
-    }
-    
-    sub load_form {
-        my ( $self, $c ) = @_;
-        
-        # Automatically called by the above FormMethod('load_form') action.
-        # Called as a method on the controller object, with the context 
-        # object as an argument.
-        
-        # Must return a hash-ref suitable to be fed to $form->populate()
-    }
-
-You can also use specially-named actions that will only be called under
-certain circumstances.
-
-    sub edit : Chained('group') : PathPart : Args(0) : FormConfig { }
-    
-    sub edit_FORM_VALID {
-        my ( $self, $c ) = @_;
-        
-        my $form  = $c->stash->{form};
-        my $group = $c->stash->{group};
-        
-        $form->model->update( $group );
-        
-        $c->response->redirect( $c->uri_for( '/group', $group->id ) );
-    }
-    
-    sub edit_FORM_NOT_SUBMITTED {
-        my ( $self, $c ) = @_;
-        
-        my $form  = $c->stash->{form};
-        my $group = $c->stash->{group};
-        
-        $form->model->default_values( $group );
-    }
-
-=head1 METHODS
-
-=head2 form
-
-This creates a new L<HTML::FormFu> object, passing as it's argument the 
-contents of the L</constructor> config value.
-
-This is useful when using the ConfigForm() or MethodForm() action attributes, 
-to create a 2nd form which isn't populated using a config-file or method 
-return value.
-
-    sub foo : Local {
-        my ( $self, $c ) = @_;
-        
-        my $form = $self->form;
-    }
-
-Note that when using this method, the form's L<query|HTML::FormFu/query> 
-method is not populated with the Catalyst request object.
-
-=head1 SPECIAL ACTION NAMES
-
-An example showing how a complicated action method can be broken down into
-smaller sections, making it clearer which code will be run, and when.
-
-    sub edit : Local : FormConfig {
-        my ( $self, $c ) = @_;
-        
-        my $form  = $c->stash->{form};
-        my $group = $c->stash->{group};
-        
-        $c->detach('/unauthorised') unless $c->user->can_edit( $group );
-        
-        if ( $form->submitted_and_valid ) {
-            $form->model->update( $group );
-            
-            $c->response->redirect( $c->uri_for('/group', $group->id ) );
-            return;
-        }
-        elsif ( !$form->submitted ) {
-            $form->model->default_values( $group );
-        }
-        
-        $self->_add_breadcrumbs_nav( $c, $group );
-    }
-
-Instead becomes...
-
-    sub edit : Local : FormConfig {
-        my ( $self, $c ) = @_;
-        
-        $c->detach('/unauthorised') unless $c->user->can_edit(
-            $c->stash->{group}
-        );
-    }
-    
-    sub edit_FORM_VALID {
-        my ( $self, $c ) = @_;
-        
-        my $group = $c->stash->{group};
-        
-        $c->stash->{form}->model->update( $group );
-        
-        $c->response->redirect( $c->uri_for('/group', $group->id ) );
-    }
-    
-    sub edit_FORM_NOT_SUBMITTED {
-        my ( $self, $c ) = @_;
-        
-        $c->stash->{form}->model->default_values(
-            $c->stash->{group}
-        );
-    }
-    
-    sub edit_FORM_RENDER {
-        my ( $self, $c ) = @_;
-        
-        $self->_add_breadcrumbs_nav( $c, $c->stash->{group} );
-    }
-
-For any action method that uses a C<Form>, C<FormConfig> or C<FormMethod>
-attribute, you can add extra methods that use the naming conventions below.
-
-These methods will be called after the original, plainly named action method.
-
-=head2 _FORM_VALID
-
-Run when the form has been submitted and has no errors.
-
-=head2 _FORM_SUBMITTED
-
-Run when the form has been submitted, regardless of whether or not there was
-errors.
-
-=head2 _FORM_COMPLETE
-
-For MultiForms, is run if the MultiForm is completed.
-
-=head2 _FORM_NOT_VALID
-
-Run when the form has been submitted and there were errors.
-
-=head2 _FORM_NOT_SUBMITTED
-
-Run when the form has not been submitted.
-
-=head2 _FORM_NOT_COMPLETE
-
-For MultiForms, is run if the MultiForm is not completed.
-
-=head2 _FORM_RENDER
-
-For normal C<Form> base classes, this subroutine is run after any of the
-other special methods, unless C<< $form->submitted_and_valid >> is true.
-
-For C<MultiForm> base classes, this subroutine is run after any of the other
-special methods, unless C<< $multi->complete >> is true.
-
-=head1 CUSTOMIZATION
-
-You can set your own config settings, using either your controller config 
-or your application config.
-
-    $c->config( 'Controller::HTML::FormFu' => \%my_values );
-    
-    # or
-    
-    MyApp->config( 'Controller::HTML::FormFu' => \%my_values );
-    
-    # or, in myapp.conf
-    
-    <Controller::HTML::FormFu>
-        default_action_use_path 1
-    </Controller::HTML::FormFu>
-
-=head2 form_method
-
-Override the method-name used to create a new form object.
-
-See L</form>.
-
-Default value: C<form>.
-
-=head2 form_stash
-
-Sets the stash key name used to store the form object.
-
-Default value: C<form>.
-
-=head2 form_attr
-
-Sets the attribute name used to load the 
-L<Catalyst::Controller::HTML::FormFu::Action::Form> action.
-
-Default value: C<Form>.
-
-=head2 config_attr
-
-Sets the attribute name used to load the 
-L<Catalyst::Controller::HTML::FormFu::Action::Config> action.
-
-Default value: C<FormConfig>.
-
-=head2 method_attr
-
-Sets the attribute name used to load the 
-L<Catalyst::Controller::HTML::FormFu::Action::Method> action.
-
-Default value: C<FormMethod>.
-
-=head2 form_action
-
-Sets which package will be used by the Form() action.
-
-Probably only useful if you want to create a sub-class which provides custom 
-behaviour.
-
-Default value: C<Catalyst::Controller::HTML::FormFu::Action::Form>.
-
-=head2 config_action
-
-Sets which package will be used by the Config() action.
-
-Probably only useful if you want to create a sub-class which provides custom 
-behaviour.
-
-Default value: C<Catalyst::Controller::HTML::FormFu::Action::Config>.
-
-=head2 method_action
-
-Sets which package will be used by the Method() action.
-
-Probably only useful if you want to create a sub-class which provides custom 
-behaviour.
-
-Default value: C<Catalyst::Controller::HTML::FormFu::Action::Method>.
-
-=head2 constructor
-
-Pass common defaults to the L<HTML::FormFu constructor|HTML::FormFu/new>.
-
-These values are used by all of the action attributes, and by the 
-C<< $self->form >> method.
-
-Default value: C<{}>.
-
-=head2 config_callback
-
-Arguments: bool
-
-If true, a coderef is passed to C<< $form->config_callback->{plain_value} >> 
-which replaces any instance of C<__uri_for(URI)__> found in form config files
-with the result of passing the C<URI> argument to L<Catalyst/uri_for>.
-
-The form C<< __uri_for(URI, PATH, PARTS)__ >> is also supported, which is 
-equivalent to C<< $c->uri_for( 'URI', \@ARGS ) >>. At this time, there is no 
-way to pass query values equivalent to 
-C<< $c->uri_for( 'URI', \@ARGS, \%QUERY_VALUES ) >>.
-
-The second codeword that is being replaced is C<__path_to( @DIRS )__>. Any
-instance is replaced with the result of passing the C<DIRS> arguments to
-L<Catalyst/path_to>.
-Don't use qoutationmarks as they would become part of the path.
-
-Default value: 1
-
-=head2 default_action_use_name
-
-If set to a true value the action for the form will be set to the currently 
-called action name.
-
-Default value: C<false>.
-
-=head2 default_action_use_path
-
-If set to a true value the action for the form will be set to the currently 
-called action path.
-The action path includes concurrent to action name additioal parameters which
-were code inside the path.
-
-Default value: C<false>.
-
-Example:
-
-    action: /foo/bar
-    called uri contains: /foo/bar/1
-    
-    # default_action_use_name => 1 leads to:
-    $form->action = /foo/bar
-    
-    # default_action_use_path => 1 leads to:
-    $form->action = /foo/bar/1
-
-=head2 model_stash
-
-Arguments: \%stash_keys_to_model_names
-
-Used to place Catalyst models on the form stash.
-
-If it's being used to make a L<DBIx::Class> schema available for
-L<HTML::FormFu::Model::DBIC/options_from_model>, for C<Select> and other
-Group-type elements - then the hash-key must be C<schema>. For example, if
-your schema model class is C<MyApp::Model::MySchema>, you would set
-C<model_stash> like so:
-
-    <Controller::HTML::FormFu>
-        <model_stash>
-            schema MySchema
-        </model_stash>
-    </Controller::HTML::FormFu>
-
-=head2 context_stash
-
-To allow your form validation packages, etc, access to the catalyst context, 
-a weakened reference of the context is copied into the form's stash.
-
-    $form->stash->{context};
-
-This setting allows you to change the key name used in the form stash.
-
-Default value: C<context>
-
-=head2 languages_from_context
-
-If you're using a L10N / I18N plugin such as L<Catalyst::Plugin::I18N> which 
-provides a C<languages> method that returns a list of valid languages to use 
-for the currect request - and you want to use formfu's built-in I18N packages, 
-then setting L</languages_from_context>
-
-=head2 localize_from_context
-
-If you're using a L10N / I18N plugin such as L<Catalyst::Plugin::I18N> which 
-provides it's own C<localize> method, you can set L<localize_from_context> to 
-use that method for formfu's localization.
-
-=head2 request_token_enable
-
-If true, adds an instance of L<HTML::FormFu::Plugin::RequestToken> to every
-form, to stop accidental double-submissions of data and to prevent CSRF attacks.
-
-=head2 request_token_field_name
-
-Defaults to C<_token>.
-
-=head2 request_token_session_key
-
-Defaults to C<__token>.
-
-=head2 request_token_expiration_time
-
-Defaults to C<3600>.
-
-=head1 DISCONTINUED CONFIG SETTINGS
-
-=head2 config_file_ext
-
-Support for this has now been removed. Config files are now searched
-for, with any file extension supported by Config::Any.
-
-=head2 config_file_path
-
-Support for this has now been removed.
-Use C<< {constructor}{config_file_path} >> instead.
-
-=head1 CAVEATS
-
-When using the C<Form> action attribute to create an empty form, you must 
-call L<< $form->process|HTML::FormFu/process >> after populating the form.
-However, you don't need to pass any arguments to C<process>, as the 
-Catalyst request object will have automatically been set in 
-L<< $form->query|HTML::FormFu/query >>.
-
-When using the C<FormConfig> and C<FormMethod> action attributes, if you 
-make any modifications to the form, such as adding or changing it's 
-elements, you must call L<< $form->process|HTML::FormFu/process >> before 
-rendering the form.
-
-=head1 GITHUB REPOSITORY
-
-This module's sourcecode is maintained in a git repository at
-L<git://github.com/fireartist/Catalyst-Controller-HTML-FormFu.git>
-
-The project page is L<https://github.com/fireartist/Catalyst-Controller-HTML-FormFu>
-
-=head1 SEE ALSO
-
-L<HTML::FormFu>, L<Catalyst::Helper::HTML::FormFu>
-
-=head1 AUTHOR
-
-Carl Franks, C<cfranks at cpan.org>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2007 by Carl Franks
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.8 or,
-at your option, any later version of Perl 5 you may have available.
-
-=cut
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/Form.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/Form.pm
deleted file mode 100644
index 650ad29..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/Form.pm
+++ /dev/null
@@ -1,36 +0,0 @@
-package Catalyst::Controller::HTML::FormFu::Action::Form;
-{
-  $Catalyst::Controller::HTML::FormFu::Action::Form::VERSION = '1.00';
-}
-
-use strict;
-use warnings;
-use base qw( Catalyst::Controller::HTML::FormFu::ActionBase::Form );
-
-use Config::Any;
-
-sub execute {
-    my $self = shift;
-    my ( $controller, $c ) = @_;
-
-    if ( $self->reverse =~ $self->_form_action_regex ) {
-        # don't load form again
-        return $self->next::method(@_);
-    }
-
-    my $config = $controller->_html_formfu_config;
-
-    return $self->next::method(@_)
-        unless exists $self->attributes->{ActionClass}
-            && $self->attributes->{ActionClass}[0] eq $config->{form_action};
-
-    my $form = $controller->_form;
-
-    $form->process;
-
-    $c->stash->{ $config->{form_stash} } = $form;
-
-    $self->next::method(@_);
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/FormConfig.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/FormConfig.pm
deleted file mode 100644
index 859a714..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/FormConfig.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-package Catalyst::Controller::HTML::FormFu::Action::FormConfig;
-{
-  $Catalyst::Controller::HTML::FormFu::Action::FormConfig::VERSION = '1.00';
-}
-
-use strict;
-use warnings;
-use base qw( Catalyst::Controller::HTML::FormFu::ActionBase::Form );
-
-use Config::Any;
-
-sub execute {
-    my $self = shift;
-    my ( $controller, $c ) = @_;
-
-    if ( $self->reverse =~ $self->_form_action_regex ) {
-        # don't load form again
-        return $self->next::method(@_);
-    }
-
-    my $config = $controller->_html_formfu_config;
-
-    return $self->next::method(@_)
-        unless exists $self->attributes->{ActionClass}
-            && $self->attributes->{ActionClass}[0] eq $config->{config_action};
-
-    my $form = $controller->_form;
-    my @files = grep {length} split /\s+/, $self->{_attr_params}->[0] || '';
-
-    if ( !@files ) {
-        push @files, $self->reverse;
-    }
-
-    my $ext_regex = $config->{_file_ext_regex};
-
-    for my $file (@files) {
-        $c->log->debug( __PACKAGE__ . " loading config file '$file'" )
-            if $c->debug;
-
-        if ( $file =~ m/ \. $ext_regex \z /x ) {
-            $form->load_config_file($file);
-        }
-        else {
-            $form->load_config_filestem($file);
-        }
-    }
-
-    $form->process;
-
-    $c->stash->{ $config->{form_stash} } = $form;
-
-    $self->next::method(@_);
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/FormMethod.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/FormMethod.pm
deleted file mode 100644
index 0b85d7b..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/FormMethod.pm
+++ /dev/null
@@ -1,46 +0,0 @@
-package Catalyst::Controller::HTML::FormFu::Action::FormMethod;
-{
-  $Catalyst::Controller::HTML::FormFu::Action::FormMethod::VERSION = '1.00';
-}
-
-use strict;
-use warnings;
-use base qw( Catalyst::Controller::HTML::FormFu::ActionBase::Form );
-
-use Carp qw( croak );
-
-sub execute {
-    my $self = shift;
-    my ( $controller, $c ) = @_;
-
-    if ( $self->reverse =~ $self->_form_action_regex ) {
-        # don't load form again
-        return $self->next::method(@_);
-    }
-
-    my $config = $controller->_html_formfu_config;
-
-    return $self->next::method(@_)
-        unless exists $self->attributes->{ActionClass}
-            && $self->attributes->{ActionClass}[0] eq $config->{method_action};
-
-    my $form = $controller->_form;
-
-    for ( @{ $self->{_attr_params} } ) {
-        for my $method (split) {
-            $c->log->debug($method) if $c->debug;
-
-            my $args = $controller->$method($c) || {};
-
-            $form->populate($args);
-        }
-    }
-
-    $form->process;
-
-    $c->stash->{ $config->{form_stash} } = $form;
-
-    $self->next::method(@_);
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiForm.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiForm.pm
deleted file mode 100644
index d938616..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiForm.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-package Catalyst::Controller::HTML::FormFu::Action::MultiForm;
-{
-  $Catalyst::Controller::HTML::FormFu::Action::MultiForm::VERSION = '1.00';
-}
-
-use strict;
-use warnings;
-use base qw( Catalyst::Controller::HTML::FormFu::ActionBase::Form );
-
-use Config::Any;
-
-sub execute {
-    my $self = shift;
-    my ( $controller, $c ) = @_;
-
-    if ( $self->reverse =~ $self->_form_action_regex ) {
-        # don't load form again
-        return $self->next::method(@_);
-    }
-
-    my $config = $controller->_html_formfu_config;
-
-    return $self->next::method(@_)
-        unless exists $self->attributes->{ActionClass}
-            && $self->attributes->{ActionClass}[0] eq
-            $config->{multiform_action};
-
-    my $multi = $controller->_multiform;
-
-    $multi->process;
-
-    $c->stash->{ $config->{multiform_stash} } = $multi;
-    $c->stash->{ $config->{form_stash} }      = $multi->current_form;
-
-    $self->next::method(@_);
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiFormConfig.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiFormConfig.pm
deleted file mode 100644
index c7b4a2f..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiFormConfig.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-package Catalyst::Controller::HTML::FormFu::Action::MultiFormConfig;
-{
-  $Catalyst::Controller::HTML::FormFu::Action::MultiFormConfig::VERSION = '1.00';
-}
-
-use strict;
-use warnings;
-use base qw( Catalyst::Controller::HTML::FormFu::ActionBase::Form );
-
-use Config::Any;
-
-sub execute {
-    my $self = shift;
-    my ( $controller, $c ) = @_;
-
-    if ( $self->reverse =~ $self->_form_action_regex ) {
-        # don't load form again
-        return $self->next::method(@_);
-    }
-
-    my $config = $controller->_html_formfu_config;
-
-    return $self->next::method(@_)
-        unless exists $self->attributes->{ActionClass}
-            && $self->attributes->{ActionClass}[0] eq
-            $config->{multiform_config_action};
-
-    my $multi = $controller->_multiform;
-    my @files = grep {length} split /\s+/, $self->{_attr_params}->[0] || '';
-
-    if ( !@files ) {
-        push @files, $self->reverse;
-    }
-
-    my $ext_regex = $config->{_file_ext_regex};
-
-    for my $file (@files) {
-
-        $c->log->debug( __PACKAGE__ . " searching for file '$file'" )
-            if $c->debug;
-
-        if ( $file =~ m/ \. $ext_regex \z /x ) {
-            $multi->load_config_file($file);
-        }
-        else {
-            $multi->load_config_filestem($file);
-        }
-    }
-
-    $multi->process;
-
-    $c->stash->{ $config->{multiform_stash} } = $multi;
-    $c->stash->{ $config->{form_stash} }      = $multi->current_form;
-
-    $self->next::method(@_);
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiFormMethod.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiFormMethod.pm
deleted file mode 100644
index 6666ee5..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/Action/MultiFormMethod.pm
+++ /dev/null
@@ -1,48 +0,0 @@
-package Catalyst::Controller::HTML::FormFu::Action::MultiFormMethod;
-{
-  $Catalyst::Controller::HTML::FormFu::Action::MultiFormMethod::VERSION = '1.00';
-}
-
-use strict;
-use warnings;
-use base qw( Catalyst::Controller::HTML::FormFu::ActionBase::Form );
-
-use Carp qw( croak );
-
-sub execute {
-    my $self = shift;
-    my ( $controller, $c ) = @_;
-
-    if ( $self->reverse =~ $self->_form_action_regex ) {
-        # don't load form again
-        return $self->next::method(@_);
-    }
-
-    my $config = $controller->_html_formfu_config;
-
-    return $self->next::method(@_)
-        unless exists $self->attributes->{ActionClass}
-            && $self->attributes->{ActionClass}[0] eq
-            $config->{multiform_method_action};
-
-    my $multi = $controller->_multiform;
-
-    for ( @{ $self->{_attr_params} } ) {
-        for my $method (split) {
-            $c->log->debug($method) if $c->debug;
-
-            my $args = $controller->$method($c) || {};
-
-            $multi->populate($args);
-        }
-    }
-
-    $multi->process;
-
-    $c->stash->{ $config->{multiform_stash} } = $multi;
-    $c->stash->{ $config->{form_stash} }      = $multi->current_form;
-
-    $self->next::method(@_);
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/ActionBase/Form.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/ActionBase/Form.pm
deleted file mode 100644
index 6005e63..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Controller/HTML/FormFu/ActionBase/Form.pm
+++ /dev/null
@@ -1,143 +0,0 @@
-package Catalyst::Controller::HTML::FormFu::ActionBase::Form;
-{
-  $Catalyst::Controller::HTML::FormFu::ActionBase::Form::VERSION = '1.00';
-}
-
-use strict;
-use warnings;
-use base qw( Catalyst::Action );
-
-sub _form_action_regex {
-    return qr/_FORM_(RENDER|(NOT_)?(VALID|COMPLETE|SUBMITTED))\z/;
-}
-
-sub dispatch {
-    my $self = shift;
-    my ($c) = @_;
-    
-    $self->next::method( @_ );
-    
-    my $controller = $c->component( $self->class );
-    my $config     = $controller->_html_formfu_config;
-    
-    my $multi = $c->stash->{ $config->{multiform_stash} };
-    my $form  = $c->stash->{ $config->{form_stash} };
-    
-    my $run_form_render_action = 1;
-    
-    # _FORM_COMPLETE
-    
-    my $complete_method = $self->name . "_FORM_COMPLETE";
-    
-    if ( defined $multi
-        && ( my $code = $controller->can( $complete_method ) )
-        && $multi->complete )
-    {
-        my @reverse = split /\//, $self->reverse;
-        $reverse[-1] = $complete_method;
-        local $self->{reverse} = join '/', @reverse;
-        local $self->{code}    = $code;
-        
-        $run_form_render_action = 0;
-        
-        $c->execute( $self->class, $self, @{ $c->req->args } );
-    }
-    
-    # _FORM_SUBMITTED
-    
-    my $submitted_method = $self->name . "_FORM_SUBMITTED";
-    
-    if ( ( my $code = $controller->can( $submitted_method ) )
-        && $form->submitted )
-    {
-        my @reverse = split /\//, $self->reverse;
-        $reverse[-1] = $submitted_method;
-        local $self->{reverse} = join '/', @reverse;
-        local $self->{code}    = $code;
-        
-        $c->execute( $self->class, $self, @{ $c->req->args } );
-    }
-    
-    # _FORM_VALID
-    
-    my $valid_method = $self->name . "_FORM_VALID";
-    
-    if ( ( my $code = $controller->can( $valid_method ) )
-        && $form->submitted_and_valid )
-    {
-        my @reverse = split /\//, $self->reverse;
-        $reverse[-1] = $valid_method;
-        local $self->{reverse} = join '/', @reverse;
-        local $self->{code}    = $code;
-        
-        $run_form_render_action = 0
-            if !defined $multi;
-        
-        $c->execute( $self->class, $self, @{ $c->req->args } );
-    }
-    
-    # _FORM_NOT_COMPLETE
-    
-    my $not_complete_method = $self->name . "_FORM_NOT_COMPLETE";
-    
-    if ( defined $multi &&
-        ( my $code = $controller->can( $not_complete_method ) )
-        && $form->submitted && !$multi->complete )
-    {
-        my @reverse = split /\//, $self->reverse;
-        $reverse[-1] = $not_complete_method;
-        local $self->{reverse} = join '/', @reverse;
-        local $self->{code}    = $code;
-        
-        $c->execute( $self->class, $self, @{ $c->req->args } );
-    }
-    
-    # _FORM_NOT_VALID
-    
-    my $not_valid_method = $self->name . "_FORM_NOT_VALID";
-    
-    if ( ( my $code = $controller->can( $not_valid_method ) )
-        && $form->submitted && $form->has_errors )
-    {
-        my @reverse = split /\//, $self->reverse;
-        $reverse[-1] = $not_valid_method;
-        local $self->{reverse} = join '/', @reverse;
-        local $self->{code}    = $code;
-        
-        $c->execute( $self->class, $self, @{ $c->req->args } );
-    }
-    
-    # _FORM_NOT_SUBMITTED
-    
-    my $not_submitted_method = $self->name . "_FORM_NOT_SUBMITTED";
-    
-    if ( ( my $code = $controller->can( $not_submitted_method ) )
-        && !$form->submitted )
-    {
-        my @reverse = split /\//, $self->reverse;
-        $reverse[-1] = $not_submitted_method;
-        local $self->{reverse} = join '/', @reverse;
-        local $self->{code}    = $code;
-        
-        $c->execute( $self->class, $self, @{ $c->req->args } );
-    }
-    
-    # _RENDER
-    
-    my $render_method = $self->name . "_FORM_RENDER";
-    
-    if ( $run_form_render_action
-        && ( my $code = $controller->can( $render_method ) ) )
-    {
-        my @reverse = split /\//, $self->reverse;
-        $reverse[-1] = $render_method;
-        local $self->{reverse} = join '/', @reverse;
-        local $self->{code}    = $code;
-        
-        $c->execute( $self->class, $self, @{ $c->req->args } );
-    }
-    
-    return;
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Helper/HTML/FormFu.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Helper/HTML/FormFu.pm
deleted file mode 100644
index de3958b..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/Catalyst/Helper/HTML/FormFu.pm
+++ /dev/null
@@ -1,96 +0,0 @@
-package Catalyst::Helper::HTML::FormFu;
-{
-  $Catalyst::Helper::HTML::FormFu::VERSION = '1.00';
-}
-
-use strict;
-use warnings;
-
-use File::Spec;
-use HTML::FormFu::Deploy;
-use Carp qw/ croak /;
-
-sub mk_stuff {
-    my ( $self, $helper, $dir ) = @_;
-
-    my @files = HTML::FormFu::Deploy::file_list();
-
-    my $form_dir = File::Spec->catdir( $helper->{base}, 'root',
-        ( defined $dir ? $dir : 'formfu' ) );
-
-    $helper->mk_dir($form_dir) unless -d $form_dir;
-
-    for my $filename (@files) {
-        my $path = File::Spec->catfile( $form_dir, $filename );
-        my $data = HTML::FormFu::Deploy::file_source($filename);
-
-        $helper->mk_file( $path, $data );
-    }
-    return;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Catalyst::Helper::HTML::FormFu - Helper to deploy HTML::FormFu template files.
-
-=head1 SYNOPSIS
-
-    script/myapp_create.pl HTML::FormFu
-
-=head1 DESCRIPTION
-
-As of version 0.02000, L<HTML::FormFu> doesn't use the TT template files by 
-default - it uses in internal rendering engine.
-
-If you don't want to customise the generated markup, you don't need to use
-L<Catalyst::Helper::HTML::FormFu> at all.
-
-If you want to customise the generated markup, you'll need a 
-local copy of the template files. To create the files in the default
-C<root/formfu> directory, run:
-
-    script/myapp_create.pl HTML::FormFu
-
-To create the files in a different subdirectory of C<root>, pass the path
-as an argument. The following example would create the template files into 
-the directory C<root/forms>.
-
-    script/myapp_create.pl HTML::FormFu forms
-
-You'll  also need to tell HTML::FormFu to use the TT renderer, this can be
-achieved with L<Catalyst::Controller::HTML::FormFu>, with the following
-Catalyst application YAML config:
-
-    ---
-    'Controller::HTML::FormFu':
-      constructor:
-        render_method: tt
-
-=head1 SUPPORT
-
-IRC:
-
-    Join #catalyst on irc.perl.org.
-
-Mailing Lists:
-
-    http://lists.rawmode.org/cgi-bin/mailman/listinfo/html-widget
-
-=head1 SEE ALSO
-
-L<HTML::FormFu>, L<Catalyst::Helper>
-
-=head1 AUTHOR
-
-Carl Franks, C<cfranks at cpan.org>
-
-=head1 LICENSE
-
-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-HTML-FormFu/lib/HTML/FormFu/Constraint/RequestToken.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/HTML/FormFu/Constraint/RequestToken.pm
deleted file mode 100644
index 82ec9ff..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/HTML/FormFu/Constraint/RequestToken.pm
+++ /dev/null
@@ -1,23 +0,0 @@
-package HTML::FormFu::Constraint::RequestToken;
-{
-  $HTML::FormFu::Constraint::RequestToken::VERSION = '1.00';
-}
-use Moose;
-
-extends 'HTML::FormFu::Constraint';
-
-sub BUILD {
-    my ( $self, $args ) = @_;
-
-    $self->message($self->parent->message);
-
-    return;
-}
-
-sub constrain_value {
-    my ( $self, $value ) = @_;
-
-    return $self->parent->verify_token( $value );
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/HTML/FormFu/Element/RequestToken.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/HTML/FormFu/Element/RequestToken.pm
deleted file mode 100644
index 4cc02d2..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/HTML/FormFu/Element/RequestToken.pm
+++ /dev/null
@@ -1,167 +0,0 @@
-package HTML::FormFu::Element::RequestToken;
-{
-  $HTML::FormFu::Element::RequestToken::VERSION = '1.00';
-}
-use Moose;
-use MooseX::Attribute::Chained;
-
-extends 'HTML::FormFu::Element::Text';
-
-use HTML::FormFu::Util qw( process_attrs );
-use Carp qw( croak );
-
-has expiration_time => ( is => 'rw', traits  => ['Chained'], default => 3600 );
-has session_key     => ( is => 'rw', traits  => ['Chained'], default => '__token' );
-has context         => ( is => 'rw', traits  => ['Chained'], default => 'context' );
-has limit           => ( is => 'rw', traits  => ['Chained'], default => 20 );
-has message         => ( is => 'rw', traits  => ['Chained'], default => 'Form submission failed. Please try again.' );
-
-after BUILD => sub {
-    my $self = shift;
-    $self->name('_token');
-    $self->constraints([qw(RequestToken Required)]);
-    $self->field_type('hidden');
-};
-
-sub process_value {
-    my ($self, $value) = @_;
-    
-    return $self->verify_token($value) ? $value
-                                       : $self->value($self->get_token)->value;
-}
-
-sub verify_token {
-    my ($self, $token) = @_;
-	
-    return undef unless($token);
-    
-    my $form = $self->form;
-    
-    croak "verify_token() can only be called if form has been submitted"
-        if !$form->submitted;
-    
-    my $field_name = $self->name;
-    
-    my $c = $self->form->stash->{ $self->context };
-    
-    for ( @{ $c->session->{ $self->session_key } || [] } ) {
-        return 1 if ( $_->[0] eq $token );
-    }
-	
-    return undef;
-}
-
-sub expire_token {
-    my ($self) = @_;
-    
-    my $c = $self->form->stash->{ $self->context };
-    
-    my @token;
-    for ( @{ $c->session->{ $self->session_key } || [] } ) {
-        push( @token, $_ ) if ( $_->[1] > time );
-    }
-    
-    @token = splice(@token, -$self->limit, $self->limit)  if(@token > $self->limit);
-    
-    $c->session->{ $self->session_key } = \@token;
-}
-
-sub get_token {
-    my ($self) = @_;
-    
-    my $token;
-    my $c = $self->form->stash->{ $self->context };
-    my @chars = ( 'a' .. 'z', 0 .. 9 );
-    
-    $token .= $chars[ int( rand() * 36 ) ] for ( 0 .. 15 );
-    
-    $c->session->{ $self->session_key } ||= [];
-    
-    push @{ $c->session->{ $self->session_key } },
-        [ $token, time + $self->expiration_time ];
-    
-    $self->expire_token;
-    
-    return $token;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-HTML::FormFu::Element::RequestToken - Hidden text field which contains a unique 
-token
-
-=head1 SYNOPSIS
-
-  my $e = $form->element( { type => 'Token' } );
-  
-  my $p = $form->element( { plugin => 'Token' } );
-
-=head1 DESCRIPTION
-
-This field can prevent CSRF attacks. It contains a random token. After 
-submission the token is checked with the token which is stored in the session 
-of the current user.
-See L<Catalyst::Controller::HTML::FormFu/"request_token_enable"> for a 
-convenient way how to use it.
-
-=head1 ATTRIBUTES
-
-=head2 context
-
-Value of the stash key for the Catalyst context object (C<< $c >>). 
-Defaults to C<context>.
-
-=head2 expiration_time
-
-Time to life for a token in seconds. Defaults to C<3600>.
-
-=head2 session_key
-
-Session key which is used to store the tokens. Defaults to C<__token>.
-
-=head2 limit
-
-Limit the number of tokens which are kept in the session. Defaults to 20.
-
-=head2 constraints
-
-Defaults to L<HTML::FormFu::Constraint::RequestToken> and L<HTML::FormFu::Constraint::Required>.
-
-=head2 message
-
-Set the error message.
-
-=head1 METHODS
-
-=head2 expire_token
-
-This method looks in the session for expired tokens and removes them.
-
-=head2 get_token
-
-Generates a new token and stores it in the stash.
-
-=head2 verify_token
-
-Checks whether a given token is already in the session. Returns C<1> if it exists, C<0> otherwise.
-
-=head1 SEE ALSO
-
-L<Catalyst::Controller::HTML::FormFu>, 
-L<HTML::FormFu::Plugin::RequestToken>, 
-L<HTML::FormFu::Constraint::RequestToken>
-
-L<HTML::FormFu>
-
-=head1 AUTHOR
-
-Moritz Onken, C<onken at houseofdesign.de>
-
-=head1 LICENSE
-
-This library is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
diff --git a/sources/Catalyst-Controller-HTML-FormFu/lib/HTML/FormFu/Plugin/RequestToken.pm b/sources/Catalyst-Controller-HTML-FormFu/lib/HTML/FormFu/Plugin/RequestToken.pm
deleted file mode 100644
index a03358a..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/lib/HTML/FormFu/Plugin/RequestToken.pm
+++ /dev/null
@@ -1,32 +0,0 @@
-package HTML::FormFu::Plugin::RequestToken;
-{
-  $HTML::FormFu::Plugin::RequestToken::VERSION = '1.00';
-}
-use Moose;
-use MooseX::Attribute::Chained;
-extends 'HTML::FormFu::Plugin';
-
-has context         => ( is => 'rw', traits  => ['Chained'] );
-has field_name      => ( is => 'rw', traits  => ['Chained'] );
-has session_key     => ( is => 'rw', traits  => ['Chained'] );
-has expiration_time => ( is => 'rw', traits  => ['Chained'] );
-
-sub process {
-    my ($self) = @_;
-    
-    return if $self->form->get_all_element( { name => $self->field_name } );
-    
-    my $c = $self->form->stash->{'context'};
-    
-    $self->form->elements( [ {
-                type            => 'RequestToken',
-                name            => $self->field_name,
-                expiration_time => $self->expiration_time,
-                context         => $self->context,
-                session_key     => $self->session_key
-            } ] );
-
-    return;
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-form.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-form.t
deleted file mode 100644
index f7accc8..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-form.t
+++ /dev/null
@@ -1,17 +0,0 @@
-use strict;
-use warnings;
-
-use Test::More tests => 3;
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-$mech->get_ok('http://localhost/basic/form');
-
-my ($form) = $mech->forms;
-
-ok($form);
-
-ok( $form->find_input('basic_form') );
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formconfig.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formconfig.t
deleted file mode 100644
index 04bd28c..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formconfig.t
+++ /dev/null
@@ -1,49 +0,0 @@
-use strict;
-use warnings;
-
-use Test::More tests => 12;
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-$mech->get_ok('http://localhost/basic/formconfig');
-
-{
-    # test __uri_for()__ set in config file
-
-    like( $mech->response->content, qr{<label>[^<]+/uri_for</label>} );
-}
-
-my ($form) = $mech->forms;
-
-ok($form);
-
-ok( $form->find_input('basic_formconfig') );
-
-my $uri = $form->action;
-
-{
-    $mech->post_ok( $uri, { unknown_field => 'foo' } );
-    
-    $mech->content_contains('<p>not submitted, render</p>');
-}
-
-{
-    $mech->post_ok( $uri, { submit => 'foo' } );
-    
-    $mech->content_contains('<p>submitted, not valid, render</p>');
-}
-
-{
-    $mech->post_ok( $uri, { basic_formconfig => '' } );
-    
-    $mech->content_contains('<p>submitted, not valid, render</p>');
-}
-
-{
-    $mech->post_ok( $uri, { basic_formconfig => 'foo' } );
-    
-    $mech->content_contains('<p>submitted, valid</p>');
-}
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formconfig_conf_ext.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formconfig_conf_ext.t
deleted file mode 100644
index 6017f66..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formconfig_conf_ext.t
+++ /dev/null
@@ -1,16 +0,0 @@
-use strict;
-
-use Test::More tests => 3;
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-$mech->get_ok('http://localhost/basic/formconfig_conf_ext');
-
-my ($form) = $mech->forms;
-
-ok($form);
-
-ok( $form->find_input('basic_formconfig_conf_ext') );
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formmethod.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formmethod.t
deleted file mode 100644
index 5e6e2bf..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-formmethod.t
+++ /dev/null
@@ -1,17 +0,0 @@
-use strict;
-use warnings;
-
-use Test::More tests => 3;
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-$mech->get_ok('http://localhost/basic/formmethod');
-
-my ($form) = $mech->forms;
-
-ok($form);
-
-ok( $form->find_input('basic_formmethod') );
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-token.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-token.t
deleted file mode 100644
index 30835ca..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/01basic-token.t
+++ /dev/null
@@ -1,76 +0,0 @@
-use strict;
-use warnings;
-
-use Test::More;
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-$mech->get_ok('http://localhost/token/form');
-
-my ($form) = $mech->forms;
-
-ok( $form, 'Found form' );
-
-ok( $form->find_input('basic_form'), 'found input field' );
-
-ok( my $token = $form->find_input('_token'), 'found token field' );
-
-$token = $token->value;
-
-like( $token, qr/^[a-z0-9]+$/, 'token value looks like a token' );
-
-ok( my $res = $mech->submit_form( fields => { 'basic_form' => 1, '_token' => "123" } ),
-    'submit with different token' );
-	
-unlike( $res->as_string, qr/VALID/, 'form is not valid' );
-
-$mech->get_ok('http://localhost/token/form');
-
-ok( $res = $mech->submit_form( fields => { '_token' => $token } ),
-    'submit with token only' );
-
-unlike( $res->as_string, qr/VALID/, 'basic_form is required' );
-
-$mech->get_ok('http://localhost/token/form');
-
-ok( $res = $mech->submit_form( fields => { 'basic_form' => 1, '_token' => $token } ),
-    'submit with valid token' );
-
-like( $res->as_string, qr/VALID/, 'form is valid' );
-
-$mech->get_ok( 'http://localhost/token/count_token', 'get token count' );
-
-is( $mech->content, 4, "4 tokens" );
-
-
-$mech->get_ok(
-    'http://localhost/tokenexpire/form',
-    'get token with negative expiration time'
-);
-
-($form) = $mech->forms;
-
-ok( $form, 'Found form' );
-
-ok( $form->find_input('basic_form'), 'found input field' );
-
-ok( $token = $form->find_input('token'), 'found token field' );
-
-for(4..21) {
-	$mech->get_ok('http://localhost/token/count_token');
-	is($mech->content, $_ > 20 ? 20 : $_);
-	$mech->get_ok('http://localhost/token/form', 'get form #' . $_);
-}
-
-($form) = $mech->forms;
-ok( $token = $form->find_input('_token'), 'found token field' );
-
-ok( $res = $mech->submit_form( fields => { 'basic_form' => 1, '_token' => $token->value } ),
-    'submit with valid token' );
-
-is( $mech->content, 'VALID', 'form is valid' );
-
-done_testing;
\ No newline at end of file
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-multiformconfig.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-multiformconfig.t
deleted file mode 100644
index 3ba0a61..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-multiformconfig.t
+++ /dev/null
@@ -1,69 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-eval {
-    require HTML::FormFu::MultiForm;
-};
-if ($@) {
-    plan skip_all => 'HTML::FormFu::MultiForm required for MultiForm tests';
-    die $@;
-}
-
-plan tests => 13;
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-# check the initial response
-
-$mech->get_ok('http://localhost/multiform/formconfig');
-
-my ($form) = $mech->forms;
-
-ok($form);
-
-is( $form->attr('id'), 'formconfig' );
-
-ok( $form->find_input('page1') );
-
-# submit page 1
-
-my $uri = $form->action;
-
-$mech->post_ok( $uri, { page1 => 'foo' } );
-
-# get page 2's hidden value, to submit page 2
-
-undef $form;
-($form) = $mech->forms;
-
-ok($form);
-
-undef $uri;
-$uri = $form->action;
-
-is( $form->attr('id'), 'formconfig' );
-
-ok( $form->find_input('page2') );
-ok( $form->find_input('_multiform') );
-
-my $hidden_value = $form->value('_multiform');
-
-# submit page 2
-
-$mech->post_ok(
-    $uri,
-    {   _multiform => $hidden_value,
-        page2      => 'bar',
-    } );
-
-# check final output
-
-$mech->content_contains('Complete');
-
-$mech->content_contains('page1: foo');
-
-$mech->content_contains('page2: bar');
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-multiformmethod.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-multiformmethod.t
deleted file mode 100644
index e490991..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-multiformmethod.t
+++ /dev/null
@@ -1,69 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-eval {
-    require HTML::FormFu::MultiForm;
-};
-if ($@) {
-    plan skip_all => 'HTML::FormFu::MultiForm required for MultiForm tests';
-    die $@;
-}
-
-plan tests => 13;
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-# check the initial response
-
-$mech->get_ok('http://localhost/multiform/formmethod');
-
-my ($form) = $mech->forms;
-
-ok($form);
-
-is( $form->attr('id'), 'formmethod' );
-
-ok( $form->find_input('page1') );
-
-# submit page 1
-
-my $uri = $form->action;
-
-$mech->post_ok( $uri, { page1 => 'foo' } );
-
-# get page 2's hidden value, to submit page 2
-
-undef $form;
-($form) = $mech->forms;
-
-ok($form);
-
-undef $uri;
-$uri = $form->action;
-
-is( $form->attr('id'), 'formmethod' );
-
-ok( $form->find_input('page2') );
-ok( $form->find_input('_multiform') );
-
-my $hidden_value = $form->value('_multiform');
-
-# submit page 2
-
-$mech->post_ok(
-    $uri,
-    {   _multiform => $hidden_value,
-        page2      => 'bar',
-    } );
-
-# check final output
-
-$mech->content_contains('Complete');
-
-$mech->content_contains('page1: foo');
-
-$mech->content_contains('page2: bar');
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-token.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-token.t
deleted file mode 100644
index 6e508fb..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/02multiform-token.t
+++ /dev/null
@@ -1,60 +0,0 @@
-use strict;
-use warnings;
-
-use Test::More skip_all => "no multi form support yet";
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-# check the initial response
-
-$mech->get_ok('http://localhost/multiformtoken/formconfig');
-
-my ($form) = $mech->forms;
-
-ok($form);
-
-is( $form->attr('id'), 'formconfig' );
-
-ok( $form->find_input('page1') );
-
-# submit page 1
-
-my $uri = $form->action;
-
-$mech->post_ok( $uri, { page1 => 'foo' } );
-
-# get page 2's hidden value, to submit page 2
-
-undef $form;
-($form) = $mech->forms;
-
-ok($form);
-
-undef $uri;
-$uri = $form->action;
-
-is( $form->attr('id'), 'formconfig' );
-
-ok( $form->find_input('page2') );
-ok( $form->find_input('_multiform') );
-
-my $hidden_value = $form->value('_multiform');
-
-# submit page 2
-
-$mech->post_ok(
-    $uri,
-    {   _multiform => $hidden_value,
-        page2      => 'bar',
-    } );
-
-# check final output
-
-$mech->content_contains('Complete');
-
-$mech->content_contains('page1: foo');
-
-$mech->content_contains('page2: bar');
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/03instancepercontext.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/03instancepercontext.t
deleted file mode 100644
index a557dcc..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/03instancepercontext.t
+++ /dev/null
@@ -1,15 +0,0 @@
-use strict;
-use warnings;
-
-use Test::More;
-
-use lib 't/lib';
-use TestApp;
-
-eval {
-    map { TestApp->controller($_) } TestApp->controllers;
-};
-
-ok(!$@, 'lives ok');
-
-done_testing;
\ No newline at end of file
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/elements/requesttoken.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/elements/requesttoken.t
deleted file mode 100644
index c1b7753..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/elements/requesttoken.t
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-package 
-  main;
-
-use strict;
-use warnings;
-
-use Test::More tests => 2;
-
-use HTML::FormFu;
-
-my $form = HTML::FormFu->new;
-
-$form->stash->{context} = new C::Fake;
-
-$form->load_config_file('t-aggregate/elements/requesttoken.yml');
-
-like( $form, qr/<input name="_token" type="hidden" value="/, "RequestToken field is a hidden field" );
-
-like( $form, qr/value="\w+"/, "RequestToken field has a random value" );
-
-}
-{
-package 
-  C::Fake;
-
-sub new { return bless({}, shift) }
-
-sub session { return {} }
-
-}
\ No newline at end of file
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/elements/requesttoken.yml b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/elements/requesttoken.yml
deleted file mode 100644
index e3b7b0e..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/elements/requesttoken.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-  elements:
-    - type: RequestToken
-    
\ No newline at end of file
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/multiform-file-upload.t b/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/multiform-file-upload.t
deleted file mode 100644
index 00f7e11..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t-aggregate/multiform-file-upload.t
+++ /dev/null
@@ -1,82 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-eval {
-    require HTML::FormFu::MultiForm;
-};
-if ($@) {
-    plan skip_all => 'HTML::FormFu::MultiForm required for MultiForm tests';
-    die $@;
-}
-
-plan tests => 12;
-
-use lib 't/lib';
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-
-# check the initial response
-
-$mech->get_ok('http://localhost/multiform/file_upload');
-
-my ($form) = $mech->forms;
-
-ok($form);
-
-is( $form->attr('id'), 'file-upload' );
-
-ok( $form->find_input('image1') );
-
-# submit page 1
-
-my $uri = $form->action;
-
-my $response = $mech->post(
-    $uri,
-    Content_Type => 'form-data',
-    Content      => [ image1 => ['t/btn_88x31_built.png'], ],
-);
-
-is( $mech->status, '200' );
-
-# get page 2's hidden value, to submit page 2
-
-undef $form;
-($form) = $mech->forms;
-
-ok($form);
-
-undef $uri;
-$uri = $form->action;
-
-is( $form->attr('id'), 'file-upload' );
-
-ok( $form->find_input('image2') );
-ok( $form->find_input('_multiform') );
-
-my $hidden_value = $form->value('_multiform');
-
-# submit page 2
-
-$mech->post(
-    $uri,
-    Content_Type => 'form-data',
-    Content      => [
-        _multiform => $hidden_value,
-        image2     => ['t/btn_120x50_built.png'],
-    ],
-);
-
-# check final output
-
-$mech->content_contains('Complete');
-
-$mech->content_contains(
-    'param: image1, size: 2517, filename: btn_88x31_built.png, type: image/png'
-);
-
-$mech->content_contains(
-    'param: image2, size: 3826, filename: btn_120x50_built.png, type: image/png'
-);
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/aggregate.t b/sources/Catalyst-Controller-HTML-FormFu/t/aggregate.t
deleted file mode 100644
index c643d5e..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/aggregate.t
+++ /dev/null
@@ -1,10 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-use Test::Aggregate::Nested;
-
-Test::Aggregate::Nested->new( {
-        dirs => 't-aggregate',
-
-        # verbose => 1,
-    } )->run;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/btn_120x50_built.png b/sources/Catalyst-Controller-HTML-FormFu/t/btn_120x50_built.png
deleted file mode 100644
index c709fd6..0000000
Binary files a/sources/Catalyst-Controller-HTML-FormFu/t/btn_120x50_built.png and /dev/null differ
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/btn_88x31_built.png b/sources/Catalyst-Controller-HTML-FormFu/t/btn_88x31_built.png
deleted file mode 100644
index 007b5db..0000000
Binary files a/sources/Catalyst-Controller-HTML-FormFu/t/btn_88x31_built.png and /dev/null differ
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp.pm b/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp.pm
deleted file mode 100644
index 713bdb8..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp.pm
+++ /dev/null
@@ -1,22 +0,0 @@
-package TestApp;
-
-use strict;
-use warnings;
-
-use Catalyst::Runtime '5.70';
-use FindBin;
-
-use Catalyst
-    qw/ Session Session::State::Cookie Session::Store::File /;
-
-our $VERSION = '0.01';
-
-__PACKAGE__->config(
-    name                       => 'TestApp',
-    home                       => "$FindBin::Bin/../t",
-    'Controller::HTML::FormFu' => { default_action_use_path => 1, },
-);
-
-__PACKAGE__->setup;
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Basic.pm b/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Basic.pm
deleted file mode 100644
index 1495d7d..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Basic.pm
+++ /dev/null
@@ -1,64 +0,0 @@
-package TestApp::Controller::Basic;
-
-use strict;
-use warnings;
-use base 'Catalyst::Controller::HTML::FormFu';
-
-sub basic : Chained : CaptureArgs(0) {
-    my ( $self, $c ) = @_;
-
-    $c->stash->{template} = 'form.tt';
-}
-
-sub form : Chained('basic') : Args(0) : Form {
-    my ( $self, $c ) = @_;
-
-    my $form = $c->stash->{form};
-
-    $form->element( { name => 'basic_form' } );
-}
-
-sub formconfig : Chained('basic') : Args(0) : FormConfig { }
-
-sub formconfig_FORM_NOT_SUBMITTED {
-    my ( $self, $c ) = @_;
-    
-    push @{ $c->stash->{message} }, 'not submitted';
-}
-
-sub formconfig_FORM_SUBMITTED {
-    my ( $self, $c ) = @_;
-    
-    push @{ $c->stash->{message} }, 'submitted';
-}
-
-sub formconfig_FORM_NOT_VALID {
-    my ( $self, $c ) = @_;
-    
-    push @{ $c->stash->{message} }, 'not valid';
-}
-
-sub formconfig_FORM_VALID {
-    my ( $self, $c ) = @_;
-    
-    push @{ $c->stash->{message} }, 'valid';
-}
-
-sub formconfig_FORM_RENDER {
-    my ( $self, $c ) = @_;
-    
-    push @{ $c->stash->{message} }, 'render';
-}
-
-sub formconfig_conf_ext : Chained('basic') : Args(0) :
-    FormConfig('basic/formconfig_conf_ext') {
-}
-
-sub formmethod : Chained('basic') : Args(0) : FormMethod('_load_form') {
-}
-
-sub _load_form : Private {
-    return { element => { name => 'basic_formmethod', } };
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/MultiForm.pm b/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/MultiForm.pm
deleted file mode 100644
index 3440a64..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/MultiForm.pm
+++ /dev/null
@@ -1,89 +0,0 @@
-package TestApp::Controller::MultiForm;
-
-use strict;
-use warnings;
-use base 'Catalyst::Controller::HTML::FormFu';
-
-sub multiform : Chained : CaptureArgs(0) {
-    my ( $self, $c ) = @_;
-
-    $c->stash->{template} = 'multiform.tt';
-}
-
-sub formconfig : Chained('multiform') : Args(0) : MultiFormConfig { }
-
-sub formconfig_FORM_COMPLETE {
-    my ( $self, $c ) = @_;
-    
-    my $multi = $c->stash->{multiform};
-    
-    if ( $multi->complete ) {
-        my $params = $multi->current_form->params;
-
-        $c->stash->{results} = join "\n",
-            map { sprintf "%s: %s", $_, $params->{$_} } keys %$params;
-
-        $c->stash->{message} = 'Complete';
-    }
-}
-
-sub formmethod : Chained('multiform') : Args(0) : MultiFormMethod('_load_form') { }
-
-sub formmethod_FORM_COMPLETE {
-    my ( $self, $c ) = @_;
-
-    my $multi = $c->stash->{multiform};
-
-    if ( $multi->complete ) {
-        my $params = $multi->current_form->params;
-
-        $c->stash->{results} = join "\n",
-            map { sprintf "%s: %s", $_, $params->{$_} } keys %$params;
-
-        $c->stash->{message} = 'Complete';
-    }
-}
-
-sub _load_form : Private {
-    return {
-        id                       => 'formmethod',
-        params_ignore_underscore => 1,
-
-        crypt_args => { '-key' => 'my secret', },
-
-        forms => [
-            { element => { name => 'page1' }, },
-            { element => { name => 'page2' }, }
-        ],
-    };
-}
-
-sub file_upload : Chained('multiform') : Args(0) : MultiFormConfig { }
-
-sub file_upload_FORM_COMPLETE {
-    my ( $self, $c ) = @_;
-
-    my $multi = $c->stash->{multiform};
-
-    if ( $multi->complete ) {
-        my $params = $multi->current_form->params;
-
-        $c->stash->{results} = '';
-
-        for ( keys %$params ) {
-            my $upload = $params->{$_};
-
-            my $size     = $upload->size;
-            my $filename = $upload->filename;
-            my $type     = $upload->type;
-
-            $c->stash->{results} .= <<END;
-param: $_, size: $size, filename: $filename, type: $type
-END
-        }
-
-        $c->stash->{message} = 'Complete';
-    }
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/MultiFormToken.pm b/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/MultiFormToken.pm
deleted file mode 100644
index ff7d8e5..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/MultiFormToken.pm
+++ /dev/null
@@ -1,59 +0,0 @@
-package TestApp::Controller::MultiFormToken;
-
-use strict;
-use warnings;
-use base 'Catalyst::Controller::HTML::FormFu';
-
-__PACKAGE__->config(
-    { 'Controller::HTML::FormFu' => { request_token_enable => 1 } } );
-
-sub multiformtoken : Chained : CaptureArgs(0) {
-    my ( $self, $c ) = @_;
-
-    $c->stash->{template} = 'multiform.tt';
-}
-
-sub formconfig : Chained('multiformtoken') : Args(0) :
-    MultiFormConfig('multiform/formconfig') {
-    my ( $self, $c ) = @_;
-
-    my $multi = $c->stash->{multiform};
-    $multi->action('/multiformtoken/formconfig');
-    if ( $multi->complete ) {
-        my $params = $multi->current_form->params;
-
-        $c->stash->{results} = join "\n",
-            map { sprintf "%s: %s", $_, $params->{$_} } keys %$params;
-
-        $c->stash->{message} = 'Complete';
-    }
-}
-
-sub file_upload : Chained('multiformtoken') : Args(0) : MultiFormConfig {
-    my ( $self, $c ) = @_;
-
-    my $multi = $c->stash->{multiform};
-
-    if ( $multi->complete ) {
-        my $params = $multi->current_form->params;
-
-        $c->stash->{results} = '';
-
-        for ( keys %$params ) {
-            my $upload = $params->{$_};
-
-            my $size     = $upload->size;
-            my $length   = length $upload->slurp;
-            my $filename = $upload->filename;
-            my $type     = $upload->type;
-
-            $c->stash->{results} .= <<END;
-param: $_, size: $size, length: $length, filename: $filename, type: $type
-END
-        }
-
-        $c->stash->{message} = 'Complete';
-    }
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Root.pm b/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Root.pm
deleted file mode 100644
index afd26a2..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Root.pm
+++ /dev/null
@@ -1,12 +0,0 @@
-package TestApp::Controller::Root;
-
-use strict;
-use warnings;
-use base 'Catalyst::Controller::HTML::FormFu';
-
-__PACKAGE__->config->{namespace} = '';
-
-sub end : ActionClass('RenderView') {
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Token.pm b/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Token.pm
deleted file mode 100644
index dde64ab..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/Token.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-package TestApp::Controller::Token;
-
-use strict;
-use warnings;
-use Data::Dumper;
-use base 'Catalyst::Controller::HTML::FormFu';
-
-__PACKAGE__->config(
-    { 'Controller::HTML::FormFu' => { request_token_enable => 1 } } );
-
-sub token : Chained : CaptureArgs(0) {
-    my ( $self, $c ) = @_;
-    $c->stash->{template} = 'form.tt';
-}
-
-sub form : Chained('token') : Args(0) : Form {
-    my ( $self, $c ) = @_;
-
-    my $form = $c->stash->{form};
-
-    $form->elements( [ { name => 'basic_form', constraint => ['Required'] }, { type => "Submit" } ] );
-	$form->process($c->req);
-    if ( $form->submitted_and_valid ) {
-        $c->res->body("VALID");
-    }
-}
-
-sub dump_session : Local {
-    my ( $self, $c ) = @_;
-    $c->res->body( Dumper $c->session );
-}
-
-sub count_token : Local {
-	my ( $self, $c ) = @_;
-	$c->res->body( scalar @{ $c->session->{__token} || [] } );
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/TokenExpire.pm b/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/TokenExpire.pm
deleted file mode 100644
index 960fdd0..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/Controller/TokenExpire.pm
+++ /dev/null
@@ -1,32 +0,0 @@
-package TestApp::Controller::TokenExpire;
-
-use strict;
-use warnings;
-use Data::Dumper;
-use base 'Catalyst::Controller::HTML::FormFu';
-
-__PACKAGE__->config( {
-        'Controller::HTML::FormFu' => {
-            request_token_session_key     => '_token',
-            request_token_enable          => 1,
-            request_token_field_name      => 'token',
-            request_token_expiration_time => -10
-        } } );
-
-sub tokenexpire : Chained : CaptureArgs(0) {
-    my ( $self, $c ) = @_;
-    $c->stash->{template} = 'form.tt';
-}
-
-sub form : Chained('tokenexpire') : Args(0) : Form {
-    my ( $self, $c ) = @_;
-
-    my $form = $c->stash->{form};
-
-    $form->elements( [ { name => 'basic_form' }, { type => "Submit" } ] );
-    if ( $form->submitted_and_valid ) {
-        $c->res->body("VALID");
-    }
-}
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/View/TT.pm b/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/View/TT.pm
deleted file mode 100644
index b48f4ce..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/lib/TestApp/View/TT.pm
+++ /dev/null
@@ -1,8 +0,0 @@
-package TestApp::View::TT;
-
-use strict;
-use base 'Catalyst::View::TT';
-
-__PACKAGE__->config( INCLUDE_PATH => [ TestApp->path_to('root') ], );
-
-1;
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/root/form.tt b/sources/Catalyst-Controller-HTML-FormFu/t/root/form.tt
deleted file mode 100644
index d56116e..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/root/form.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-[% form %]
-<p>[% message.join(', ') %]</p>
-</body>
-</html>
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/basic/formconfig.yml b/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/basic/formconfig.yml
deleted file mode 100644
index 6925264..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/basic/formconfig.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-elements:
-  - name: basic_formconfig
-    label: __uri_for(/uri_for)__
-    constraint:
-        - Required
-  
-  - type: Submit
-    name: submit
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/basic/formconfig_conf_ext.yml b/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/basic/formconfig_conf_ext.yml
deleted file mode 100644
index de6d2ed..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/basic/formconfig_conf_ext.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-elements:
-  - name: basic_formconfig_conf_ext
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/multiform/file_upload.yml b/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/multiform/file_upload.yml
deleted file mode 100644
index 7d5a321..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/multiform/file_upload.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-id: file-upload
-params_ignore_underscore: 1
-
-crypt_args:
-  -key: 'my secret'
-
-forms:
-  -
-    element:
-      type: File
-      name: image1
-  
-  -
-    element:
-      type: File
-      name: image2
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/multiform/formconfig.yml b/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/multiform/formconfig.yml
deleted file mode 100644
index 5c8908e..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/root/forms/multiform/formconfig.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-id: formconfig
-params_ignore_underscore: 1
-
-crypt_args:
-  -key: 'my secret'
-
-forms:
-  -
-    element:
-      name: page1
-  
-  -
-    element:
-      name: page2
diff --git a/sources/Catalyst-Controller-HTML-FormFu/t/root/multiform.tt b/sources/Catalyst-Controller-HTML-FormFu/t/root/multiform.tt
deleted file mode 100644
index cc57b3c..0000000
--- a/sources/Catalyst-Controller-HTML-FormFu/t/root/multiform.tt
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<body>
-[% IF multiform.complete %]
-Complete
-[% results %]
-[% ELSE %]
-[% multiform %]
-[% END %]
-</body>
-</html>

-- 
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