[Zope3-checkins] SVN: Zope3/branches/srichter-twisted-integration/ Activated FTP again.

[Stephan Richter]

Log message for revision 30187:
  Activated FTP again.
  

Changed:
  U   Zope3/branches/srichter-twisted-integration/src/zope/app/server/configure.zcml
  U   Zope3/branches/srichter-twisted-integration/src/zope/app/server/ftp/server.py
  U   Zope3/branches/srichter-twisted-integration/zope.conf.in

-=-
Modified: Zope3/branches/srichter-twisted-integration/src/zope/app/server/configure.zcml
===================================================================
--- Zope3/branches/srichter-twisted-integration/src/zope/app/server/configure.zcml	2005-04-26 16:44:12 UTC (rev 30186)
+++ Zope3/branches/srichter-twisted-integration/src/zope/app/server/configure.zcml	2005-04-26 16:53:33 UTC (rev 30187)
@@ -22,12 +22,10 @@
       provides=".interfaces.IServerType"
       />
 
-<!--
   <utility
       name="FTP"
       component=".ftp.server"
       provides=".interfaces.IServerType"
       />
--->
 
 </configure>

Modified: Zope3/branches/srichter-twisted-integration/src/zope/app/server/ftp/server.py
===================================================================
--- Zope3/branches/srichter-twisted-integration/src/zope/app/server/ftp/server.py	2005-04-26 16:44:12 UTC (rev 30186)
+++ Zope3/branches/srichter-twisted-integration/src/zope/app/server/ftp/server.py	2005-04-26 16:53:33 UTC (rev 30187)
@@ -57,7 +57,7 @@
             avatar.logout = self.logout
             return ftp.IFTPShell, avatar, avatar.logout
         raise NotImplementedError, \
-                  "Only IFTPShell interface is supported by this realm")
+                  "Only IFTPShell interface is supported by this realm"
 
 class FTPFactory(ftp.FTPFactory):
     allowAnonymous = False

Modified: Zope3/branches/srichter-twisted-integration/zope.conf.in
===================================================================
--- Zope3/branches/srichter-twisted-integration/zope.conf.in	2005-04-26 16:44:12 UTC (rev 30186)
+++ Zope3/branches/srichter-twisted-integration/zope.conf.in	2005-04-26 16:53:33 UTC (rev 30187)
@@ -33,12 +33,10 @@
 #   address 8081
 # </server>
 
-# XXX: Deactivated FTP server right now, since twisted's FTP server is not
-# ready for prime time yet.
-# <server>
-#   type FTP
-#   address 8021
-# </server>
+<server>
+  type FTP
+  address 8021
+</server>
 
 # Standard Filestorage
 <zodb>