stas 2002/08/15 23:58:25
Modified: ModPerl-Registry/lib/ModPerl RegistryCooker.pm Registry.pm
PerlRun.pm
Log:
use ModPerl::ROOT:: symbol table for the common root of compiled packages,
but child nodes diverge into different subtrees by the driving package
Revision Changes Path
1.18 +3 -9 modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
Index: RegistryCooker.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RegistryCooker.pm 15 Aug 2002 16:17:52 -0000 1.17
+++ RegistryCooker.pm 16 Aug 2002 06:58:25 -0000 1.18
@@ -235,21 +235,15 @@
}
#########################################################################
# func: namespace_root
-# dflt: namespace_root_common
+# dflt: namespace_root
# desc: define the namespace root for storing compiled scripts
# args: $self - registry blessed object
# rtrn: the namespace root
#########################################################################
-*namespace_root = \&namespace_root_common;
-
-sub namespace_root_common {
- 'ModPerl::RegistryROOT';
-}
-
-sub namespace_root_local {
+sub namespace_root {
my $self = shift;
- join '::', ref($self), 'ROOT';
+ join '::', 'ModPerl::ROOT', ref($self),
}
#########################################################################
1.6 +1 -1 modperl-2.0/ModPerl-Registry/lib/ModPerl/Registry.pm
Index: Registry.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/Registry.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Registry.pm 15 Aug 2002 16:17:52 -0000 1.5
+++ Registry.pm 16 Aug 2002 06:58:25 -0000 1.6
@@ -28,7 +28,7 @@
run => 'run',
can_compile => 'can_compile',
make_namespace => 'make_namespace',
- namespace_root => 'namespace_root_common',
+ namespace_root => 'namespace_root',
namespace_from => 'namespace_from_filename',
is_cached => 'is_cached',
should_compile => 'should_compile_if_modified',
1.5 +1 -1 modperl-2.0/ModPerl-Registry/lib/ModPerl/PerlRun.pm
Index: PerlRun.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/PerlRun.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PerlRun.pm 15 Aug 2002 16:17:52 -0000 1.4
+++ PerlRun.pm 16 Aug 2002 06:58:25 -0000 1.5
@@ -28,7 +28,7 @@
run => 'run',
can_compile => 'can_compile',
make_namespace => 'make_namespace',
- namespace_root => 'namespace_root_common',
+ namespace_root => 'namespace_root',
namespace_from => 'namespace_from_filename',
is_cached => 'FALSE',
should_compile => 'TRUE',
