[Zope3-checkins] SVN: Zope3/branches/philikon-reduce-zcml/src/zope/app/ Remove a usage of ContentDirective that's slated for removal in 3.3 anyways

[Philipp von Weitershausen]

Log message for revision 66039:
  Remove a usage of ContentDirective that's slated for removal in 3.3 anyways
  (actually, the whole zope.app.site package is slated for removal, but I let someone
  else figure out the repercussions of a complete removal).
  

Changed:
  U   Zope3/branches/philikon-reduce-zcml/src/zope/app/meta.zcml
  D   Zope3/branches/philikon-reduce-zcml/src/zope/app/site/meta.zcml
  D   Zope3/branches/philikon-reduce-zcml/src/zope/app/site/metaconfigure.py

-=-
Modified: Zope3/branches/philikon-reduce-zcml/src/zope/app/meta.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/meta.zcml	2006-03-15 15:28:19 UTC (rev 66038)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/meta.zcml	2006-03-15 16:01:58 UTC (rev 66039)
@@ -13,8 +13,4 @@
 <include package="zope.app.schema" file="meta.zcml" />
 <include package="zope.app.container.browser" file="meta.zcml" />
 
-<!-- BBB: Goes away in 3.3 -->
-<include package="zope.app.site" file="meta.zcml" />
-
-
 </configure>

Deleted: Zope3/branches/philikon-reduce-zcml/src/zope/app/site/meta.zcml
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/site/meta.zcml	2006-03-15 15:28:19 UTC (rev 66038)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/site/meta.zcml	2006-03-15 16:01:58 UTC (rev 66039)
@@ -1,36 +0,0 @@
-<configure
-    xmlns:meta="http://namespaces.zope.org/meta">
-
-  <meta:directives namespace="http://namespaces.zope.org/zope">
-
-    <meta:complexDirective
-        name="localService"
-        schema="zope.app.component.metadirectives.IClassDirective"
-        handler=".metaconfigure.LocalServiceDirective"
-        >
-
-      <meta:subdirective
-          name="implements"
-          schema="zope.app.component.metadirectives.IImplementsSubdirective"
-          />
-
-      <meta:subdirective
-          name="require"
-          schema="zope.app.component.metadirectives.IRequireSubdirective"
-          />
-
-      <meta:subdirective
-          name="allow"
-          schema="zope.app.component.metadirectives.IAllowSubdirective"
-          />
-
-      <meta:subdirective
-          name="factory"
-          schema="zope.app.component.metadirectives.IFactorySubdirective"
-          />
-
-    </meta:complexDirective>
-
-  </meta:directives>
-
-</configure>

Deleted: Zope3/branches/philikon-reduce-zcml/src/zope/app/site/metaconfigure.py
===================================================================
--- Zope3/branches/philikon-reduce-zcml/src/zope/app/site/metaconfigure.py	2006-03-15 15:28:19 UTC (rev 66038)
+++ Zope3/branches/philikon-reduce-zcml/src/zope/app/site/metaconfigure.py	2006-03-15 16:01:58 UTC (rev 66039)
@@ -1,37 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Local Service Directive
-
-$Id$
-"""
-__docformat__ = "reStructuredText"
-import zope.deprecation
-from zope.interface import classImplements
-from zope.app.component.contentdirective import ContentDirective
-
-zope.deprecation.__show__.off()
-from zope.app.site.interfaces import ISimpleService
-zope.deprecation.__show__.on()
-
-class LocalServiceDirective(ContentDirective):
-
-    def __init__(self, _context, class_):
-        if not ISimpleService.implementedBy(class_):
-            classImplements(class_, ISimpleService)
-        super(LocalServiceDirective, self).__init__(_context, class_)
-
-zope.deprecation.deprecated(
-    'LocalServiceDirective',
-    'The concept of services has been removed. Use utilities instead. '
-    'The reference will be gone in Zope 3.3.')