[z3-checkins] r28828 - z3/jsonserver/branch/merge

[reebalazs at codespeak.net]

Author: reebalazs
Date: Thu Jun 15 17:04:47 2006
New Revision: 28828

Modified:
   z3/jsonserver/branch/merge/__init__.py
   z3/jsonserver/branch/merge/configure.zcml
   z3/jsonserver/branch/merge/jsonrpc.py
   z3/jsonserver/branch/merge/meta.zcml
   z3/jsonserver/branch/merge/metaconfigure.py
Log:
Make jsonserver use configfeature. At themoment it needs yet to be tested on z3.

Modified: z3/jsonserver/branch/merge/__init__.py
==============================================================================
--- z3/jsonserver/branch/merge/__init__.py	(original)
+++ z3/jsonserver/branch/merge/__init__.py	Thu Jun 15 17:04:47 2006
@@ -1,7 +1,5 @@
 #python package
 
-import __compat__
-
 # Debugging
 #from AccessControl import allow_module
 #allow_module('pdb')

Modified: z3/jsonserver/branch/merge/configure.zcml
==============================================================================
--- z3/jsonserver/branch/merge/configure.zcml	(original)
+++ z3/jsonserver/branch/merge/configure.zcml	Thu Jun 15 17:04:47 2006
@@ -12,11 +12,11 @@
   <include package=".concatresource" />
   <include package=".browser" />
 
-  <configure zcml:condition="installed Zope2">
+  <configure zcml:condition="have compat_five">
   	<include package=".z2_compatibility" />
   </configure>
   
-  <configure zcml:condition="installed not_Zope2">
+  <configure zcml:condition="have compat_not_five">
   
   <publisher
     name="JSONRPC"
@@ -91,7 +91,7 @@
            directory="./jsolait/libws"
     />
 
-  <configure zcml:condition="installed not_Zope2">
+  <configure zcml:condition="have compat_not_five">
   <help:register
       id="json_rpc"
       title="JSON RPC"

Modified: z3/jsonserver/branch/merge/jsonrpc.py
==============================================================================
--- z3/jsonserver/branch/merge/jsonrpc.py	(original)
+++ z3/jsonserver/branch/merge/jsonrpc.py	Thu Jun 15 17:04:47 2006
@@ -24,7 +24,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from __compat__ import __compat__
+from configfeature.fiveconfig import __compat__
 
 from zope.app.publication.http import BaseHTTPPublication
 from interfaces import IMethodPublisher, IJSONRPCView, IJSONRPCPublisher,\

Modified: z3/jsonserver/branch/merge/meta.zcml
==============================================================================
--- z3/jsonserver/branch/merge/meta.zcml	(original)
+++ z3/jsonserver/branch/merge/meta.zcml	Thu Jun 15 17:04:47 2006
@@ -11,13 +11,13 @@
     
     -->
     
+    <!-- Following include sets up Five compatibility features. -->
+    <include package=".configfeature" file="meta.zcml" />
+
   <!-- XXX this is now conditional on Zope3 only (temporarily).
-        But since condition on "not installed" is impossible
-        to achieve from zcml, we must use a metaconfigure-compat
-        wrapper as a workaround.
   -->
        
-    <configure zcml:condition="installed not_Zope2">
+    <configure zcml:condition="have compat_not_five">
   <meta:directive
        namespace="http://namespaces.zope.org/jsonrpc"
        name="view"
@@ -29,7 +29,7 @@
 
     <include package=".concatresource" file="meta.zcml" />
 
-    <configure zcml:condition="installed Zope2">
+    <configure zcml:condition="have compat_five">
         <include package=".z2_compatibility" file="meta.zcml" />
     </configure>
 

Modified: z3/jsonserver/branch/merge/metaconfigure.py
==============================================================================
--- z3/jsonserver/branch/merge/metaconfigure.py	(original)
+++ z3/jsonserver/branch/merge/metaconfigure.py	Thu Jun 15 17:04:47 2006
@@ -21,7 +21,7 @@
 jwashin 2005-06-06
 """
 
-from __compat__ import __compat__
+from configfeature.fiveconfig import __compat__
 
 import zope.interface
 from zope.interface import Interface