[Zope3-checkins] SVN: Zope3/branches/srichter-twisted-integration2/ Partial merge of 30033.

[Stephan Richter]

Log message for revision 38386:
  Partial merge of 30033.
  

Changed:
  A   Zope3/branches/srichter-twisted-integration2/server.pem
  A   Zope3/branches/srichter-twisted-integration2/zope-zserver.conf.in
  D   Zope3/branches/srichter-twisted-integration2/zope.conf.in

-=-
Copied: Zope3/branches/srichter-twisted-integration2/server.pem (from rev 30033, Zope3/branches/srichter-twisted-integration/server.pem)

Copied: Zope3/branches/srichter-twisted-integration2/zope-zserver.conf.in (from rev 38376, Zope3/branches/srichter-twisted-integration2/zope.conf.in)

Deleted: Zope3/branches/srichter-twisted-integration2/zope.conf.in
===================================================================
--- Zope3/branches/srichter-twisted-integration2/zope.conf.in	2005-09-08 12:10:41 UTC (rev 38385)
+++ Zope3/branches/srichter-twisted-integration2/zope.conf.in	2005-09-08 12:33:39 UTC (rev 38386)
@@ -1,71 +0,0 @@
-# identify the component configuration used to define the site:
-site-definition site.zcml
-
-# number of bytecode instructions to execute between checks for
-# interruptions (SIGINTR, thread switches):
-interrupt-check-interval 200
-
-<server http>
-  type WSGI-HTTP
-  address 8080
-</server>
-
-# uncomment this if you want the FTP server up and running
-#<server ftp>
-#  type FTP
-#  address 8021
-#</server>
-
-# For debugging purposes, you can use this publisher instead/as well
-# (obviously if it's as well, use a different port number). If there's
-# an exception, Zope will drop into pdb at the point of the exception.
-#<server dbhttp>
-#  type PostmortemDebuggingHTTP
-#  address 8080
-#</server>
-
-# Standard Filestorage
-<zodb main>
-  <filestorage>
-    path Data.fs
-  </filestorage>
-
-# uncomment this if you want to connect to a local ZEO server
-# instead:
-#  <zeoclient>
-#    server localhost:9999
-#    storage 1
-#    # ZEO client cache, in bytes
-#    cache-size 20MB
-#    # Uncomment to have a persistent disk cache
-#    #client zeo1
-#  </zeoclient>
-</zodb>
-
-<accesslog>
-  # This sets up logging to both a file (access.log) and to standard
-  # output (STDOUT).  The "path" setting can be a relative or absolute
-  # filesystem path or the tokens STDOUT or STDERR.
-
-  <logfile>
-    path access.log
-  </logfile>
-
-  <logfile>
-    path STDOUT
-  </logfile>
-</accesslog>
-
-<eventlog>
-  # This sets up logging to both a file (z3.log) and to standard
-  # output (STDOUT).  The "path" setting can be a relative or absolute
-  # filesystem path or the tokens STDOUT or STDERR.
-
-  <logfile>
-    path z3.log
-  </logfile>
-
-  <logfile>
-    path STDOUT
-  </logfile>
-</eventlog>