openinteract-commits

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/sample/apache2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2901/sample/apache2

Modified Files:
	startup_mp2.pl 
Log Message:
OIN-136: replace all OI2::Config::Base references with ::Bootstrap and all 'base.conf' references with 'bootstrap.ini'

Index: startup_mp2.pl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/sample/apache2/startup_mp2.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** startup_mp2.pl	19 Feb 2004 04:25:36 -0000	1.1
--- startup_mp2.pl	26 Feb 2005 23:31:25 -0000	1.2
***************
*** 6,10 ****
  use CGI;
  use Log::Log4perl;
! use OpenInteract2::Config::Base;
  use OpenInteract2::Constants qw( :log );
  use OpenInteract2::Context;
--- 6,10 ----
  use CGI;
  use Log::Log4perl;
! use OpenInteract2::Config::Bootstrap;
  use OpenInteract2::Constants qw( :log );
  use OpenInteract2::Context;
***************
*** 12,23 ****
  CGI->compile( ':all' );
  
! 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( 'apache2' );
      $ctx->assign_response_type( 'apache2' );
--- 12,24 ----
  CGI->compile( ':all' );
  
! 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( 'apache2' );
      $ctx->assign_response_type( 'apache2' );