Webware for Python

Update of /cvsroot/webware/Webware/WebKit/Configs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21934/WebKit/Configs

Modified Files:
	AppServer.config Application.config CGIAdapter.config 
	FCGIAdapter.config OneShotAdapter.config 
Log Message:
* Configuration files can now be written as Python modules, where the
  global variables are keys in the configuration dictionary.  Old 
  configuration files are still supported.
* The default configuration files have updated with this new, more
  pleasant syntax.
* MakeAppWorkDir.py and install.py parse the new configuration files.
* MakeAppWorkDir.py accepts a couple new options -- one to set the 
  default context's home directory, and another to add library directories
  to the path (a generalization of the --library option).


Index: AppServer.config
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Configs/AppServer.config,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AppServer.config	24 Oct 2002 22:24:18 -0000	1.14
--- AppServer.config	26 May 2004 06:56:20 -0000	1.15
***************
*** 1,13 ****
! {
! 	'PrintConfigAtStartUp': 1,
! 	'Verbose':              1,
! 	'Host':                 '127.0.0.1',
! 	'Port':                 8086,
! 	'PlugIns':              [],
! 	'PlugInDirs':           ['%(WebwarePath)s'],
! 	'StartServerThreads':   10,
! 	'MaxServerThreads':     20,
! 	'MinServerThreads':     5,
! 	'CheckInterval':        100,
! 	'AutoReload':           0,
! }
--- 1,11 ----
! PrintConfigAtStartUp = True
! Verbose = True
! Host = '127.0.0.1'
! Port = 8086
! PlugIns = []
! PlugInDirs = [WebwarePath]
! StartServerThreads = 10
! MaxServerThreads = 20
! MinServerThreads = 5
! CheckInterval = 100
! AutoReload = False

