Removed JSAN support from core

diff --git a/Build.PL b/Build.PL
index c8e3df7..bc9e77f 100644 (file)
--- a/Build.PL
+++ b/Build.PL
@@ -29,7 +29,7 @@ my $build = Module::Build->new(
         'Tree::Simple::Visitor::FindByPath' => 0,
         'URI'                               => 1.35,
     },
-    recommends         => { 'Catalyst::Engine::Apache' => 0, JSAN => 0 },
+    recommends         => { 'Catalyst::Engine::Apache' => 0 },
     create_makefile_pl => 'passthrough',
     create_readme      => 1,
     script_files       => [ glob('script/*') ],

diff --git a/Changes b/Changes
index 3e00ccb..7ec9a4f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,7 +1,6 @@
 Tis file documents the revision history for Perl extension Catalyst.
 
 5.50
-        - Added JSAN support
         - Restarter process in HTTP engine now properly exits when the
           parent app is shut down.  
         - Improved performance of restarter loop while watching for

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 9e73489..f4dd674 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -10,6 +10,7 @@ use Catalyst::Request;
 use Catalyst::Request::Upload;
 use Catalyst::Response;
 use Catalyst::Utils;
+use JSAN::Parse::FileDeps;
 use NEXT;
 use Text::ASCIITable;
 use Path::Class;

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 59b8321..e3c2895 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -77,7 +77,6 @@ sub mk_app {
     $self->_mk_apptest;
     $self->_mk_cgi;
     $self->_mk_fastcgi;
-    $self->_mk_jsan;
     $self->_mk_server;
     $self->_mk_test;
     $self->_mk_create;
@@ -283,8 +282,6 @@ sub _mk_dirs {
     $self->mk_dir( $self->{static} );
     $self->{images} = File::Spec->catdir( $self->{static}, 'images' );
     $self->mk_dir( $self->{images} );
-    $self->{static} = File::Spec->catdir( $self->{static}, 'js' );
-    $self->mk_dir( $self->{static} );
     $self->{t} = File::Spec->catdir( $self->{dir}, 't' );
     $self->mk_dir( $self->{t} );
     $self->mk_dir( File::Spec->catdir( $self->{t}, 'M' ) );
@@ -357,14 +354,6 @@ sub _mk_fastcgi {
     chmod 0700, "$script/$appprefix\_fastcgi.pl";
 }
 
-sub _mk_jsan {
-    my $self      = shift;
-    my $script    = $self->{script};
-    my $appprefix = $self->{appprefix};
-    $self->render_file( 'jsan', "$script\/$appprefix\_jsan.pl" );
-    chmod 0700, "$script/$appprefix\_jsan.pl";
-}
-
 sub _mk_server {
     my $self      = shift;
     my $script    = $self->{script};
@@ -687,70 +676,6 @@ This library is free software, you can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
-__jsan__
-[% startperl %] -w
-
-use strict;
-use Catalyst;
-use Catalyst::Utils;
-use File::Spec;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-
-# Needed for home detection
-{
-    no warnings 'all';
-    sub Catalyst::setup {}
-    require [% name %];
-}
-
-my $home = Catalyst::Utils::home('[% name %]');
-$ENV{JSAN_PREFIX} ||= File::Spec->catdir( $home, 'root', 'static', 'js' );
-
-# JSAN shell
-eval 'require JSAN';
-die "Please install JSAN\n" if $@;
-JSAN->control;
-
-1;
-
-=head1 NAME
-
-[% appprefix %]_jsan.pl - JSAN shell
-
-=head1 SYNOPSIS
-
-[% appprefix %]_jsan.pl [options]
-
- Examples:
-   jsan> index
-   jsan> install Test.Simple
-
- See also:
-   perldoc Catalyst::Manual
-   perldoc Catalyst::Manual::Intro
-
-
-=head1 DESCRIPTION
-
-Install JavaScript libraries from the JSAN shell.
-
-=head1 SEE ALSO
-
-L<JSAN>, L<http://openjsan.org>
-
-=head1 AUTHOR
-
-Sebastian Riedel, C<sri@oook.de>
-
-=head1 COPYRIGHT
-
-Copyright 2004 Sebastian Riedel. All rights reserved.
-
-This library is free software, you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
 __server__
 [% startperl %] -w