[Catalyst-commits] r14115 - in trunk/Catalyst-Log-Log4perl: . lib/Catalyst/Log

t0m at dev.catalyst.perl.org t0m at dev.catalyst.perl.org
Tue Sep 27 18:05:02 GMT 2011


Author: t0m
Date: 2011-09-27 18:05:02 +0000 (Tue, 27 Sep 2011)
New Revision: 14115

Modified:
   trunk/Catalyst-Log-Log4perl/Changes
   trunk/Catalyst-Log-Log4perl/Makefile.PL
   trunk/Catalyst-Log-Log4perl/README
   trunk/Catalyst-Log-Log4perl/lib/Catalyst/Log/Log4perl.pm
Log:
Merge 'deprecated' branch

Modified: trunk/Catalyst-Log-Log4perl/Changes
===================================================================
--- trunk/Catalyst-Log-Log4perl/Changes	2011-09-27 18:01:33 UTC (rev 14114)
+++ trunk/Catalyst-Log-Log4perl/Changes	2011-09-27 18:05:02 UTC (rev 14115)
@@ -1,5 +1,8 @@
 Revision history for Catalyst::Log::Log4perl
 
+1.05
+  - DEPRECATED in favor of Log::Log4perl::Catalyst
+
 1.04 Sun Oct 18 19:00:00 BST 2009
   - Fixup copyright info
   - Add tests using Test::Log4perl contributed by Sebastian Willert

Modified: trunk/Catalyst-Log-Log4perl/Makefile.PL
===================================================================
--- trunk/Catalyst-Log-Log4perl/Makefile.PL	2011-09-27 18:01:33 UTC (rev 14114)
+++ trunk/Catalyst-Log-Log4perl/Makefile.PL	2011-09-27 18:05:02 UTC (rev 14115)
@@ -1,16 +1,14 @@
 use inc::Module::Install 0.87;
+use Module::Install::ReadmeFromPod;
 
 name 'Catalyst-Log-Log4perl';
 all_from 'lib/Catalyst/Log/Log4perl.pm';
-requires( 'Catalyst'         => '5.60' );
-requires( 'Log::Log4perl'    => '1.04');
-requires( 'Params::Validate' => 0 );
-requires( 'Data::Dump' => 0 );
-requires( 'MRO::Compat' => 0 );
+readme_from;
+resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/trunk/historical/Catalyst-Log-Log4perl';
 
+test_requires 'Test::More';
+
 auto_include;
 auto_install;
 
-resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/trunk/Catalyst-Log-Log4perl/';
-
-WriteAll
+WriteAll;

Modified: trunk/Catalyst-Log-Log4perl/README
===================================================================
--- trunk/Catalyst-Log-Log4perl/README	2011-09-27 18:01:33 UTC (rev 14114)
+++ trunk/Catalyst-Log-Log4perl/README	2011-09-27 18:05:02 UTC (rev 14115)
@@ -1,18 +1,6 @@
 NAME
-    Catalyst::Log::Log4perl - Log::Log4perl logging for Catalyst
+    Catalyst::Log::Log4perl - DEPRECATED (see Log::Log4perl::Catalyst)
 
-SYNOPSIS
-    In MyApp.pm:
-
-        use Catalyst::Log::Log4perl;
-        MyApp->log(
-            Catalyst::Log:Log4perl->new("log4perl.conf")
-        );
-
-    And later...
-
-        $c->log->debug("This is using log4perl!");
-
 DESCRIPTION
     This module provides a Catalyst::Log implementation that uses
     Log::Log4perl as the underlying log mechanism. It provides all the
@@ -42,65 +30,29 @@
     See Log::Log4perl for more information on how to configure different
     logging mechanisms based on the component.
 
-METHODS
-    new($config)
-        This builds a new Catalyst::Log::Log4perl object. If you provide an
-        argument to new(), it will be passed directly to
-        Log::Log4perl::init.
+SEE ALSO
+    Log::Log4perl, Log::Log4perl::Catalyst, Catalyst::Log, Catalyst.
 