Index: Application.config
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Configs/Application.config,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Application.config	4 Mar 2003 02:11:05 -0000	1.52
--- Application.config	26 May 2004 06:56:20 -0000	1.53
***************
*** 1,78 ****
! {
! 	'AdminPassword':	'', #You cannot log in with an empty password
! 	'PrintConfigAtStartUp': 1,
! 	'DirectoryFile':        ['index', 'Index','main','Main'],
! 	'ExtensionsToIgnore':   ['.pyc', '.pyo', '.py~', '.psp~', '.html~','.bak','.tmpl'],
! 	'ExtensionsToServe':  [], # if specified, only extensions in this list will be used
! 	'UseCascadingExtensions': 1,
! 	'ExtensionCascadeOrder':['.py','.psp','.html'],
! 	'FilesToHide': ['.*','*~', '*.bak', '*.tmpl', '*.config', '__init__.*', '*.pyc', '*.pyo'],
! 	'FilesToServe': [], # if specified, only files matching these patterns will be served
! 	'LogActivity':          0,
! 	'ActivityLogFilename':  'Logs/Activity.csv',
! 	'ActivityLogColumns':   ['request.remoteAddress', 'request.method', 'request.uri', 'response.size', 'servlet.name', 'request.timeStamp', 'transaction.duration', 'transaction.errorOccurred'],
! 	'Contexts':             {
! 							 'Admin':         '%(WebKitPath)s/Admin',
! 							 'Examples':      '%(WebKitPath)s/Examples',
! 							 # @@ sgd 2003-02-09 removed Docs context from 0.8 build.  
! 							 # Has been non-functional for some time, displaying an error on loading.
!                                                          # Should probably be directed at the Webware Docs, rather than
!                                                          # the WebKit Docs. 
! 							 #'Docs':          '%(WebKitPath)s/Docs',
! 							 'Testing':       '%(WebKitPath)s/Testing',
! 							 'default':       '%(WebKitPath)s/Examples', ##MAWD
! 							},
  
! 	'SessionStore':         'Dynamic',  # can be File or Dynamic or Memory
! 	'SessionTimeout':              60,  # minutes
! 	'MaxDynamicMemorySessions': 10000, # maximum sessions in memory
! 	'DynamicSessionTimeout':       15, # minutes, specifies when to move sessions from memory to disk
! 	'SessionPrefix':             None, # can be set to "hostname" or any other string to prefix the session ID
! 	'IgnoreInvalidSession':         1,
! 	'UseAutomaticPathSessions':     0,
  
! 	'ExtraPathInfo'       :         1, # set to 1 to allow extra path info to be attached to URLs
  
  
! 	'CacheServletClasses':          1, # set to 0 for debugging
! 	'CacheServletInstances':        1, # set to 0 for debugging
  
! 	'ClearPSPCacheOnStart':         1, # Set to 0 to let PSP cache persist from one AppServer run to the next.
! 	                                   # If you have PSPs that take a long time to compile, this can give a speedup.
  
! 	# Error handling
! 	'ShowDebugInfoOnErrors':  1,
! 	'IncludeFancyTraceback':  0,
!     'IncludeEditLink':        1,
! 	'FancyTracebackContext':  5,
! 	'UserErrorMessage':       'The site is having technical difficulties with this page. An error has been logged, and the problem will be fixed as soon as possible. Sorry!',
! 	'ErrorLogFilename':       'Logs/Errors.csv',
! 	'SaveErrorMessages':      1,
! 	'ErrorMessagesDir':       'ErrorMsgs',
! 	'EmailErrors':            0, # be sure to review the following settings when enabling error e-mails
! 	'ErrorEmailServer':       'mail.-.com',
! 	'EmailErrorReportAsAttachment': 0,
! 	'ErrorEmailHeaders':      { 'From':         '-@...',
! 		                        'To':           ['-@...'],
! 		                        'Reply-to':     '-@...',
! 		                        'Content-type': 'text/html',
! 		                        'Subject':      '[WebKit Error]',
! 		                        },
! 	'MaxValueLengthInExceptionReport': 500,
! 	'UnknownFileTypes': {
! 		'ReuseServlets': 1,
  
! 		# Technique choices:
! 		# serveContent, redirectSansAdapter
! 		'Technique': 'serveContent',
  
! 		# If serving content:
! 		'CacheContent': 1,  # set to 0 to reduce memory use
! 		'CheckDate':    1,
! 	},
! 	'OldStyleActions': 0,
! 	'RPCExceptionReturn': 'traceback',  # occurred, exception, traceback
! 	'ReportRPCExceptionsInWebKit': 1    # set to 0 if you don't want to have exceptions
! 										# in RPC servlets be reported in the logs and/or
! 										# by email.
! }
--- 1,87 ----
! # You cannot log in with an empty password:
! AdminPassword = 'test' 
! PrintConfigAtStartUp = True
! DirectoryFile = ['index', 'Index', 'main', 'Main']
! ExtensionsToIgnore = ['.pyc', '.pyo', '.py~', '.psp~', '.html~',
!                       '.bak','.tmpl']
! # if specified, only extensions in this list will be used:
! ExtensionsToServe = []
! UseCascadingExtensions = True
! ExtensionCascadeOrder = ['.py','.psp','.html'],
! FilesToHide = ['.*','*~', '*.bak', '*.tmpl', '*.config',
!                '__init__.*', '*.pyc', '*.pyo']
! # if specified, only files matching these patterns will be served:
! FilesToServe = []
! LogActivity = False
! ActivityLogFilename = 'Logs/Activity.csv'
! ActivityLogColumns = ['request.remoteAddress', 'request.method',
!                       'request.uri', 'response.size', 'servlet.name',
!                       'request.timeStamp', 'transaction.duration',
!                       'transaction.errorOccurred']
! Contexts = {}
! Contexts['Admin'] = WebKitPath + '/Admin'
! Contexts['Examples'] = WebKitPath + '/Examples'
! # @@ sgd 2003-02-09 removed Docs context from 0.8 build. 
! # Has been non-functional for some time, displaying an error on loading.
! # Should probably be directed at the Webware Docs, rather than
! # the WebKit Docs. 
! # Contexts['Docs'] = WebKitPath + '/Docs'
! Contexts['Testing'] = WebKitPath + '/Testing'
! Contexts['default'] = WebKitPath + '/Examples' ##MAWD
  
