From: Chris W. <la...@us...> - 2005-02-26 23:31:37
|
Update of /cvsroot/openinteract/OpenInteract2/sample/apache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2901/sample/apache Modified Files: startup.pl Log Message: OIN-136: replace all OI2::Config::Base references with ::Bootstrap and all 'base.conf' references with 'bootstrap.ini' Index: startup.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/apache/startup.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** startup.pl 25 Jun 2003 14:14:44 -0000 1.5 --- startup.pl 26 Feb 2005 23:31:25 -0000 1.6 *************** *** 5,20 **** use Apache::OpenInteract2::HttpAuth; use Log::Log4perl; ! use OpenInteract2::Config::Base; use OpenInteract2::Constants qw( :log ); use OpenInteract2::Context; ! my $BASE_CONFIG_FILE = '[% website_dir %]/conf/base.conf'; { Log::Log4perl::init( '[% website_dir %]/conf/log4perl.conf' ); ! my $base_config = OpenInteract2::Config::Base->new( ! { filename => $BASE_CONFIG_FILE } ); my $ctx = OpenInteract2::Context->create( ! $base_config, { temp_lib_create => 'create' } ); $ctx->assign_request_type( 'apache' ); $ctx->assign_response_type( 'apache' ); --- 5,21 ---- use Apache::OpenInteract2::HttpAuth; use Log::Log4perl; ! use OpenInteract2::Config::Bootstrap; use OpenInteract2::Constants qw( :log ); use OpenInteract2::Context; ! my $BOOTSTRAP_CONFIG_FILE = '[% website_dir %]/conf/bootstrap.ini'; { Log::Log4perl::init( '[% website_dir %]/conf/log4perl.conf' ); ! my $bootstrap = OpenInteract2::Config::Bootstrap->new({ ! filename => $BOOTSTRAP_CONFIG_FILE ! }); my $ctx = OpenInteract2::Context->create( ! $bootstrap, { temp_lib_create => 'create' } ); $ctx->assign_request_type( 'apache' ); $ctx->assign_response_type( 'apache' ); |