[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Image - Image.py:1.1.2.3.4.1 ImageFields.py:1.1.2.1.4.1 __init__.py:1.1.2.1.4.1 image.zcml:1.1.2.2.4.1

[Gary Poster]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Image
In directory cvs.zope.org:/tmp/cvs-serv22457/lib/python/Zope/App/OFS/Content/Image

Modified Files:
      Tag: gary-pre_create_views-branch
	Image.py ImageFields.py __init__.py image.zcml 
Log Message:
license check; merge with current Zope-3x branch; small updates


=== Zope3/lib/python/Zope/App/OFS/Content/Image/Image.py 1.1.2.3 => 1.1.2.3.4.1 ===
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors. 
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
@@ -8,7 +8,7 @@
 # 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
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 """


=== Zope3/lib/python/Zope/App/OFS/Content/Image/ImageFields.py 1.1.2.1 => 1.1.2.1.4.1 ===
-#
-# 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
-# 
-##############################################################################
+##############################################################################
+#
+# 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.
+# 
+##############################################################################
 """
 Revision information: 
 $Id$


=== Zope3/lib/python/Zope/App/OFS/Content/Image/__init__.py 1.1.2.1 => 1.1.2.1.4.1 ===
+#
+# 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.
+# 
+##############################################################################


=== Zope3/lib/python/Zope/App/OFS/Content/Image/image.zcml 1.1.2.2 => 1.1.2.2.4.1 ===
   <security:permission permission_id="Zope.AddImages" title="Add Images" />
 
-  <zmi:provideClass name=".Image."
-                    permission_id="Zope.AddImages"
-                    title="Image"
-                    description="An Image" />
+  <zmi:factoryFromClass name="Image"
+                        class=".Image."
+                        permission_id="Zope.AddImages"
+                        title="Image"
+                        description="An Image" />
 
   <security:protectClass name=".Image."
     interface=".Image.IImage."