summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2017-12-07 05:37:40 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2017-12-07 05:37:40 +0200
commit7a06349587e2fe0cb1b5c74185d2f507173409c4 (patch)
treefb488c11d0b6185defa43cc717ab0c37356fb538
parentb4cf13ffdacb47686cdee6b31155f325800c9bcc (diff)
downloadacpp-7a06349587e2fe0cb1b5c74185d2f507173409c4.tar.gz
acpp-7a06349587e2fe0cb1b5c74185d2f507173409c4.tar.bz2
Rename module to Apache::Config::Preproc
-rw-r--r--Makefile.PL6
-rw-r--r--lib/Apache/Config/Preproc.pm (renamed from lib/Apache/Admin/Config/Expand.pm)18
-rw-r--r--lib/Apache/Config/Preproc/compact.pm (renamed from lib/Apache/Admin/Config/Expand/compact.pm)2
-rw-r--r--lib/Apache/Config/Preproc/ifmodule.pm (renamed from lib/Apache/Admin/Config/Expand/ifmodule.pm)2
-rw-r--r--lib/Apache/Config/Preproc/include.pm (renamed from lib/Apache/Admin/Config/Expand/include.pm)4
-rw-r--r--t/TestPreproc.pm (renamed from t/TestExpand.pm)4
-rw-r--r--t/inc.t4
-rw-r--r--t/nested.t4
-rw-r--r--t/patopt01.t4
-rw-r--r--t/patopt02.t4
-rw-r--r--t/pattern.t4
-rw-r--r--t/recursive.t4
12 files changed, 30 insertions, 30 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 0edde9e..cbb0a7e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,11 +2,11 @@ use strict;
use ExtUtils::MakeMaker;
use Module::Metadata;
-WriteMakefile(NAME => 'Apache::Admin::Config::Expand',
- VERSION_FROM => 'lib/Apache/Admin/Config/Expand.pm',
+WriteMakefile(NAME => 'Apache::Config::Preproc',
+ VERSION_FROM => 'lib/Apache/Config/Preproc.pm',
AUTHOR => 'Sergey Poznyakoff <gray@gnu.org>',
LICENSE => 'gpl_3',
- ABSTRACT_FROM => 'lib/Apache/Admin/Config/Expand.pm',
+ ABSTRACT_FROM => 'lib/Apache/Config/Preproc.pm',
PREREQ_PM => {
'Apache::Admin::Config' => '0.95',
'File::Spec' => '3.39_02'
diff --git a/lib/Apache/Admin/Config/Expand.pm b/lib/Apache/Config/Preproc.pm
index ae57be0..99a86aa 100644
--- a/lib/Apache/Admin/Config/Expand.pm
+++ b/lib/Apache/Config/Preproc.pm
@@ -1,4 +1,4 @@
-package Apache::Admin::Config::Expand;
+package Apache::Config::Preproc;
use parent 'Apache::Admin::Config';
use strict;
use warnings;
@@ -59,7 +59,7 @@ sub _preproc {
return $self->_preproc_section($self,
[ map {
- my $mod = 'Apache::Admin::Config::Expand::'.$_;
+ my $mod = 'Apache::Config::Preproc::'.$_;
(my $file = $mod) =~ s|::|/|g;
require $file . '.pm';
$mod->new
@@ -96,18 +96,18 @@ __END__
=head1 NAME
-Apache::Admin::Config::Expand - Preprocess Apache configuration files
+Apache::Config::Preproc - Preprocess Apache configuration files
=head1 SYNOPSIS
- use Apache::Admin::Config::Expand;
+ use Apache::Config::Preproc;
- $x = new Apache::Admin::Config::Expand '/path/to/httpd.conf', '-compact'
+ $x = new Apache::Config::Preproc '/path/to/httpd.conf', '-compact'
or die $Apache::Admin::Config::ERROR;
=head1 DESCRIPTION
-B<Apache::Admin::Config::Expand> reads and parses Apache configuration
+B<Apache::Config::Preproc> reads and parses Apache configuration
file, expanding any B<Include> and B<IncludeOptional> statements. Optionally,
whitespace and comments are eliminated. Apart from this, it provides the
same functionality as B<Apache::Admin::Config>, from which it inherits all
@@ -117,7 +117,7 @@ methods.
=head2 new
- $obj = new Apache::Admin::Config::Expand [/path/to/file|handle],
+ $obj = new Apache::Config::Preproc [/path/to/file|handle],
[-compact],
[-indent => $integer], ['-create'], ['-no-comment-grouping'],
['-no-blank-grouping']
@@ -133,8 +133,8 @@ Rest of methods is inherited from B<Apache::Admin::Config>.
Print on standard output only statements from the configuration file
- use Apache::Admin::Config::Expand;
- $conf = new Apache::Admin::Config::Expand '/etc/http/httpd.conf',
+ use Apache::Config::Preproc;
+ $conf = new Apache::Config::Preproc '/etc/http/httpd.conf',
'-compact'
or die $Apache::Admin::Config::ERROR;
print $conf->dump_raw;
diff --git a/lib/Apache/Admin/Config/Expand/compact.pm b/lib/Apache/Config/Preproc/compact.pm
index fd648d0..f28d848 100644
--- a/lib/Apache/Admin/Config/Expand/compact.pm
+++ b/lib/Apache/Config/Preproc/compact.pm
@@ -1,4 +1,4 @@
-package Apache::Admin::Config::Expand::compact;
+package Apache::Config::Preproc::compact;
use strict;
use warnings;
diff --git a/lib/Apache/Admin/Config/Expand/ifmodule.pm b/lib/Apache/Config/Preproc/ifmodule.pm
index 603f90d..9fe73b7 100644
--- a/lib/Apache/Admin/Config/Expand/ifmodule.pm
+++ b/lib/Apache/Config/Preproc/ifmodule.pm
@@ -1,4 +1,4 @@
-package Apache::Admin::Config::Expand::ifmodule;
+package Apache::Config::Preproc::ifmodule;
use strict;
use warnings;
diff --git a/lib/Apache/Admin/Config/Expand/include.pm b/lib/Apache/Config/Preproc/include.pm
index a3d638c..800e77a 100644
--- a/lib/Apache/Admin/Config/Expand/include.pm
+++ b/lib/Apache/Config/Preproc/include.pm
@@ -1,8 +1,8 @@
-package Apache::Admin::Config::Expand::include;
+package Apache::Config::Preproc::include;
use strict;
use warnings;
use Apache::Admin::Config;
-use Apache::Admin::Config::Expand;
+use Apache::Config::Preproc;
use File::Spec;
use Carp;
diff --git a/t/TestExpand.pm b/t/TestPreproc.pm
index 4986070..7bcf121 100644
--- a/t/TestExpand.pm
+++ b/t/TestPreproc.pm
@@ -1,7 +1,7 @@
-package TestExpand;
+package TestPreproc;
use strict;
use warnings;
-use parent 'Apache::Admin::Config::Expand';
+use parent 'Apache::Config::Preproc';
use Carp;
use File::Basename;
use File::Temp;
diff --git a/t/inc.t b/t/inc.t
index 903d153..c9d0bd4 100644
--- a/t/inc.t
+++ b/t/inc.t
@@ -4,9 +4,9 @@ use strict;
use Test;
plan test => 1;
-use TestExpand;
+use TestPreproc;
-my $obj = new TestExpand '-compact';
+my $obj = new TestPreproc '-compact';
ok($obj->dump_raw, $obj->dump_expect);
__DATA__
diff --git a/t/nested.t b/t/nested.t
index 416c34c..d116b47 100644
--- a/t/nested.t
+++ b/t/nested.t
@@ -4,9 +4,9 @@ use strict;
use Test;
plan test => 1;
-use TestExpand;
+use TestPreproc;
-my $obj = new TestExpand '-compact';
+my $obj = new TestPreproc '-compact';
ok($obj->dump_raw, $obj->dump_expect);
__DATA__
diff --git a/t/patopt01.t b/t/patopt01.t
index 2869c20..bfe7fd9 100644
--- a/t/patopt01.t
+++ b/t/patopt01.t
@@ -4,9 +4,9 @@ use strict;
use Test;
plan test => 1;
-use TestExpand;
+use TestPreproc;
-my $obj = new TestExpand '-compact';
+my $obj = new TestPreproc '-compact';
ok($obj->dump_raw, $obj->dump_expect);
__DATA__
!>httpd.conf
diff --git a/t/patopt02.t b/t/patopt02.t
index b1eb4e2..f64c52d 100644
--- a/t/patopt02.t
+++ b/t/patopt02.t
@@ -4,9 +4,9 @@ use strict;
use Test;
plan test => 1;
-use TestExpand;
+use TestPreproc;
-my $obj = new TestExpand '-compact';
+my $obj = new TestPreproc '-compact';
ok($obj->dump_raw, $obj->dump_expect);
__DATA__
!>httpd.conf
diff --git a/t/pattern.t b/t/pattern.t
index 0854baf..3a8d978 100644
--- a/t/pattern.t
+++ b/t/pattern.t
@@ -4,9 +4,9 @@ use strict;
use Test;
plan test => 1;
-use TestExpand;
+use TestPreproc;
-my $obj = new TestExpand '-compact';
+my $obj = new TestPreproc '-compact';
ok($obj->dump_raw, $obj->dump_expect);
__DATA__
!>httpd.conf
diff --git a/t/recursive.t b/t/recursive.t
index b682fbf..9423a04 100644
--- a/t/recursive.t
+++ b/t/recursive.t
@@ -4,9 +4,9 @@ use strict;
use Test;
plan test => 2;
-use TestExpand;
+use TestPreproc;
-ok(!new TestExpand '-expect_fail', '-compact');
+ok(!new TestPreproc '-expect_fail', '-compact');
ok($Apache::Admin::Config::ERROR, qr/level1.conf already included/);
__DATA__
!>httpd.conf

Return to:

Send suggestions and report system problems to the System administrator.