[Openinteract-commits] CVS: OpenInteract/conf sample-server.perl,1.26,1.27

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

Update of /cvsroot/openinteract/OpenInteract/conf
In directory usw-pr-cvs1:/tmp/cvs-serv26968

Modified Files:
	sample-server.perl 
Log Message:
make all modifications from moving to .ini-style


Index: sample-server.perl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/conf/sample-server.perl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** sample-server.perl	2001/10/11 03:29:01	1.26
--- sample-server.perl	2001/10/17 04:54:30	1.27
***************
*** 55,58 ****
--- 55,64 ----
  
  
+      'datasource' => {
+        'default_connection_db'   => 'main',
+        'default_connection_ldap' => 'main',
+      },
+ 
+ 
       ########################################
       # DBI Datasource Definitions
***************
*** 89,93 ****
       #     long_read_len (see DBI docs under 'LongTruncOk')
  
-      'default_connection_db' => 'main',
       'db_info' => { 
             main => {
--- 95,98 ----
***************
*** 137,141 ****
       #     See entry in Net::LDAP->new() for possible values
  
-      'default_connection_ldap' => 'main',
       'ldap_info' => {
             main => {
--- 142,145 ----
***************
*** 308,311 ****
--- 312,320 ----
         'compile_ext' => '.ttc',
  
+        # Extension for template files -- used to lookup files by
+        # the TT provider module (shouldn't need to change).
+ 
+        'template_ext' => 'tmpl',
+ 
       },
  
***************
*** 321,335 ****
  
       'system_alias' => {
!        'OpenInteract::Cookies::Apache'    => [ qw/ cookies / ],
!        'OpenInteract::Session::DBI'       => [ qw/ session / ],
!        'OpenInteract::Template::Process'  => [ qw/ template / ],
!        'OpenInteract::PackageRepository'  => [ qw/ repository / ],
!        'OpenInteract::Package'            => [ qw/ package / ],
!        'OpenInteract::Error'              => [ qw/ error / ],
!        'OpenInteract::Auth'               => [ qw/ auth auth_user auth_group / ],
!        '%%WEBSITE_NAME%%::Security'       => [ qw/ security_object object_security security / ],
!        'SPOPS::Secure'                    => [ qw/ secure / ],
!        'OpenInteract::Error::Main'        => [ qw/ error_handler / ],
!        'OpenInteract::Handler::Component' => [ qw/ component / ],
       },
  
--- 330,348 ----
  
       'system_alias' => {
!        cookies         => 'OpenInteract::Cookies::Apache',
!        session         => 'OpenInteract::Session::DBI',
!        template        => 'OpenInteract::Template::Process',
!        repository      => 'OpenInteract::PackageRepository',
!        package         => 'OpenInteract::Package',
!        error           => 'OpenInteract::Error',
!        auth            => 'OpenInteract::Auth',
!        auth_user       => 'OpenInteract::Auth',
!        auth_group      => 'OpenInteract::Auth',
!        security_object => '%%WEBSITE_NAME%%::Security',
!        object_security => '%%WEBSITE_NAME%%::Security',
!        security        => '%%WEBSITE_NAME%%::Security',
!        secure          => 'SPOPS::Secure',
!        error_handler   => 'OpenInteract::Error::Main',
!        component       => 'OpenInteract::Handler::Component',
       },
  
***************
*** 401,421 ****
       # Errors
       #
!      # Class of error object (shouldn't need to change)
! 
!      'error_object_class'    => '%%WEBSITE_NAME%%::ErrorObject',
! 
!      # Class of default error handler -- one that can handle
!      # every error thrown by OpenInteract (shouldn't need to
       # change)
! 
!      'default_error_handler' => 'OpenInteract::Error::System',
  
!      ########################################
!      # File Extensions
!      #
!      # Extension for template files -- used to lookup files by
!      # the TT provider module (shouldn't need to change).
  
-      'template_ext'     => 'tmpl',
  
       ########################################
--- 414,428 ----
       # Errors
       #
!      # error_object_class: Class of error object (shouldn't need to
       # change)
!      # default_error_handler: Class of default error handler -- one
!      # that can handle every error thrown by OpenInteract (shouldn't
!      # need to change)
  
!      'error' => {
!         'error_object_class'    => '%%WEBSITE_NAME%%::ErrorObject',
!         'default_error_handler' => 'OpenInteract::Error::System',
!      },
  
  
       ########################################
***************
*** 425,431 ****
       # overwritten at server startup.
  
!      'stash_class'      => '',
!      'website_name'     => '',
!      'request_class'    => '',
  
       ########################################
--- 432,440 ----
       # overwritten at server startup.
  
!      'server_info' => {
!         'stash_class'      => '',
!         'website_name'     => '',
!         'request_class'    => '',
!      },
  
       ########################################
***************
*** 452,471 ****
       # how OpenInteract should respond to a null action (under the ''
       # key) and how it should respond to an action that is not found
!      # (under '_notfound_')
! 
!      # Note that we used to use 'default' instead of
!      # '_default_action_info_' -- the former is now deprecated, so you
!      # should move to the new one!
  
!      'action' => {
!        '_default_action_info_' => {
             'template_processor'  => 'OpenInteract::Template::Process',
             'conductor' => 'main',
             'method'    => 'handler',           
         },
!        '' => {
             'redir'     => 'basicpage',
         },
!        '_notfound_' => {
             'redir'     => 'basicpage',
         },
--- 461,476 ----
       # how OpenInteract should respond to a null action (under the ''
       # key) and how it should respond to an action that is not found
!      # (under 'not_found')
  
!      'action_info' => {
!        'default' => {
             'template_processor'  => 'OpenInteract::Template::Process',
             'conductor' => 'main',
             'method'    => 'handler',           
         },
!        'none' => {
             'redir'     => 'basicpage',
         },
!        'not_found' => {
             'redir'     => 'basicpage',
         },