[Checkins] SVN: zope.app.appsetup/trunk/ - Got rid of depencency on ``zope.app.component``.

[Michael Howitz]

Log message for revision 101171:
  - Got rid of depencency on ``zope.app.component``.
  
  - Got rid of test dependency on ``zope.app.security``.
  
  - Removed tags part from buildout.
  
  

Changed:
  U   zope.app.appsetup/trunk/CHANGES.txt
  U   zope.app.appsetup/trunk/buildout.cfg
  U   zope.app.appsetup/trunk/setup.py
  U   zope.app.appsetup/trunk/src/zope/app/appsetup/testdata/site.zcml
  U   zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py

-=-
Modified: zope.app.appsetup/trunk/CHANGES.txt
===================================================================
--- zope.app.appsetup/trunk/CHANGES.txt	2009-06-20 18:24:22 UTC (rev 101170)
+++ zope.app.appsetup/trunk/CHANGES.txt	2009-06-20 19:05:45 UTC (rev 101171)
@@ -7,7 +7,11 @@
 - Using ``zope.processlifetime`` interfaces and implementations
   directly instead of BBB imports from ``zope.app.appsetup``.
 
+- Got rid of depencency on ``zope.app.component``.
 
+- Got rid of test dependency on ``zope.app.security``.
+
+
 3.11 (2009-05-13)
 -----------------
 

Modified: zope.app.appsetup/trunk/buildout.cfg
===================================================================
--- zope.app.appsetup/trunk/buildout.cfg	2009-06-20 18:24:22 UTC (rev 101170)
+++ zope.app.appsetup/trunk/buildout.cfg	2009-06-20 19:05:45 UTC (rev 101171)
@@ -1,6 +1,6 @@
 [buildout]
 develop = .
-parts = test python tags
+parts = test python
 
 [test]
 recipe = zc.recipe.testrunner
@@ -10,7 +10,3 @@
 recipe = zc.recipe.egg
 eggs = zope.app.appsetup
 interpreter = python
-
-[tags]
-recipe = z3c.recipe.tag:tags
-eggs = zope.app.appsetup

Modified: zope.app.appsetup/trunk/setup.py
===================================================================
--- zope.app.appsetup/trunk/setup.py	2009-06-20 18:24:22 UTC (rev 101170)
+++ zope.app.appsetup/trunk/setup.py	2009-06-20 19:05:45 UTC (rev 101171)
@@ -58,10 +58,11 @@
     packages=find_packages('src'),
     package_dir={'': 'src'},
     extras_require=dict(test=['zope.app.testing',
-                              'zope.app.security']),
+                              'zope.componentvocabulary',
+                              'zope.principalregistry',
+                              ]),
     namespace_packages=['zope', 'zope.app'],
     install_requires=['setuptools',
-                      'zope.app.component',
                       'zope.app.publication',
                       'zope.component',
                       'zope.configuration',
@@ -73,7 +74,7 @@
                       'zope.processlifetime',
                       'zope.session',
                       'zope.site',
-                      'zope.security',
+                      'zope.security >= 3.6.0',
                       'zope.traversing',
                       'ZODB3',
                       ],

Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/testdata/site.zcml
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/testdata/site.zcml	2009-06-20 18:24:22 UTC (rev 101170)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/testdata/site.zcml	2009-06-20 19:05:45 UTC (rev 101171)
@@ -3,10 +3,12 @@
   <include package="zope.component" />
 
   <include package="zope.security" file="meta.zcml" />
-  <include package="zope.app.component" file="meta.zcml" />
-  <include package="zope.app.component" /> 
-  <include package="zope.app.security" />
-  <include package="zope.traversing" />
+  <include package="zope.site" />
+  <include package="zope.componentvocabulary" />
+  <include package="zope.security" />
+  <include package="zope.authentication" />
+  <include package="zope.principalregistry" />
+ <include package="zope.traversing" />
 
   <include package="zope.app.appsetup" />
 </configure>

Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py	2009-06-20 18:24:22 UTC (rev 101170)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py	2009-06-20 19:05:45 UTC (rev 101171)
@@ -30,12 +30,11 @@
 from zope.error.interfaces import IErrorReportingUtility
 from zope.error.error import ErrorReportingUtility
 
-from zope.app.component.testing import PlacefulSetup
 from zope.site import hooks
 from zope.site.folder import rootFolder, Folder
 from zope.site.interfaces import IRootFolder
 from zope.app.publication.zopepublication import ZopePublication
-from zope.app.component.site import LocalSiteManager
+from zope.site.site import LocalSiteManager
 
 from zope.app.appsetup.bootstrap import bootStrapSubscriber
 from zope.app.appsetup.bootstrap import getInformationFromEvent, \
@@ -47,7 +46,9 @@
 from zope.session.interfaces import ISessionDataContainer
 
 from zope.app.testing import placelesssetup
+from zope.app.testing import setup
 
+
 class EventStub(object):
 
     def __init__(self, db):
@@ -57,15 +58,15 @@
 # TODO: some methods from the boostap module are not tested
 #
 
-class TestBootstrapSubscriber(PlacefulSetup, unittest.TestCase):
+class TestBootstrapSubscriber(placelesssetup.PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
-        PlacefulSetup.setUp(self)
+        setup.placefulSetUp()
         self.db = DB()
 
     def tearDown(self):
         transaction.abort()
-        PlacefulSetup.tearDown(self)
+        setup.placefulTearDown()
         self.db.close()
 
     def createRootFolder(self):