! SessionStore = 'Dynamic' # can be File or Dynamic or Memory
! SessionTimeout = 60 # minutes
! MaxDynamicMemorySessions = 10000 # maximum sessions in memory
! DynamicSessionTimeout = 15 # minutes, specifies when to move sessions from memory to disk
! SessionPrefix = None # can be set to "hostname" or any other string to prefix the session ID
! IgnoreInvalidSession = True
! UseAutomaticPathSessions = False
  
! ExtraPathInfo = True # set to True to allow extra path info to be attached to URLs
  
+ CacheServletClasses = True # set to False for debugging
+ CacheServletInstances = True # set to False for debugging
  
! # Set to False to let PSP cache persist from one AppServer run to the
! # next. If you have PSPs that take a long time to compile, this can
! # give a speedup.
! ClearPSPCacheOnStart = True 
  
! # Error handling:
! ShowDebugInfoOnErrors = True
! IncludeFancyTraceback = False
! IncludeEditLink = True
! FancyTracebackContext = 5
! UserErrorMessage = '''
! The site is having technical difficulties with this page. An error has
! been logged, and the problem will be fixed as soon as possible. Sorry!
! '''
  
! ErrorLogFilename = 'Logs/Errors.csv'
! SaveErrorMessages = True
! ErrorMessagesDir = 'ErrorMsgs'
! EmailErrors = False # be sure to review the following settings when enabling error e-mails
! ErrorEmailServer = 'mail.-.com'
! EmailErrorReportAsAttachment = False
! ErrorEmailHeaders = {'From': '-@...',
!                      'To': ['-@...'],
!                      'Reply-to': '-@...',
!                      'Content-type': 'text/html',
!                      'Subject': '[WebKit Error]',
!                      }
  
! MaxValueLengthInExceptionReport = 500
  
! UnknownFileTypes = {
!     'ReuseServlets': True,
!     # Technique choices:
!     #   serveContent, redirectSansAdapter
!     'Technique': 'serveContent',
!     'CacheContent': True, # set to False to reduce memory use
!     'CheckDate': True}
! 
! OldStyleActions = False
! RPCExceptionReturn = 'traceback' # occurred, exception, traceback
! # set to False if you don't want to have exceptions in RPC servlets be
! # reported in the logs and/or by email:
! ReportRPCExceptionsInWebKit = True 

Index: CGIAdapter.config
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Configs/CGIAdapter.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CGIAdapter.config	8 Dec 2000 00:54:50 -0000	1.1
--- CGIAdapter.config	26 May 2004 06:56:20 -0000	1.2
***************
*** 1,4 ****
! {
! 		'NumRetries':            20,
! 		'SecondsBetweenRetries': 3
! }
--- 1,2 ----
! NumRetries = 20
! SecondsBetweenRetries = 3

Index: FCGIAdapter.config
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Configs/FCGIAdapter.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FCGIAdapter.config	8 Dec 2000 00:54:50 -0000	1.1
--- FCGIAdapter.config	26 May 2004 06:56:20 -0000	1.2
***************
*** 1,4 ****
! {
! 		'NumRetries':            20,
! 		'SecondsBetweenRetries': 3
! }
--- 1,2 ----
! NumRetries = 20
! SecondsBetweenRetries = 3

Index: OneShotAdapter.config
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Configs/OneShotAdapter.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OneShotAdapter.config	17 Jan 2001 22:40:14 -0000	1.3
--- OneShotAdapter.config	26 May 2004 06:56:20 -0000	1.4
***************
*** 1,5 ****
! {
! 	'ShowConsole':           0,
! 	'ConsoleWidth':          80,  # use 0 to turn off word wrap
! 	'ConsoleHangingIndent':  4,
! }
--- 1,3 ----
! ShowConsole = 0
! ConsoleWidth = 80  # use 0 to turn off word wrap
! ConsoleHangingIndent = 4