Author: jmorliaguet
Date: Wed Oct 26 21:16:14 2005
New Revision: 28682

Added:
   z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/framework/
      - copied from r28633, 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/framework/
   z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/icons/
      - copied from r28633, 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/icons/
   z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/images/
      - copied from r28633, 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/images/
   z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/
      - copied from r28633, 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/
   z3lab/cpsskins/branches/jmo-perspectives/filters/
   z3lab/cpsskins/branches/jmo-perspectives/filters/__init__.py   (contents, 
props changed)
   z3lab/cpsskins/branches/jmo-perspectives/filters/interfaces.py   (contents, 
props changed)
Removed:
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/framework/
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/icons/
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/images/
Modified:
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
   z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
   z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/engines/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/engines/default/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/widget/widgets.py
   z3lab/cpsskins/branches/jmo-perspectives/ftests/test_filters.py
Log:

- moved the content of engines.common to the packages in
  which they belong.

- added a shortcut for IWidgetView, IBasicWidgetView
  in cpsskins.filters.interfaces



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py 
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py 
    Wed Oct 26 21:16:14 2005
@@ -25,8 +25,7 @@
 
 from cpsskins.configuration.interfaces import IRegistry
 from cpsskins.elements.formats.interfaces import IWidget
-from cpsskins.engines.common.filters.widget.interfaces import IWidgetView
-from cpsskins.engines.common.filters.widget.interfaces import IBasicWidgetView
+from cpsskins.filters.interfaces import IWidgetView, IBasicWidgetView
 
 _ = MessageFactory("cpsskins")
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt  Wed Oct 
26 21:16:14 2005
@@ -82,7 +82,7 @@
 
 the widget filter adapts the widget providing a view:
 
-    >>> from cpsskins.engines.common.filters.widget import WidgetFilter
+    >>> from cpsskins.engines.default.filters.widget import WidgetFilter
     >>> from cpsskins.browser.rendering.interfaces import IFilter
     >>> from cpsskins.elements.formats.interfaces import IWidget
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/configure.zcml   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/configure.zcml   
Wed Oct 26 21:16:14 2005
@@ -1,6 +1,13 @@
 <configure
     xmlns="http://namespaces.zope.org/zope";>
 
+  <include package=".icons" />
+
+  <include package=".images" />
+
+  <include package=".framework" />
+
+
   <!-- Page authoring (theme designer, page designer) -->
 
   <include package=".page" />
@@ -10,5 +17,4 @@
 
   <include package=".content" />
 
-
 </configure>

Modified: z3lab/cpsskins/branches/jmo-perspectives/engines/common/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/common/configure.zcml      
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/common/configure.zcml      
Wed Oct 26 21:16:14 2005
@@ -5,8 +5,4 @@
 
   <include package=".icons" />
 
-  <include package=".images" />
-
-  <include package=".framework" />
-
 </configure>

Modified: z3lab/cpsskins/branches/jmo-perspectives/engines/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/configure.zcml     
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/configure.zcml     Wed Oct 
26 21:16:14 2005
@@ -3,8 +3,6 @@
 
   <include package=".default" />
 
-  <include package=".common" />
-
   <include package=".jsr168" />
 
   <!-- Page, content authoring -->

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/default/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/default/configure.zcml     
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/default/configure.zcml     
Wed Oct 26 21:16:14 2005
@@ -1,6 +1,8 @@
 <configure
     xmlns="http://namespaces.zope.org/cpsskins";>
 
+  <include package=".filters" />
+
   <engine
       name="default"
   />

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/widget/widgets.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/widget/widgets.py
   (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/widget/widgets.py
  Wed Oct 26 21:16:14 2005
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from cpsskins.engines.common.filters.widget import WidgetView
+from cpsskins.engines.default.filters.widget import WidgetView
 
 # Base classes divided into categories.
 

Added: z3lab/cpsskins/branches/jmo-perspectives/filters/__init__.py
==============================================================================
--- (empty file)
+++ z3lab/cpsskins/branches/jmo-perspectives/filters/__init__.py        Wed Oct 
26 21:16:14 2005
@@ -0,0 +1,19 @@
+##############################################################################
+#
+# Copyright (c) 2005 Nuxeo 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.
+#
+##############################################################################
+"""
+
+$Id$
+"""
+__docformat__ = "reStructuredText"
+

Added: z3lab/cpsskins/branches/jmo-perspectives/filters/interfaces.py
==============================================================================
--- (empty file)
+++ z3lab/cpsskins/branches/jmo-perspectives/filters/interfaces.py      Wed Oct 
26 21:16:14 2005
@@ -0,0 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2005 Nuxeo 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.
+#
+##############################################################################
+"""
+
+$Id$
+"""
+__docformat__ = "reStructuredText"
+
+from cpsskins.engines.default.filters.widget.interfaces import IWidgetView
+from cpsskins.engines.default.filters.widget.interfaces import IBasicWidgetView
+

Modified: z3lab/cpsskins/branches/jmo-perspectives/ftests/test_filters.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/ftests/test_filters.py     
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/ftests/test_filters.py     Wed Oct 
26 21:16:14 2005
@@ -23,10 +23,10 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('cpsskins.engines.common.filters.widget'),
-        DocTestSuite('cpsskins.engines.common.filters.layout'),
-        DocTestSuite('cpsskins.engines.common.filters.style'),
-        DocTestSuite('cpsskins.engines.common.filters.htmlcleaner'),
+        DocTestSuite('cpsskins.engines.default.filters.widget'),
+        DocTestSuite('cpsskins.engines.default.filters.layout'),
+        DocTestSuite('cpsskins.engines.default.filters.style'),
+        DocTestSuite('cpsskins.engines.default.filters.htmlcleaner'),
         ))
 
 if __name__ == '__main__':
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to