[dw-free] remove unneeded third party modules

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/4831ca8b1502]

http://bugs.dwscoalition.org/show_bug.cgi?id=2715

remove Test::FakeApache, superseded by routing.

Patch by fu.

Files modified:

• cgi-bin/Apache/LiveJournal.pm
• cgi-bin/LJ/Test.pm
• cvs/multicvs.conf
• t/00-compile.t

--------------------------------------------------------------------------------
diff -r 71d61411cb47 -r 4831ca8b1502 cgi-bin/Apache/LiveJournal.pm
--- a/cgi-bin/Apache/LiveJournal.pm	Tue Apr 19 19:40:49 2011 +0800
+++ b/cgi-bin/Apache/LiveJournal.pm	Tue Apr 19 20:00:10 2011 +0800
@@ -1008,16 +1008,6 @@ sub trans
 
     return FORBIDDEN if $uri =~ m!^/userpics!;
 
-    # avoid the fakeapache library having to deal with the <Files ~ *.bml> stuff
-    # in the modperl_startup.pl http_conf
-    if (ref($r) eq "Test::FakeApache::Request" && $host eq $LJ::DOMAIN_WEB) {
-        my $file = "$LJ::HTDOCS$uri";
-        $file .= "/index.bml" unless $uri =~ /\.bml$/;
-        $file =~ s!/{2,}!/!;
-        $r->notes->{bml_filename} = $file;
-        return Apache::BML::handler($r);
-    }
-
     return DECLINED;
 }
 
diff -r 71d61411cb47 -r 4831ca8b1502 cgi-bin/LJ/Test.pm
--- a/cgi-bin/LJ/Test.pm	Tue Apr 19 19:40:49 2011 +0800
+++ b/cgi-bin/LJ/Test.pm	Tue Apr 19 20:00:10 2011 +0800
@@ -20,17 +20,10 @@ use DW::Request::Standard;
 use DW::Request::Standard;
 use HTTP::Request;
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#              WARNING! PELIGROSO! ACHTUNG! VNIMANIYE!
-# some fools (aka mischa) try to use this library from web context,
-# so make sure it's psuedo-safe to do so.  like don't class-autouse
-# Test::FakeApache because that really fucks with things.
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
 use DBI;
 use LJ::ModuleCheck;
 our @ISA = qw(Exporter);
-our @EXPORT = qw(memcache_stress with_fake_memcache temp_user temp_comm temp_feed fake_apache routing_request);
+our @EXPORT = qw(memcache_stress with_fake_memcache temp_user temp_comm temp_feed routing_request);
 
 my @temp_userids;  # to be destroyed later
 END {
@@ -136,24 +129,6 @@ sub temp_feed {
 }
 
 
-
-my $fake_apache;
-sub fake_apache {
-    return $fake_apache if $fake_apache;
-    # TODO: load all the right libraries, if they haven't already been loaded before.
-    # currently a fakeapache-using test has to start with:
-    #   use strict;
-    #   use Test::More 'no_plan';
-    #   use lib "$LJ::HOME/cgi-bin";
-    #   require 'modperl.pl';
-    #   use LJ::Test;
-    # but that modperl.pl require is kinda ugly.
-    die "You don't have Test::FakeApache!" unless LJ::ModuleCheck->have("Test::FakeApache");
-    return $fake_apache = Test::FakeApache->new(
-                                                PerlInitHandler => \&Apache::LiveJournal::handler,
-                                                DocumentRoot => "$LJ::HOME/htdocs/",
-                                                );
-}
 
 sub with_fake_memcache (&) {
     my $cb = shift;
diff -r 71d61411cb47 -r 4831ca8b1502 cvs/multicvs.conf
--- a/cvs/multicvs.conf	Tue Apr 19 19:40:49 2011 +0800
+++ b/cvs/multicvs.conf	Tue Apr 19 20:00:10 2011 +0800
@@ -31,7 +31,6 @@ GIT(Data-ObjectDriver)    = git://github
 #SVN(openid)               = http://code.livejournal.org/svn/openid/trunk/
 SVN(ddlockd)              = http://code.livejournal.org/svn/ddlockd/trunk/
 SVN(miscperl)             = http://code.livejournal.org/svn/miscperl/trunk/
-SVN(Test-FakeApache)      = http://code.livejournal.org/svn/Test-FakeApache/trunk/
 SVN(LJ-UserSearch)        = http://code.livejournal.org/svn/LJ-UserSearch/trunk/
 SVN(TheSchwartz-Worker-SendEmail) = http://code.sixapart.com/svn/TheSchwartz-Worker-SendEmail/trunk/
 SVN(hubbub)               = http://pubsubhubbub.googlecode.com/svn/trunk/publisher_clients/
@@ -53,8 +52,6 @@ LWPx-ParanoidAgent/lib/LWPx             
 #openid/perl/Net-OpenID-Common/lib             cgi-bin
 vcv/bin/vcv                                   bin/vcv
 TheSchwartz/bin/schwartzmon                   bin/schwartzmon
-
-Test-FakeApache/lib                           cgi-bin
 
 js/                                           htdocs/js
 js/ImageRegionSelect/image-region-select.js   htdocs/js/image-region-select.js
diff -r 71d61411cb47 -r 4831ca8b1502 t/00-compile.t
--- a/t/00-compile.t	Tue Apr 19 19:40:49 2011 +0800
+++ b/t/00-compile.t	Tue Apr 19 20:00:10 2011 +0800
@@ -13,8 +13,6 @@ my $dir = File::Temp::tempdir( CLEANUP =
 # instead of waiting them to be fixed we are skipping them for now
 # They should be fixed or marked why they cannot run.
 my %SKIP = (
-    'Test/FakeApache.pm'      => 'needs Apache::Constants',
-
     'Data/ObjectDriver/Driver/DBD/SQLite.pm' => 'Bareword "DBI::SQL_BLOB"',
     'Data/ObjectDriver/Driver/DBD/Oracle.pm' => 'no Oracle',
 
--------------------------------------------------------------------------------