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

[Jim Fulton]

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

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


=== Zope3/lib/python/Zope/App/__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.
+# 
+##############################################################################
+"""
+Zope application.
+"""
+


=== Zope3/lib/python/Zope/App/app-meta.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'
+>
+
+<include package=".ComponentArchitecture" file="component-meta.zcml" />
+<include package=".Publisher" file="publisher-meta.zcml" />
+<include package=".ZMI" file="zmi-meta.zcml" />
+<include package=".Security" file="security-meta.zcml" />
+<include package=".OFS" file="ofs-meta.zcml" />
+<include package=".ContentDirective" file="content-meta.zcml" />
+
+</zopeConfigure>


=== Zope3/lib/python/Zope/App/app.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'
+>
+
+  <include package=".ComponentArchitecture" file="component.zcml" />
+  <include package=".ZMI" file="zmi.zcml" />
+  <include package=".Formulator" file="formulator.zcml" />
+  <include package=".OFS" file="ofs.zcml" />
+  <include package=".Security" file="security.zcml" />
+  <include package=".Traversing" file="traversing.zcml" />
+  <include package=".ZopePublication" file="zopepublication.zcml" />
+  <include package=".Undo" file="undo.zcml" />
+
+</zopeConfigure>