-        Without any arguments, it will initialize a root logger with a singe
-        appender, Log::Log4perl::Appender::Screen, configured to have an
-        identical layout to the default Catalyst::Log object.
+AUTHORS
+    Adam Jacob, "adam at stalecoffee.org"
 
-    debug($message)
-        Passes it's arguments to $logger->debug.
+    Andreas Marienborg, "omega at palle.net"
 
-    info($message)
-        Passes it's arguments to $logger->info.
+    Gavin Henry, "ghenry at suretecsystems.com" (Typos)
 
-    warn($message)
-        Passes it's arguments to $logger->warn.
+    Sebastian Willert (Overriding CSPECS)
 
-    error($message)
-        Passes it's arguments to $logger->error.
+    J. Shirley "jshirley at gmail.com" (Adding _dump)
 
-    fatal($message)
-        Passes it's arguments to $logger->fatal.
+    Tomas Doran (t0m) "bobtfish at bobtfish.net"
 
-    is_debug()
-        Calls $logger->is_debug.
+    Wallace Reis (wreis) "wreis at cpan.org" (Current maintainer)
 
-    is_info()
-        Calls $logger->is_info.
+COPYRIGHT
+    Copyright (c) 2005 - 2011 the Catalyst::Log::Log4perl "AUTHORS" as
+    listed above.
 
-    is_warn()
-        Calls $logger->is_warn.
-
-    is_error()
-        Calls $logger->is_error.
-
-    is_fatal()
-        Calls $logger->is_fatal.
-
-    levels()
-        This method does nothing but return "0". You should use
-        Log::Log4perl's built in mechanisms for setting up log levels.
-
-    enable()
-        This method does nothing but return "0". You should use
-        Log::Log4perl's built in mechanisms for enabling log levels.
-
-    disable()
-        This method does nothing but return "0". You should use
-        Log::Log4perl's built in mechanisms for disabling log levels.
-
-SEE ALSO
-        Log::Log4perl, Catalyst::Log, Catalyst.
-
-AUTHOR
-        Adam Jacob, "adam at stalecoffee.org"
-
 LICENSE
-        This library is free software. You can redistribute it and/or modify
-        it under the same terms as perl itself.
+    This library is free software. You can redistribute it and/or modify it
+    under the same terms as perl itself.
 

Modified: trunk/Catalyst-Log-Log4perl/lib/Catalyst/Log/Log4perl.pm
===================================================================
--- trunk/Catalyst-Log-Log4perl/lib/Catalyst/Log/Log4perl.pm	2011-09-27 18:01:33 UTC (rev 14114)
+++ trunk/Catalyst-Log-Log4perl/lib/Catalyst/Log/Log4perl.pm	2011-09-27 18:05:02 UTC (rev 14115)
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-Catalyst::Log::Log4perl - Log::Log4perl logging for Catalyst
+Catalyst::Log::Log4perl - DEPRECATED (see Log::Log4perl::Catalyst)
 
 =head1 SYNOPSIS
 
@@ -68,9 +68,14 @@
 use Log::Log4perl::Level;
 use Params::Validate;
 use Data::Dump;
+use Carp 'carp';
 
-our $VERSION = '1.04';
+our $VERSION = '1.05';
 
+BEGIN {
+    carp 'Catalyst::Log::Log4perl is DEPRECATED, update your app to use Log::Log4perl::Catalyst';
+}
+
 {
     my @levels = qw[ debug info warn error fatal ];
 
@@ -390,6 +395,8 @@
 
 Tomas Doran (t0m) C<bobtfish at bobtfish.net> (Current maintainer)
 
+Wallace Reis (wreis) C<wreis at cpan.org>
+
 =head1 COPYRIGHT
 
 Copyright (c) 2005 - 2009




More information about the Catalyst-commits mailing list