[Checkins] SVN: z3c.sampledata/trunk/ Use current pacakges.

[Adam Groszer]

Log message for revision 116027:
  Use current pacakges.

Changed:
  U   z3c.sampledata/trunk/CHANGES.txt
  U   z3c.sampledata/trunk/setup.py
  U   z3c.sampledata/trunk/src/z3c/sampledata/ftests.py
  U   z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.py
  U   z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.txt
  U   z3c.sampledata/trunk/src/z3c/sampledata/generator/principals.py

-=-
Modified: z3c.sampledata/trunk/CHANGES.txt
===================================================================
--- z3c.sampledata/trunk/CHANGES.txt	2010-08-30 11:54:04 UTC (rev 116026)
+++ z3c.sampledata/trunk/CHANGES.txt	2010-08-30 12:09:06 UTC (rev 116027)
@@ -6,7 +6,7 @@
 0.3.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Use current pacakges.
 
 
 0.3.1 (2010-08-30)

Modified: z3c.sampledata/trunk/setup.py
===================================================================
--- z3c.sampledata/trunk/setup.py	2010-08-30 11:54:04 UTC (rev 116026)
+++ z3c.sampledata/trunk/setup.py	2010-08-30 12:09:06 UTC (rev 116027)
@@ -63,6 +63,7 @@
     install_requires = [
         'setuptools',
         'ZODB3',
+        'zope.authentication',
         'zope.component',
         'zope.i18nmessageid',
         'zope.interface',
@@ -73,9 +74,7 @@
         'zope.traversing',
         'zope.viewlet',
         'zope.app.pagetemplate>=3.6.0',
-        'zope.app.authentication>=3.7.0',
-        'zope.app.component',
-        'zope.app.security',
+        'zope.pluggableauth',
         ],
     zip_safe = False,
 )

Modified: z3c.sampledata/trunk/src/z3c/sampledata/ftests.py
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/ftests.py	2010-08-30 11:54:04 UTC (rev 116026)
+++ z3c.sampledata/trunk/src/z3c/sampledata/ftests.py	2010-08-30 12:09:06 UTC (rev 116027)
@@ -6,10 +6,10 @@
 from zope.lifecycleevent import ObjectCreatedEvent
 
 from zope.app.testing import functional
-from zope.app.authentication.authentication import PluggableAuthentication
+from zope.pluggableauth import PluggableAuthentication
 from zope.app.authentication.principalfolder import PrincipalFolder
 from zope.app.authentication.interfaces import IAuthenticatorPlugin
-from zope.app.security.interfaces import IAuthentication
+from zope.authentication.interfaces import IAuthentication
 
 
 functional.defineLayer('TestLayer', 'ftesting.zcml')

Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.py
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.py	2010-08-30 11:54:04 UTC (rev 116026)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.py	2010-08-30 12:09:06 UTC (rev 116027)
@@ -21,9 +21,9 @@
 import zope.lifecycleevent
 from zope.interface import implements
 
-from zope.app.authentication.authentication import PluggableAuthentication
-from zope.app.security.interfaces import IAuthentication
-from zope.app.authentication.interfaces import IAuthenticatorPlugin
+from zope.pluggableauth import PluggableAuthentication
+from zope.authentication.interfaces import IAuthentication
+from zope.pluggableauth.interfaces import IAuthenticatorPlugin
 from zope.app.authentication.principalfolder import PrincipalFolder
 
 from z3c.sampledata.interfaces import ISampleDataPlugin

Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.txt
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.txt	2010-08-30 11:54:04 UTC (rev 116026)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.txt	2010-08-30 12:09:06 UTC (rev 116027)
@@ -36,7 +36,6 @@
   >>> 'pau' in site.getSiteManager()['default']
   True
   >>> from zope import component
-  >>> from zope.app.security.interfaces import IAuthentication
+  >>> from zope.authentication.interfaces import IAuthentication
   >>> component.getUtility(IAuthentication)
   <zope.pluggableauth.authentication.PluggableAuthentication object at ...>
-

Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/principals.py
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/principals.py	2010-08-30 11:54:04 UTC (rev 116026)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/principals.py	2010-08-30 12:09:06 UTC (rev 116027)
@@ -24,7 +24,7 @@
 import zope.lifecycleevent
 from zope.interface import implements
 from zope.app.authentication import principalfolder
-from zope.app.component import hooks
+from zope.site import hooks
 
 from z3c.sampledata.interfaces import ISampleDataPlugin