X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=lib%2FMaypole%2FApplication.pm;h=ae95bb7ee3447df5524c2925adbc7b193d4c0bdc;hp=6804cdead609ff0eb4e9c1ca8ff05df88dfec155;hb=12d8a77a713d5ed4f08414e5f34e96d45f60e2d3;hpb=f4a654d5fee1b79ced98bb6d71a4f3b4bf402ecd

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index 6804cde..ae95bb7 100644
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -2,6 +2,7 @@ package Maypole::Application;
 
 use strict;
 use warnings;
+
 use UNIVERSAL::require;
 use Maypole;
 use Maypole::Config;
@@ -15,6 +16,8 @@ sub import {
     
     my $frontend = 'Apache::MVC' if $ENV{MOD_PERL};
     
+    $frontend = 'Maypole::HTTPD::Frontend' if $ENV{MAYPOLE_HTTPD};
+    
     my $masonx;
     if ( grep { /^MasonX$/ } @plugins )
     {
@@ -30,30 +33,31 @@ sub import {
     my $autosetup=0;
     my $autoinit=0;
     my @plugin_modules;
+
+    foreach (@plugins) 
     {
-        foreach (@plugins) {
-            if    (/^\-Setup$/) { $autosetup++; }
-            elsif (/^\-Init$/)  { $autoinit++ }
-            elsif (/^\-Debug(\d*)$/) {
-                my $d = $1 || 1;
-                no strict 'refs';
-                *{"$caller\::debug"} = sub { $d };
-                warn "Debugging (level $d) enabled for $caller";
-            }
-            elsif (/^-.*$/) { warn "Unknown flag: $_" }
-            else {
-                my $plugin = "Maypole::Plugin::$_";
-                if ($plugin->require) {
-                    push @plugin_modules, "Maypole::Plugin::$_";
-                    warn "Loaded plugin: $plugin for $caller"
-                        if $caller->can('debug') && $caller->debug;
-                } else {
-                    die qq(Loading plugin "$plugin" for $caller failed: )
-                        . $UNIVERSAL::require::ERROR;
-                }
+        if    (/^\-Setup$/) { $autosetup++; }
+        elsif (/^\-Init$/)  { $autoinit++ }
+        elsif (/^\-Debug(\d*)$/) {
+            my $d = $1 || 1;
+            no strict 'refs';
+            *{"$caller\::debug"} = sub { $d };
+            warn "Debugging (level $d) enabled for $caller";
+        }
+        elsif (/^-.*$/) { warn "Unknown flag: $_" }
+        else {
+            my $plugin = "Maypole::Plugin::$_";
+            if ($plugin->require) {
+                push @plugin_modules, "Maypole::Plugin::$_";
+                warn "Loaded plugin: $plugin for $caller"
+                    if $caller->can('debug') && $caller->debug;
+            } else {
+                die qq(Loading plugin "$plugin" for $caller failed: )
+                    . $UNIVERSAL::require::ERROR;
             }
         }
     }
+    
     no strict 'refs';
     push @{"${caller}::ISA"}, @plugin_modules, $frontend;
     $caller->config(Maypole::Config->new);