[Zope-Checkins] SVN: Zope/branches/regebro-wsgi_support2/ Added CHANGES changes, and the new stuff into skel.

[Lennart Regebro]

Log message for revision 67793:
  Added CHANGES changes, and the new stuff into skel.
  

Changed:
  U   Zope/branches/regebro-wsgi_support2/doc/CHANGES.txt
  U   Zope/branches/regebro-wsgi_support2/skel/etc/zope.conf.in

-=-
Modified: Zope/branches/regebro-wsgi_support2/doc/CHANGES.txt
===================================================================
--- Zope/branches/regebro-wsgi_support2/doc/CHANGES.txt	2006-05-01 12:06:18 UTC (rev 67792)
+++ Zope/branches/regebro-wsgi_support2/doc/CHANGES.txt	2006-05-01 12:59:29 UTC (rev 67793)
@@ -48,6 +48,27 @@
       - Using FastCGI is offically deprecated.
 
     Features added
+    
+      - Experimental WSGI and Twisted support for http.
+        Zope now has a WSGI interface for integration with other
+        web-servers than ZServer. Most notably Twisted is supported.
+        The WSGI application is ZPublisher.WSGIPublisher.publish_module
+        
+        You can make ZServer use the twisted interface with the 
+        "use-wsgi on" keyword in the http-server section in zope.conf.
+        
+        You can run Twisted by installing Twisted (2.1 recommended) and
+        replacing the http-server section with a server section in 
+        zope.conf. It is not possible to run a Twisted server together with
+        a ZServer at the same time.
+        
+          <server>
+            address 8080
+            type Zope2-HTTP
+          </server>
+        
+        WSGI: http://www.python.org/dev/peps/pep-0333/
+        Twisted: http://twistedmatrix.com/
 
       - The traversal has been refactored to take heed of Zope3s 
         IPublishTraverse adapter interfaces. The ZCML directives 

Modified: Zope/branches/regebro-wsgi_support2/skel/etc/zope.conf.in
===================================================================
--- Zope/branches/regebro-wsgi_support2/skel/etc/zope.conf.in	2006-05-01 12:06:18 UTC (rev 67792)
+++ Zope/branches/regebro-wsgi_support2/skel/etc/zope.conf.in	2006-05-01 12:59:29 UTC (rev 67793)
@@ -904,6 +904,8 @@
   # valid keys are "address" and "force-connection-close"
   address 8080
   # force-connection-close on
+  # You can also use the WSGI interface between ZServer and ZPublisher:
+  # use-wsgi on
 </http-server>
 
 # Examples:
@@ -947,6 +949,13 @@
 #    user admin
 #    password 123
 #  </clock-server>
+#
+#  <server>
+#    # This uses Twisted as the web-server. You must install Twisted 
+#    # separately. You can't run Twisted and ZServer at same time.
+#    address 8080
+#    type Zope2-HTTP
+#  </server>
 
 
 # Database (zodb_db) section