[Checkins] SVN: zf.zscp/trunk/src/zf/zscp/website/ Remove unused attribtes from IZSCPSite (website)

[Roger Ineichen]

Log message for revision 66714:
  Remove unused attribtes from IZSCPSite (website)
  Now we provide this information directly in the Repository object

Changed:
  U   zf.zscp/trunk/src/zf/zscp/website/browser/repository.zcml
  U   zf.zscp/trunk/src/zf/zscp/website/browser/site.zcml
  U   zf.zscp/trunk/src/zf/zscp/website/interfaces.py
  U   zf.zscp/trunk/src/zf/zscp/website/site.py

-=-
Modified: zf.zscp/trunk/src/zf/zscp/website/browser/repository.zcml
===================================================================
--- zf.zscp/trunk/src/zf/zscp/website/browser/repository.zcml	2006-04-09 09:28:48 UTC (rev 66713)
+++ zf.zscp/trunk/src/zf/zscp/website/browser/repository.zcml	2006-04-09 09:53:16 UTC (rev 66714)
@@ -6,7 +6,7 @@
   <addform
       name="AddZSCPRepository.html"
       schema="zf.zscp.interfaces.IZSCPRepository"
-      label="Add ZSCP Site"
+      label="Add ZSCP Repository"
       content_factory="zf.zscp.website.repository.Repository"
       fields="svnRoot localRoot password"
       keyword_arguments="svnRoot localRoot password"

Modified: zf.zscp/trunk/src/zf/zscp/website/browser/site.zcml
===================================================================
--- zf.zscp/trunk/src/zf/zscp/website/browser/site.zcml	2006-04-09 09:28:48 UTC (rev 66713)
+++ zf.zscp/trunk/src/zf/zscp/website/browser/site.zcml	2006-04-09 09:53:16 UTC (rev 66714)
@@ -1,24 +1,20 @@
 <configure
-   xmlns:zope="http://namespaces.zope.org/zope"
-   xmlns="http://namespaces.zope.org/browser"
+    xmlns:zope="http://namespaces.zope.org/zope"
+    xmlns="http://namespaces.zope.org/browser"
     i18n_domain="zf.zscp">
 
-  <addform
-      name="AddZSCPSite.html"
-      schema="zf.zscp.website.interfaces.IZSCPSite"
-      label="Add ZSCP Site"
-      content_factory="zf.zscp.website.site.ZSCPSite"
-      fields="certificationDir"
-      keyword_arguments="certificationDir"
-      permission="zope.ManageServices"
+  <addMenuItem
+      class="zf.zscp.website.site.ZSCPSite"
+      title="ZSCP website"
+      description="The ZSCP website"
+      permission="zope.ManageContent"
       />
 
-  <addMenuItem
-       view="AddZSCPSite.html"
-       class="zf.zscp.website.site.ZSCPSite"
-       title="ZSCP website"
-       description="The ZSCP website"
-       permission="zope.ManageContent"
-       />
+  <containerViews
+      for="zf.zscp.website.interfaces.IZSCPSite"
+      contents="zope.ManageContent"
+      index="zope.View"
+      add="zope.ManageContent"
+      />
 
 </configure>

Modified: zf.zscp/trunk/src/zf/zscp/website/interfaces.py
===================================================================
--- zf.zscp/trunk/src/zf/zscp/website/interfaces.py	2006-04-09 09:28:48 UTC (rev 66713)
+++ zf.zscp/trunk/src/zf/zscp/website/interfaces.py	2006-04-09 09:53:16 UTC (rev 66714)
@@ -16,22 +16,14 @@
 $Id$
 """
 __docformat__ = "reStructuredText"
-import os.path
-import zope.schema
+
 from zope.app import folder
 
-from zf.zscp.i18n import MessageFactory as _
 from zope.app.container.constraints import containers
 from zope.app.container.constraints import contains
 
 
-def isDirectory(path):
-    if path:
-        return os.path.isdir(path)
-    else:
-        return True
 
-
 class IZSCPSite(folder.interfaces.IFolder):
     """The root object for the ZSCP site.
 
@@ -41,9 +33,3 @@
     containers(folder.interfaces.IFolder)
 
     contains('zf.zscp.interfaces.IZSCPRepository')
-
-    certificationDir = zope.schema.TextLine(title=_(u'Path'),
-        description=_(u'Path to the directory.'),
-        required=False,
-        constraint=isDirectory,
-        max_length=255)

Modified: zf.zscp/trunk/src/zf/zscp/website/site.py
===================================================================
--- zf.zscp/trunk/src/zf/zscp/website/site.py	2006-04-09 09:28:48 UTC (rev 66713)
+++ zf.zscp/trunk/src/zf/zscp/website/site.py	2006-04-09 09:53:16 UTC (rev 66714)
@@ -42,12 +42,8 @@
 class ZSCPSite(folder.folder.Folder):
     zope.interface.implements(interfaces.IZSCPSite)
 
-    certificationDir = FieldProperty(
-        interfaces.IZSCPSite['certificationDir'])
-
-    def __init__(self, certificationDir=u''):
+    def __init__(self):
         super(ZSCPSite, self).__init__()
-        self.certificationDir = certificationDir
         self.setSiteManager(site.LocalSiteManager(self))
 
     def __repr__(self):