[Checkins] SVN: z3c.jsonrpc/trunk/ reflect changes in zope packages, use new package externals

Roger Ineichen roger at projekt01.ch
Tue Jan 26 19:14:16 EST 2010


Log message for revision 108540:
  reflect changes in zope packages, use new package externals

Changed:
  U   z3c.jsonrpc/trunk/CHANGES.txt
  U   z3c.jsonrpc/trunk/buildout.cfg
  U   z3c.jsonrpc/trunk/setup.py
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/README.txt
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/configure.zcml
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/ftesting.zcml

-=-
Modified: z3c.jsonrpc/trunk/CHANGES.txt
===================================================================
--- z3c.jsonrpc/trunk/CHANGES.txt	2010-01-26 23:33:33 UTC (rev 108539)
+++ z3c.jsonrpc/trunk/CHANGES.txt	2010-01-27 00:14:16 UTC (rev 108540)
@@ -5,6 +5,10 @@
 0.6.0 (unreleased)
 ------------------
 
+- cleanup setup dependencies, adjust ftesting.zcml
+
+- adjust coverag report setup
+
 - implemented error view concept which will work with ZopePublication
 
 - implemented default error view for known zope and JSON-RPC errors

Modified: z3c.jsonrpc/trunk/buildout.cfg
===================================================================
--- z3c.jsonrpc/trunk/buildout.cfg	2010-01-26 23:33:33 UTC (rev 108539)
+++ z3c.jsonrpc/trunk/buildout.cfg	2010-01-27 00:14:16 UTC (rev 108540)
@@ -1,6 +1,6 @@
 [buildout]
 develop = .
-parts = test checker coverage
+parts = test checker coverage-test coverage-report
 find-links = http://pypi.python.org/simple/z3c.json/
 
 [test]
@@ -11,6 +11,15 @@
 recipe = lovely.recipe:importchecker
 path = src/z3c/jsonrpc
 
-[coverage]
+
+[coverage-test]
+recipe = zc.recipe.testrunner
+eggs = z3c.jsonrpc [test]
+defaults = ['--coverage', '../../coverage']
+
+
+[coverage-report]
 recipe = zc.recipe.egg
 eggs = z3c.coverage
+scripts = coverage=coverage-report
+arguments = ('coverage', 'coverage/report')

Modified: z3c.jsonrpc/trunk/setup.py
===================================================================
--- z3c.jsonrpc/trunk/setup.py	2010-01-26 23:33:33 UTC (rev 108539)
+++ z3c.jsonrpc/trunk/setup.py	2010-01-27 00:14:16 UTC (rev 108540)
@@ -61,16 +61,18 @@
         test = [
             'z3c.coverage',
             'zope.app.testing',
-            'zope.app.security',
+            'zope.security',
+            'zope.browserpage',
+            'zope.principalregistry',
             'zope.testbrowser',
             'zope.testing',
+            'zope.securitypolicy',
             ],
         ),
     install_requires = [
         'setuptools',
         'z3c.json',
         'zope.app.publication',
-        'zope.app.twisted',
         'zope.component',
         'zope.configuration',
         'zope.i18n',
@@ -80,7 +82,6 @@
         'zope.publisher',
         'zope.schema',
         'zope.security',
-        'zope.securitypolicy',
         'zope.traversing',
         ],
     zip_safe = False,

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/README.txt
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/README.txt	2010-01-26 23:33:33 UTC (rev 108539)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/README.txt	2010-01-27 00:14:16 UTC (rev 108540)
@@ -115,11 +115,11 @@
 Let's define a content object that is a container:
 
   >>> import zope.interface
-  >>> class IDemoContainer(zope.app.container.interfaces.IReadContainer):
+  >>> class IDemoContainer(zope.container.interfaces.IReadContainer):
   ...     """Demo container interface."""
 
   >>> import persistent
-  >>> from zope.app.container import btree
+  >>> from zope.container import btree
 
   >>> class DemoContainer(btree.BTreeContainer):
   ...     """Demo container."""
@@ -188,7 +188,7 @@
 (The container class needs permission configuration too)
 
   >>> context = xmlconfig.file('meta.zcml', z3c.jsonrpc)
-  >>> context = xmlconfig.file('meta.zcml', zope.app.component, context)
+  >>> context = xmlconfig.file('meta.zcml', zope.security, context)
   >>> context = xmlconfig.string("""
   ... <configure
   ...     xmlns:z3c="http://namespaces.zope.org/z3c"
@@ -429,7 +429,7 @@
 
 also setup the site hook:
 
-  >>> from zope.app.component import hooks
+  >>> from zope.component import hooks
   >>> hooks.setSite(site)
 
 and just call a method this will now raise a ResponseError:

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/configure.zcml
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/configure.zcml	2010-01-26 23:33:33 UTC (rev 108539)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/configure.zcml	2010-01-27 00:14:16 UTC (rev 108540)
@@ -26,18 +26,18 @@
       />
 
   <view
-      for="zope.app.container.interfaces.IItemContainer"
+      for="zope.container.interfaces.IItemContainer"
       type=".interfaces.IJSONRPCRequest"
       provides=".interfaces.IJSONRPCPublisher"
-      factory="zope.app.container.traversal.ItemTraverser"
+      factory="zope.container.traversal.ItemTraverser"
       permission="zope.Public"
       />
 
   <view
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       type=".interfaces.IJSONRPCRequest"
       provides=".interfaces.IJSONRPCPublisher"
-      factory="zope.app.container.traversal.ContainerTraverser"
+      factory="zope.container.traversal.ContainerTraverser"
       permission="zope.Public"
       />
 

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/ftesting.zcml
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/ftesting.zcml	2010-01-26 23:33:33 UTC (rev 108539)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/ftesting.zcml	2010-01-27 00:14:16 UTC (rev 108540)
@@ -5,28 +5,31 @@
     xmlns:z3c="http://namespaces.zope.org/z3c"
     i18n_domain="zope">
 
-  <include package="zope.i18n" file="meta.zcml" />
-  <include package="zope.app.component" file="meta.zcml" />
   <include package="zope.app.publication" file="meta.zcml" />
-  <include package="zope.app.publisher" file="meta.zcml" />
-  <include package="zope.app.security" file="meta.zcml" />
+  <include package="zope.browserpage" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.principalregistry" file="meta.zcml" />
+  <include package="zope.publisher" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
   <include package="zope.securitypolicy" file="meta.zcml" />
 
-  <include package="zope.annotation" />
-  <include package="zope.component" />
-  <include package="zope.error" />
-  <include package="zope.location" />
+  <include package="zope.app.appsetup" />
+  <include package="zope.authentication" />
+  <include package="zope.container" />
+  <include package="zope.principalregistry" />
   <include package="zope.publisher" />
+  <include package="zope.security" />
+  <include package="zope.site" />
   <include package="zope.traversing" />
-  <include package="zope.app.appsetup" />
-  <include package="zope.app.component" />
-  <include package="zope.app.container" />
-  <include package="zope.app.publication" />
-  <include package="zope.app.publisher" />
-  <include package="zope.app.security" />
-  <include package="zope.app.twisted" />
-  <include package="zope.app.wsgi" />
 
+  <publisher
+      name="HTTP"
+      factory="zope.app.publication.requestpublicationfactories.HTTPFactory"
+      methods="*"
+      mimetypes="*"
+      priority="0"
+      />
+
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
       />



More information about the checkins mailing list