Author: jmorliaguet
Date: Mon Apr  3 22:24:48 2006
New Revision: 2775

Added:
   cpsskins/branches/jmo-perspectives/standard/io/
      - copied from r2774, cpsskins/branches/jmo-perspectives/io/
Removed:
   cpsskins/branches/jmo-perspectives/io/
Modified:
   cpsskins/branches/jmo-perspectives/configure.zcml
   cpsskins/branches/jmo-perspectives/ftests/test_appsetup.py
   cpsskins/branches/jmo-perspectives/ftests/test_io.py
   cpsskins/branches/jmo-perspectives/setup/registration.py
   cpsskins/branches/jmo-perspectives/setup/test/dummy.py
   cpsskins/branches/jmo-perspectives/standard/configure.zcml
   cpsskins/branches/jmo-perspectives/standard/io/README.txt
   cpsskins/branches/jmo-perspectives/standard/io/perspective.py
   cpsskins/branches/jmo-perspectives/standard/io/perspective.zcml
   cpsskins/branches/jmo-perspectives/standard/io/relation.py
   cpsskins/branches/jmo-perspectives/standard/io/relation.zcml
   cpsskins/branches/jmo-perspectives/standard/io/style.py
   cpsskins/branches/jmo-perspectives/standard/io/style.zcml
   cpsskins/branches/jmo-perspectives/tests/test_relation_io.py
   cpsskins/branches/jmo-perspectives/ui/screens/sitemanager/views.py
Log:

- moved cpsskins.io to cpsskins.standard.io



Modified: cpsskins/branches/jmo-perspectives/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/configure.zcml   (original)
+++ cpsskins/branches/jmo-perspectives/configure.zcml   Mon Apr  3 22:24:48 2006
@@ -96,6 +96,4 @@
 
   <include package=".setup" />
 
-  <include package=".io" />
-
 </configure>

Modified: cpsskins/branches/jmo-perspectives/ftests/test_appsetup.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_appsetup.py  (original)
+++ cpsskins/branches/jmo-perspectives/ftests/test_appsetup.py  Mon Apr  3 
22:24:48 2006
@@ -27,7 +27,7 @@
 from zope.component import provideUtility
 from zope.component.interfaces import IFactory
 
-from cpsskins.io.interfaces import IDataImporter
+from cpsskins.standard.io.interfaces import IDataImporter
 from cpsskins.setup.interfaces import IResourceType
 from cpsskins.setup.test.dummy import IDummyResource, DummyResourceImporter
 from cpsskins.setup.test.dummy import DummyFactory

Modified: cpsskins/branches/jmo-perspectives/ftests/test_io.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_io.py        (original)
+++ cpsskins/branches/jmo-perspectives/ftests/test_io.py        Mon Apr  3 
22:24:48 2006
@@ -23,10 +23,10 @@
 from zope.app.testing.functional import FunctionalDocFileSuite
 
 from cpsskins.elements.interfaces import IElement
-from cpsskins.io.interfaces import IDataExporter, IDataImporter
+from cpsskins.standard.io.interfaces import IDataExporter, IDataImporter
 
 def setUp(test):
-    from cpsskins.io import element
+    from cpsskins.standard.io import element
     ztapi.browserViewProviding(IElement, element.Exporter, IDataExporter)
     ztapi.provideAdapter(IElement, IDataImporter, element.Importer)
 

Modified: cpsskins/branches/jmo-perspectives/setup/registration.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/setup/registration.py    (original)
+++ cpsskins/branches/jmo-perspectives/setup/registration.py    Mon Apr  3 
22:24:48 2006
@@ -27,7 +27,7 @@
 
 from zope.component import getUtility, queryUtility, createObject
 
-from cpsskins.io.interfaces import IDataImporter
+from cpsskins.standard.io.interfaces import IDataImporter
 from cpsskins.setup.interfaces import IResourceManager
 from cpsskins.setup.interfaces import ISetting, IResource
 

Modified: cpsskins/branches/jmo-perspectives/setup/test/dummy.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/setup/test/dummy.py      (original)
+++ cpsskins/branches/jmo-perspectives/setup/test/dummy.py      Mon Apr  3 
22:24:48 2006
@@ -23,7 +23,7 @@
 from zope.component.factory import Factory
 from zope.interface import Interface, implements
 
-from cpsskins.io.interfaces import IDataExporter, IDataImporter
+from cpsskins.standard.io.interfaces import IDataExporter, IDataImporter
 
 class IDummyResource(Interface):
     """Dummy resource interface"""

Modified: cpsskins/branches/jmo-perspectives/standard/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/configure.zcml  (original)
+++ cpsskins/branches/jmo-perspectives/standard/configure.zcml  Mon Apr  3 
22:24:48 2006
@@ -30,4 +30,9 @@
 
   <include package=".negotiation" />
 
+
+  <!-- IO of standard objects -->
+
+  <include package=".io" />
+
 </configure>

