X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FServer.pm;h=af816938530d5170f5b0f4942945cc9262e3284b;hb=833d661f73c4a976952eab50f7d1df1613886d30;hp=8c469a6ba4683f271b7f85d224198fa0a1da11cb;hpb=4b3881d482a3a87ae5a1cd92bd3f11ad57d2d032;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 8c469a6..af81693 100644
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -10,8 +10,8 @@ use FindBin qw/$Bin/;
 use lib "$Bin/../lib";
 use Pod::Usage;
 use Moose;
-use Catalyst::Engine::HTTP;
-use namespace::clean -except => [ qw(meta) ];
+#use Catalyst::Engine::HTTP;
+use namespace::autoclean;
 
 with 'MooseX::Getopt';
 
@@ -20,14 +20,14 @@ has help => (
     cmd_aliases => 'h',
     isa => 'Bool',   
     is => 'ro', 
-    required => 0, 
+    , 
     default => 0,  
 );
 
 has host => ( 
     isa => 'Str',    
     is => 'ro', 
-    required => 0, 
+    , 
     default =>  "localhost" 
 );
 
@@ -36,7 +36,7 @@ has fork => (
     cmd_aliases => 'f',
     isa => 'Bool',
     is => 'ro', 
-    required => 0 
+     
 );
 
 has listen => ( 
@@ -44,7 +44,7 @@ has listen => (
     cmd_aliases => 'l',
     isa => 'Int',
     is => 'ro', 
-    required => 0, 
+    , 
     default => "3000" 
 );
 
@@ -53,7 +53,7 @@ has pidfile => (
     cmd_aliases => 'pid',
     isa => 'Str',    
     is => 'ro', 
-    required => 0 
+     
 );
 
 has keepalive => ( 
@@ -61,7 +61,7 @@ has keepalive => (
     cmd_aliases => 'k',
     isa => 'Bool',   
     is => 'ro', 
-    required => 0, 
+    , 
     default => 0 
 );
 
@@ -70,14 +70,15 @@ has background => (
     cmd_aliases => 'bg',
     isa => 'Bool',   
     is => 'ro', 
-    required => 0 
 );
 
-has app => ( 
+
+has _app => ( 
+    reader   => 'app', 
+    init_arg => 'app',
     traits => [qw(NoGetopt)],
     isa => 'Str',    
     is => 'ro', 
-    required => 1,
 ); 
 
 has restart => (
@@ -85,7 +86,7 @@ has restart => (
     cmd_aliases => 'r', 
     isa => 'Bool',   
     is => 'ro', 
-    required => 0 
+     
 );
 
 has restart_delay => ( 
@@ -93,7 +94,7 @@ has restart_delay => (
     cmd_aliases => 'rdel',
     isa => 'Int',    
     is => 'ro', 
-    required => 0 
+     
 );
 
 has restart_regex => ( 
@@ -101,7 +102,7 @@ has restart_regex => (
     cmd_aliases => 'rxp',
     isa => 'Str',    
     is => 'ro', 
-    required => 0 
+     
 );
 
 has follow_symlinks => ( 
@@ -109,7 +110,7 @@ has follow_symlinks => (
     cmd_aliases => 'sym',
     isa => 'Bool',   
     is => 'ro', 
-    required => 0 
+     
 );
 
 my @argv = @ARGV;
@@ -119,6 +120,7 @@ sub run {
     
     pod2usage() if $self->help;
     my $app = $self->app;
+    warn "App is $app";
     Class::MOP::load_class($app);
     $app->run(
         $self->listen, $self->host,