[Plone-cvs] r11826 - in ResourceRegistries/trunk: . 20compatibility Extensions doc interfaces tests tools

[fschulze <svn...@pl...>]

Author: fschulze
Date: Sat Dec 30 22:32:13 2006
New Revision: 11826

Removed:
   ResourceRegistries/trunk/20compatibility/
   ResourceRegistries/trunk/Extensions/
   ResourceRegistries/trunk/interfaces/ResourceRegistries.py
Modified:
   ResourceRegistries/trunk/doc/HISTORY.txt
   ResourceRegistries/trunk/doc/INSTALL.txt
   ResourceRegistries/trunk/interfaces/__init__.py
   ResourceRegistries/trunk/tests/testCSSRegistry.py
   ResourceRegistries/trunk/tools/BaseRegistry.py
   ResourceRegistries/trunk/tools/CSSRegistry.py
   ResourceRegistries/trunk/tools/JSRegistry.py
   ResourceRegistries/trunk/version.txt
Log:
Removed compatibility stuff for Plone version lower than 3.0.

Modified: ResourceRegistries/trunk/doc/HISTORY.txt
==============================================================================
--- ResourceRegistries/trunk/doc/HISTORY.txt	(original)
+++ ResourceRegistries/trunk/doc/HISTORY.txt	Sat Dec 30 22:32:13 2006
@@ -1,6 +1,9 @@
-1.3.4 (SVN/unreleased)
+1.4 (SVN/unreleased)
 ======================
 
+ * Removed compatibility stuff for Plone version lower than 3.0.
+   [fschulze]
+
 1.3.3
 =====
 

Modified: ResourceRegistries/trunk/doc/INSTALL.txt
==============================================================================
--- ResourceRegistries/trunk/doc/INSTALL.txt	(original)
+++ ResourceRegistries/trunk/doc/INSTALL.txt	Sat Dec 30 22:32:13 2006
@@ -1,8 +0,0 @@
-ResourceRegistries 1.3 depends on changes to CMFCore/Skinnable.py in the
-CMF 1.5.5 release. So for Plone 2.1.x install CMF 1.5.5.
-
-To use with Plone 2.0.x, you have to make sure to move the header.pt
-template from the 20compatibility directory to  skins/ResourceRegistries
-
-But Plone 2.0.x uses CMF 1.4, so you need to patch CMFCore/Skinnable.py with the patch (or replacement Skinnable.py) from
-http://plone.org/products/resourceregistries/documentation/how-to/plone-2.0-compatibility/

Modified: ResourceRegistries/trunk/interfaces/__init__.py
==============================================================================
--- ResourceRegistries/trunk/interfaces/__init__.py	(original)
+++ ResourceRegistries/trunk/interfaces/__init__.py	Sat Dec 30 22:32:13 2006
@@ -1,8 +1 @@
 from registries import IResourceRegistry, ICSSRegistry, IJSRegistry
-import ResourceRegistries
-
-# create zope2 interfaces at runtime:
-from Interface.bridge import createZope3Bridge
-createZope3Bridge(IResourceRegistry, ResourceRegistries, 'IResourceRegistry')
-createZope3Bridge(ICSSRegistry, ResourceRegistries, 'ICSSRegistry')
-createZope3Bridge(IJSRegistry, ResourceRegistries, 'IJSRegistry')

Modified: ResourceRegistries/trunk/tests/testCSSRegistry.py
==============================================================================
--- ResourceRegistries/trunk/tests/testCSSRegistry.py	(original)
+++ ResourceRegistries/trunk/tests/testCSSRegistry.py	Sat Dec 30 22:32:13 2006
@@ -18,7 +18,7 @@
 from Products.PloneTestCase.PloneTestCase import PLONE21, portal_owner, default_password
 
 from Products.ResourceRegistries.config import CSSTOOLNAME
-from Products.ResourceRegistries.interfaces.ResourceRegistries import ICSSRegistry as z2ICSSRegistry
+from Products.ResourceRegistries.interfaces import ICSSRegistry
 from Products.ResourceRegistries.tests.RegistryTestCase import RegistryTestCase
 from Products.ResourceRegistries.tests.RegistryTestCase import FunctionalRegistryTestCase
 