Modified: cpsskins/branches/jmo-perspectives/standard/io/README.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/README.txt    (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/README.txt   Mon Apr  3 
22:24:48 2006
@@ -169,7 +169,7 @@
     >>> from zope.component import getMultiAdapter
     >>> request = TestRequest()
 
-    >>> from cpsskins.io.interfaces import IDataExporter, IDataImporter
+    >>> from cpsskins.standard.io.interfaces import IDataExporter, 
IDataImporter
 
 Export of styles
 ----------------

Modified: cpsskins/branches/jmo-perspectives/standard/io/perspective.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/perspective.py        (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/perspective.py       Mon Apr 
 3 22:24:48 2006
@@ -24,7 +24,7 @@
 from zope.interface import implements
 
 from cpsskins.perspectives.interfaces import IPerspective
-from cpsskins.io.interfaces import IDataExporter, IDataImporter
+from cpsskins.standard.io.interfaces import IDataExporter, IDataImporter
 
 class Exporter(object):
     """Export a perspective.

Modified: cpsskins/branches/jmo-perspectives/standard/io/perspective.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/perspective.zcml      (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/perspective.zcml     Mon Apr 
 3 22:24:48 2006
@@ -4,7 +4,7 @@
 
   <!-- XML export -->
   <browser:view
-      provides="cpsskins.io.interfaces.IDataExporter"
+      provides="cpsskins.standard.io.interfaces.IDataExporter"
       for="cpsskins.perspectives.interfaces.IPerspective"
       class=".perspective.Exporter"
       permission="zope.ManageContent"

Modified: cpsskins/branches/jmo-perspectives/standard/io/relation.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/relation.py   (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/relation.py  Mon Apr  3 
22:24:48 2006
@@ -25,7 +25,7 @@
 
 from cpsskins.elements.interfaces import IIdentifiable
 from cpsskins.relations.interfaces import IRelation
-from cpsskins.io.interfaces import IDataExporter, IDataImporter
+from cpsskins.standard.io.interfaces import IDataExporter, IDataImporter
 
 class Exporter(object):
     """Export a relation.

Modified: cpsskins/branches/jmo-perspectives/standard/io/relation.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/relation.zcml (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/relation.zcml        Mon Apr 
 3 22:24:48 2006
@@ -4,7 +4,7 @@
 
   <!-- Relations -->
   <browser:view
-      provides="cpsskins.io.interfaces.IDataExporter"
+      provides="cpsskins.standard.io.interfaces.IDataExporter"
       for="cpsskins.relations.interfaces.IRelation"
       class=".relation.Exporter"
       permission="zope.ManageContent"

Modified: cpsskins/branches/jmo-perspectives/standard/io/style.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/style.py      (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/style.py     Mon Apr  3 
22:24:48 2006
@@ -26,7 +26,7 @@
 
 from cpsskins.standard.formats.style import IStyle
 from cpsskins.elements.interfaces import IIdentifiable
-from cpsskins.io.interfaces import IDataExporter, IDataImporter
+from cpsskins.standard.io.interfaces import IDataExporter, IDataImporter
 
 class Exporter(object):
     """This adapter makes it possible to export style resources

Modified: cpsskins/branches/jmo-perspectives/standard/io/style.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/style.zcml    (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/style.zcml   Mon Apr  3 
22:24:48 2006
@@ -4,7 +4,7 @@
 
   <!-- XML export -->
   <browser:view
-      provides="cpsskins.io.interfaces.IDataExporter"
+      provides="cpsskins.standard.io.interfaces.IDataExporter"
       for="cpsskins.standard.formats.style.IStyle"
       class=".style.Exporter"
       permission="zope.ManageContent"

Modified: cpsskins/branches/jmo-perspectives/tests/test_relation_io.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/test_relation_io.py        
(original)
+++ cpsskins/branches/jmo-perspectives/tests/test_relation_io.py        Mon Apr 
 3 22:24:48 2006
@@ -27,7 +27,7 @@
 from zope.interface import implements
 
 from cpsskins.elements.interfaces import IIdentifiable
-from cpsskins.io.interfaces import IDataExporter, IDataImporter
+from cpsskins.standard.io.interfaces import IDataExporter, IDataImporter
 from cpsskins.relations.interfaces import IRelation, IRelatable
 from cpsskins.relations import TestRelate, Predicate
 
@@ -61,7 +61,7 @@
 
     def setUp(self):
         super(TestRelation, self).setUp()
-        from cpsskins.io import relation
+        from cpsskins.standard.io import relation
         ztapi.browserViewProviding(IRelation, relation.Exporter, IDataExporter)
         ztapi.provideAdapter(IRelation, IDataImporter, relation.Importer)
         ztapi.provideAdapter(IRelatable, IIdentifiable, Identifiable)

Modified: cpsskins/branches/jmo-perspectives/ui/screens/sitemanager/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/screens/sitemanager/views.py  
(original)
+++ cpsskins/branches/jmo-perspectives/ui/screens/sitemanager/views.py  Mon Apr 
 3 22:24:48 2006
@@ -26,7 +26,7 @@
 from cpsskins.elements.interfaces import IType
 from cpsskins.setup.interfaces import ISetting, IGlobalSetting
 from cpsskins.setup.interfaces import IResourceType, IResourceManager, 
IResource
-from cpsskins.io.interfaces import IDataExporter
+from cpsskins.standard.io.interfaces import IDataExporter
 from cpsskins.setup.registration import reloadSetting, refreshSettings
 
 setting_xml = """<?xml version="1.0"?>
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to