openinteract-commits

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

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

Modified Files:
	ReadRepository.pm ReadSPOPSConfig.pm ReadServerConfig.pm 
Log Message:
OIN-136: replace all OI2::Config::Base references with ::Bootstrap and all 'base.conf' references with 'bootstrap.ini'

Index: ReadRepository.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/ReadRepository.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReadRepository.pm	24 Jan 2005 17:17:31 -0000	1.1
--- ReadRepository.pm	26 Feb 2005 23:31:25 -0000	1.2
***************
*** 19,26 ****
      my ( $self, $ctx ) = @_;
      $log ||= get_logger( LOG_INIT );
!     my $base_config = $ctx->base_config;
!     $log->info( "Creating context from base config with ",
!                 "'", $base_config->website_dir, "'" );
!     $ctx->repository( OpenInteract2::Repository->new( $base_config ) );
  }
  
--- 19,26 ----
      my ( $self, $ctx ) = @_;
      $log ||= get_logger( LOG_INIT );
!     my $bootstrap = $ctx->bootstrap;
!     $log->info( "Creating context from bootstrap with ",
!                 "'", $bootstrap->website_dir, "'" );
!     $ctx->repository( OpenInteract2::Repository->new( $bootstrap ) );
  }
  
***************
*** 46,52 ****
  =head1 DESCRIPTION
  
! This setup action just passes the 'base_config' property (a
! L<OpenInteract2::Config::Base>) of the context to a constructor for
! L<OpenInteract2::Repository>.
  
  =head2 Setup Metadata
--- 46,52 ----
  =head1 DESCRIPTION
  
! This setup action just passes the 'bootstrap' property (a
! L<OpenInteract2::Config::Bootstrap>) of the context to a constructor
! for L<OpenInteract2::Repository>.
  
  =head2 Setup Metadata

Index: ReadSPOPSConfig.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/ReadSPOPSConfig.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReadSPOPSConfig.pm	24 Jan 2005 17:17:31 -0000	1.1
--- ReadSPOPSConfig.pm	26 Feb 2005 23:31:25 -0000	1.2
***************
*** 19,23 ****
  
  sub get_dependencies {
!     return ( 'read packages' );
  }
  
--- 19,23 ----
  
  sub get_dependencies {
!     return ( 'initialize actions' );
  }
  

Index: ReadServerConfig.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/ReadServerConfig.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReadServerConfig.pm	24 Jan 2005 17:17:31 -0000	1.1
--- ReadServerConfig.pm	26 Feb 2005 23:31:25 -0000	1.2
***************
*** 24,38 ****
      my ( $self, $ctx ) = @_;
      $log ||= get_logger( LOG_INIT );
!     my $base = $ctx->base_config;
!     unless ( ref $base eq 'OpenInteract2::Config::Base' ) {
!         oi_error "Cannot read server configuration: 'base_config' ",
                   "property of context not set properly";
      }
!     my $server_config_file = $base->get_server_config_file;
      unless ( $server_config_file ) {
          oi_error "Cannot read server configuration: filename not ",
!                  "defined in base config file ", $base->filename;
      }
!     my $config_type = $base->config_type;
      $log->info( "Reading server configuration as '$config_type' ",
                  "with '$server_config_file'" );
--- 24,38 ----
      my ( $self, $ctx ) = @_;
      $log ||= get_logger( LOG_INIT );
!     my $bootstrap = $ctx->bootstrap;
!     unless ( ref $bootstrap eq 'OpenInteract2::Config::Bootstrap' ) {
!         oi_error "Cannot read server configuration: 'bootstrap' ",
                   "property of context not set properly";
      }
!     my $server_config_file = $bootstrap->get_server_config_file;
      unless ( $server_config_file ) {
          oi_error "Cannot read server configuration: filename not ",
!                  "defined in bootstrap file ", $bootstrap->filename;
      }
!     my $config_type = $bootstrap->config_type;
      $log->info( "Reading server configuration as '$config_type' ",
                  "with '$server_config_file'" );
***************
*** 64,69 ****
  
  This setup action reads in the server configuration. To do so it needs
! information from the L<OpenInteract2::Config::Base> object registered
! with the context:
  
  =over 4
--- 64,69 ----
  
  This setup action reads in the server configuration. To do so it needs
! information from the L<OpenInteract2::Config::Bootstrap> object
! registered with the context:
  
  =over 4