Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2014-12-14T19:28:57+01:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/plone.app.controlpanel/commit/618e0bb47d3fe1707483b5c8801e5cbdeaca2dda

Delete adapter/view registration that just have been commented out before.

Files changed:
M plone/app/controlpanel/configure.zcml

diff --git a/plone/app/controlpanel/configure.zcml b/plone/app/controlpanel/configure.zcml
index 71ee836..64089a0 100644
--- a/plone/app/controlpanel/configure.zcml
+++ b/plone/app/controlpanel/configure.zcml
@@ -7,38 +7,16 @@
 
   <include file="permissions.zcml" />
 
-  <!--<adapter for="*"
-           factory=".editing.EditingControlPanelAdapter" />-->
-
   <adapter factory=".filter.FilterControlPanelAdapter" />
 
   <adapter factory=".language.LanguageControlPanelAdapter" />
 
-  <!--<adapter factory=".navigation.NavigationControlPanelAdapter" />-->
-
-  <!--<adapter factory=".mail.MailControlPanelAdapter" />-->
-
-  <!--<adapter factory=".maintenance.MaintenanceControlPanelAdapter" />-->
-
-  <!-- adapter factory=".markup.MarkupControlPanelAdapter" /-->
-
   <adapter factory=".ram.RAMCacheControlPanelAdapter" />
 
-  <!--<adapter factory=".search.SearchControlPanelAdapter" />-->
-
-  <!--<adapter factory=".site.SiteControlPanelAdapter" />-->
-
   <adapter factory=".skins.SkinsControlPanelAdapter" />
 
   <adapter factory=".usergroups.UserGroupsSettingsControlPanelAdapter" />
 
-  <!--<browser:page
-      name="editing-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".editing.EditingControlPanel"
-      permission="plone.app.controlpanel.Editing"
-      />-->
-
   <browser:page
       name="filter-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -52,48 +30,6 @@
       class=".language.LanguageControlPanel"
       permission="plone.app.controlpanel.Language"
       />
-  <!--
-  <browser:page
-      name="mail-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".mail.MailControlPanel"
-      permission="plone.app.controlpanel.Mail"
-      />
-  -->
-
-  <!-- browser:page
-      name="markup-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".markup.MarkupControlPanel"
-      permission="plone.app.controlpanel.Markup"
-      /-->
-
-  <!--
-  <browser:page
-      name="maintenance-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".maintenance.MaintenanceControlPanel"
-      permission="cmf.ManagePortal"
-      />
-  -->
-
-  <!--
-  <browser:page
-      name="navigation-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".navigation.NavigationControlPanel"
-      permission="plone.app.controlpanel.Navigation"
-      />
-  -->
-
-  <!--
-  <browser:page
-      name="overview-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".overview.OverviewControlPanel"
-      permission="plone.app.controlpanel.Overview"
-      />
-  -->
 
   <browser:page
       name="ramcache-controlpanel"
@@ -102,24 +38,6 @@
       permission="cmf.ManagePortal"
       />
 
-  <!--
-  <browser:page
-      name="search-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".search.SearchControlPanel"
-      permission="plone.app.controlpanel.Search"
-      />
-  -->
-
-  <!--
-  <browser:page
-      name="site-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".site.SiteControlPanel"
-      permission="plone.app.controlpanel.Site"
-      />
-  -->
-
   <browser:page
       name="skins-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
@@ -127,13 +45,6 @@
       permission="plone.app.controlpanel.Themes"
       />
 
- <!--  <browser:page
-      name="types-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      class=".types.TypesControlPanel"
-      permission="plone.app.controlpanel.Types"
-      /> -->
-
   <browser:page
       name="usergroup-userprefs"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"


Repository: plone.app.controlpanel
Branch: refs/heads/master
Date: 2014-12-14T19:40:30+01:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/plone.app.controlpanel/commit/c06b4f4d9aed48d95a53a17615c9d0d484061301

Do not run security_enable_user_folder tests. Functionality has been moved to CMFPlone.

Files changed:
M plone/app/controlpanel/tests/test_doctests.py

diff --git a/plone/app/controlpanel/tests/test_doctests.py b/plone/app/controlpanel/tests/test_doctests.py
index ea40fc0..1a433ce 100644
--- a/plone/app/controlpanel/tests/test_doctests.py
+++ b/plone/app/controlpanel/tests/test_doctests.py
@@ -19,7 +19,7 @@ def test_suite():
              'filter.txt',
 #             'mail.txt',
 #             'maintenance.txt',
-             'security_enable_user_folder.txt',
+#             'security_enable_user_folder.txt',
 #             'search.txt',
 #             'site.txt',
 #             'skins.txt',