merged conflicts

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine / HTTP.pm

diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm
index 4ec9fb3..cf43c0d 100644 (file)
--- a/lib/Catalyst/Engine/HTTP.pm
+++ b/lib/Catalyst/Engine/HTTP.pm
@@ -1,44 +1,44 @@
-package Catalyst::Engine::HTTP;
-
+package # Hide from PAUSE
+    Catalyst::Engine::HTTP;
 use strict;
-use base 'Catalyst::Engine::HTTP::Daemon';
+use warnings;
 
-=head1 NAME
+use base 'Catalyst::Engine';
 
-Catalyst::Engine::HTTP - Catalyst HTTP Engine
+warn("You are loading Catalyst::Engine::HTTP explicitly.
 
-=head1 SYNOPSIS
+This is almost certainly a bad idea, as Catalyst::Engine::HTTP
+has been removed in this version of Catalyst.
 
-A script using the Catalyst::Engine::HTTP module might look like:
+Please update your application's scripts with:
 
-    #!/usr/bin/perl -w
+  catalyst.pl -force -scripts MyApp
 
-    BEGIN {  $ENV{CATALYST_ENGINE} = 'HTTP' }
+to update your scripts to not do this.\n") unless $ENV{HARNESS_ACTIVE};
 
-    use strict;
-    use lib '/path/to/MyApp/lib';
-    use MyApp;
+1;
 
-    MyApp->run;
+__END__
 
-=head1 DESCRIPTION
+=head1 NAME
 
-This is the Catalyst engine specialized for development and testing.
+Catalyst::Engine::HTTP - removed module
 
-=head1 SEE ALSO
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
 
-L<Catalyst>, L<Catalyst::Engine>, L<Catalyst::Engine::HTTP::Daemon>.
+This is here only as some old generated scripts require Catalyst::Engine::HTTP
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Sebastian Riedel, C<sri@cpan.org>
-Christian Hansen, C<ch@ngmedia.com>
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
+This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;