From 5c903ad39a30eba8ae7b0533b2736b21594e67d5 Mon Sep 17 00:00:00 2001
From: Nathan Van Gheem <vangheem@gmail.com>
Date: Thu, 26 Apr 2012 08:42:29 -0500
Subject: [PATCH] Fix requirements to work correctly with dexterity and   to
 include simplejson.

---
 docs/HISTORY.txt                   | 4 ++++
 setup.py                           | 4 +++-
 src/plone/app/async/configure.zcml | 7 ++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 59d1afa..bf240bc 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,6 +4,10 @@ Changelog
 1.2 - Unreleased
 ----------------
 
+- Fix requirements to work correctly with dexterity and
+  to include simplejson.
+  [vangheem]
+
 
 1.1 - 2011-07-21
 ----------------
diff --git a/setup.py b/setup.py
index 54a2c67..9a72911 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,9 @@
           'zc.async',
           'zc.monitor',
           'zc.z3monitor',
-          'collective.testcaselayer'
+          'collective.testcaselayer',
+          'simplejson',
+          'five.intid'
       ],
       entry_points={
           'z3c.autoinclude.plugin': 'target=plone',
diff --git a/src/plone/app/async/configure.zcml b/src/plone/app/async/configure.zcml
index c62dae7..321fd2a 100644
--- a/src/plone/app/async/configure.zcml
+++ b/src/plone/app/async/configure.zcml
@@ -3,11 +3,8 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.async">
 
-  <!-- Plone 3.x -->
-  <include zcml:condition="not-have plone-4" package="zope.app.keyreference" />
-
-  <!-- Plone 4.x -->
-  <include zcml:condition="have plone-4" package="zope.keyreference" />
+  <!-- integrates zope.keyreference -->
+  <include package="five.intid" />
 
   <!-- zc.async -->
   <include package="zc.async" />