Added preloading

Removed evil overload
Removed references to Apache2:: from codebase
Attempted to remove circular references

lib/WebGUI/Asset/Wobject/HttpProxy.pm

@@ -20,7 +20,6 @@ use WebGUI::International;
 use WebGUI::Storage;
 use WebGUI::Asset::Wobject::HttpProxy::Parse;
 use WebGUI::Macro;
-use Apache2::Upload;
 use Tie::IxHash;
 
 use Moose;

lib/WebGUI/Macro/UsersOnline.pm

@@ -19,7 +19,6 @@ package WebGUI::Macro::UsersOnline;
 =cut
 
 use strict;
-use Apache2::ServerRec;
 use Net::DNS;
 use WebGUI::Asset::Template;
 use WebGUI::International;

lib/WebGUI/Middleware/Session.pm

@@ -9,6 +9,7 @@ use Plack::Middleware::Debug;
 use WebGUI::Middleware::HTTPExceptions;
 use Plack::Middleware::ErrorDocument;
 use Plack::Middleware::SimpleLogger;
+use Scalar::Util qw(weaken);
 
 use Plack::Util::Accessor qw( config error_docs );
 
@@ -33,6 +34,8 @@ sub call {
     my ( $self, $env ) = @_;
 
     my $app = $self->app;
+    weaken $self->{config};
+    
     my $config = $self->config or die 'Mandatory config parameter missing';
     
     # Logger fallback
@@ -59,6 +62,9 @@ sub call {
             return [ 500, [ 'Content-Type' => 'text/plain' ], [ 'Internal Server Error' ] ];
         }
     }
+    
+    # Perhaps I'm being paranoid..
+    weaken $session->{_config};
 
     my $debug = $session->log->canShowDebug;
     if ($debug) {

lib/WebGUI/Storage.pm

@@ -363,8 +363,6 @@ sub addFileFromFormPost {
     my $session = $self->session;
     return ""
         if ($self->session->http->getStatus eq '413');
-    require Apache2::Request;
-    require Apache2::Upload;
     my $filename;
     my $attachmentCount = 1;
     foreach my $upload ($session->request->upload($formVariableName)) {

lib/WebGUI/Workflow/Activity/SendWebguiStats.pm

@@ -21,7 +21,6 @@ use HTTP::Request;
 use HTTP::Request::Common qw(POST);
 use LWP::UserAgent;
 use Digest::MD5;
-use Apache2::ServerUtil;
 
 =head1 NAME
 
@@ -80,7 +79,7 @@ sub execute {
     my $stats = {
         webguiVersion   => $WebGUI::VERSION,
         perlVersion     => sprintf("%vd", $^V),
-        apacheVersion   => Apache2::ServerUtil::get_server_version(),
+        apacheVersion   => 'X',
         osType          => $^O,
         siteId          => Digest::MD5::md5_base64($self->session->config->get("sitename")->[0]), # only here to identify the site if the user submits their info a second time
         userCount       => $db->quickScalar("select count(*) from users"),