@@ -27,8 +27,8 @@
 
     def test_interfaces(self):
         tool = getattr(self.portal, CSSTOOLNAME)
-        self.failUnless(z2ICSSRegistry.isImplementedBy(tool))
-        self.failUnless(verifyObject(z2ICSSRegistry, tool))
+        self.failUnless(ICSSRegistry.isImplementedBy(tool))
+        self.failUnless(verifyObject(ICSSRegistry, tool))
 
 class TestTool(RegistryTestCase):
 

Modified: ResourceRegistries/trunk/tools/BaseRegistry.py
==============================================================================
--- ResourceRegistries/trunk/tools/BaseRegistry.py	(original)
+++ ResourceRegistries/trunk/tools/BaseRegistry.py	Sat Dec 30 22:32:13 2006
@@ -26,7 +26,6 @@
 
 from Products.ResourceRegistries import config
 from Products.ResourceRegistries import permissions
-from Products.ResourceRegistries.interfaces.ResourceRegistries import IResourceRegistry as z2IResourceRegistry
 from Products.ResourceRegistries.interfaces import IResourceRegistry
 
 import Acquisition
@@ -158,7 +157,7 @@
 
     security = ClassSecurityInfo()
     implements(IResourceRegistry)
-    __implements__ = (SimpleItem.__implements__, z2IResourceRegistry)
+    __implements__ = SimpleItem.__implements__
     manage_options = SimpleItem.manage_options
 
     attributes_to_compare = ('getExpression', 'getCookable', 'getCacheable')

Modified: ResourceRegistries/trunk/tools/CSSRegistry.py
==============================================================================
--- ResourceRegistries/trunk/tools/CSSRegistry.py	(original)
+++ ResourceRegistries/trunk/tools/CSSRegistry.py	Sat Dec 30 22:32:13 2006
@@ -10,7 +10,6 @@
 
 from Products.ResourceRegistries import config
 from Products.ResourceRegistries import permissions
-from Products.ResourceRegistries.interfaces.ResourceRegistries import ICSSRegistry as z2ICSSRegistry
 from Products.ResourceRegistries.interfaces import ICSSRegistry
 from Products.ResourceRegistries.tools.BaseRegistry import BaseRegistryTool
 from Products.ResourceRegistries.tools.BaseRegistry import Resource
@@ -98,7 +97,7 @@
     security = ClassSecurityInfo()
 
     implements(ICSSRegistry)
-    __implements__ = (BaseRegistryTool.__implements__, z2ICSSRegistry,)
+    __implements__ = BaseRegistryTool.__implements__
 
     #
     # ZMI stuff

Modified: ResourceRegistries/trunk/tools/JSRegistry.py
==============================================================================
--- ResourceRegistries/trunk/tools/JSRegistry.py	(original)
+++ ResourceRegistries/trunk/tools/JSRegistry.py	Sat Dec 30 22:32:13 2006
@@ -10,7 +10,6 @@
 
 from Products.ResourceRegistries import config
 from Products.ResourceRegistries import permissions
-from Products.ResourceRegistries.interfaces.ResourceRegistries import IJSRegistry as z2IJSRegistry
 from Products.ResourceRegistries.interfaces import IJSRegistry
 from Products.ResourceRegistries.tools.BaseRegistry import BaseRegistryTool
 from Products.ResourceRegistries.tools.BaseRegistry import Resource
@@ -65,7 +64,7 @@
     security = ClassSecurityInfo()
 
     implements(IJSRegistry)
-    __implements__ = (BaseRegistryTool.__implements__, z2IJSRegistry)
+    __implements__ = BaseRegistryTool.__implements__
 
     #
     # ZMI stuff

Modified: ResourceRegistries/trunk/version.txt
==============================================================================
--- ResourceRegistries/trunk/version.txt	(original)
+++ ResourceRegistries/trunk/version.txt	Sat Dec 30 22:32:13 2006
@@ -1 +1 @@
-1.3.4 (SVN/unreleased)
+1.4 (SVN/unreleased)