[Zope-Checkins] CVS: Zope3/lib/python/Zope - __init__.py:1.2 zope.zcml:1.2

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope
In directory cvs.zope.org:/tmp/cvs-serv17445/lib/python/Zope

Added Files:
	__init__.py zope.zcml 
Log Message:
Merged Zope-3x-branch into newly forked Zope3 CVS Tree.


=== Zope3/lib/python/Zope/__init__.py 1.1 => 1.2 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (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.
+# 
+##############################################################################
+"""
+The Zope package holds both libraries used by Zope and the
+Zope application.  The Zope application is in the 'Zope.App'
+package.  All other 'Zope.*' packages can potentially be
+used independently of the Zope application.
+"""


=== Zope3/lib/python/Zope/zope.zcml 1.1 => 1.2 ===
+   xmlns='http://namespaces.zope.org/zope'
+   xmlns:security='http://namespaces.zope.org/security'
+   xmlns:zmi='http://namespaces.zope.org/zmi'
+   xmlns:browser='http://namespaces.zope.org/browser'
+>
+  
+<!-- Standard configuration directives -->
+<include package=".Configuration" file="configuration-meta.zcml" />
+<include package=".App" file="app-meta.zcml" />
+<include package=".Publisher" file="publisher-meta.zcml" />
+<include package=".Event" file="event-meta.zcml" />
+<include package=".StartUp" file="startup-meta.zcml" />
+
+
+<!-- Standard Permissions -->
+
+<security:permission id="Zope.View"
+                     title="View"
+                     />
+
+<security:permission id="Zope.Security"
+                     title="Change security settings"
+                     />
+
+<security:permission id="Zope.ManageContent" 
+                     title="Manage Content"
+                     />
+
+<security:permission id="Zope.ManageBindings" 
+                     title="Manage Service Bindings"
+                     />
+
+<security:permission id="Zope.ManageServices" 
+                     title="Manage Services"
+                      />
+
+<security:permission id="Zope.ManageApplication" 
+                     title="Manage Application"
+                     />
+
+<!-- XXX What is this for? -->
+<security:permission id="Zope.I18n" 
+                     title="Manage Application"
+                     />
+
+<!-- Configuration -->
+<include package=".App" file="app.zcml" />
+<include package=".I18n" file="i18n.zcml" />
+<include package=".Publisher" file="publisher.zcml" />
+<include package=".Event" file="event.zcml" />
+<include package=".StartUp" file="startup-registry.zcml" />
+
+
+</zopeConfigure>