Author: rmarianski
Date: 2007-11-21 00:47:24 -0500 (Wed, 21 Nov 2007)
New Revision: 11183

Added:
   opencore/trunk/opencore/listen/featurelet.py
Removed:
   opencore/trunk/opencore/featurelets/listen.py
   opencore/trunk/opencore/featurelets/wordpress.py
Modified:
   opencore/trunk/Products/OpenPlans/__init__.py
   opencore/trunk/opencore/featurelets/browser/listen.py
   opencore/trunk/opencore/featurelets/tests/test_listen.py
   opencore/trunk/opencore/listen/listen_discussion.txt
   opencore/trunk/opencore/project/browser/tests.py
Log:
* move opencore/featurelets/listen.py -> opencore/listen/featurelet.py
* remove extra opencore/featurelets/wordpress.py (unused duplicate of 
opencore/wordpress/featurelet.py)
* update imports and tests


Modified: opencore/trunk/Products/OpenPlans/__init__.py
===================================================================
--- opencore/trunk/Products/OpenPlans/__init__.py       2007-11-21 04:15:43 UTC 
(rev 11182)
+++ opencore/trunk/Products/OpenPlans/__init__.py       2007-11-21 05:47:24 UTC 
(rev 11183)
@@ -40,7 +40,7 @@
     # with the Archetypes runtime
     from content import *
     from opencore.content import *
-    from opencore.featurelets.listen import ListenFeaturelet
+    from opencore.listen.featurelet import ListenFeaturelet
     from opencore.tasktracker.featurelet import TaskTrackerFeaturelet
     from opencore.wordpress.featurelet import WordPressFeaturelet
     from opencore.listen import mailinglist

Modified: opencore/trunk/opencore/featurelets/browser/listen.py
===================================================================
--- opencore/trunk/opencore/featurelets/browser/listen.py       2007-11-21 
04:15:43 UTC (rev 11182)
+++ opencore/trunk/opencore/featurelets/browser/listen.py       2007-11-21 
05:47:24 UTC (rev 11183)
@@ -6,7 +6,7 @@
 
 from topp.featurelets.interfaces import IFeatureletSupporter
 
-from opencore.featurelets.listen import ListenFeaturelet
+from opencore.listen.featurelet import ListenFeaturelet
 
 _ = MessageFactory("opencore")
 

Deleted: opencore/trunk/opencore/featurelets/listen.py
===================================================================
--- opencore/trunk/opencore/featurelets/listen.py       2007-11-21 04:15:43 UTC 
(rev 11182)
+++ opencore/trunk/opencore/featurelets/listen.py       2007-11-21 05:47:24 UTC 
(rev 11183)
@@ -1,55 +0,0 @@
-import logging
-from interfaces import IListenContainer
-from interfaces import IListenFeatureletInstalled
-from opencore.interfaces import IProject
-from opencore.interfaces.event import ListenFeatureletCreatedEvent
-from topp.featurelets.base import BaseFeaturelet
-from topp.featurelets.interfaces import IFeaturelet
-from topp.featurelets.interfaces import IFeatureletSupporter
-from zope.component import getMultiAdapter
-from zope.interface import Interface
-from zope.interface import alsoProvides
-from zope.interface import implements
-from zope.event import notify
-
-
-log = logging.getLogger('opencore.featurelets.listen')
-
-class ListenFeaturelet(BaseFeaturelet):
-    """
-    A featurelet that installs a folder for managing listen based
-    mailing lists.
-    """
-    implements(IFeaturelet)
-
-    id = "listen"
-    title = "Mailing lists"
-    #config_view = "listen_config"
-    installed_marker = IListenFeatureletInstalled
-    
-    _info = {'content': ({'id': 'lists', 'title': 'Mailing lists',
-                          'portal_type': 'Folder'},),
-             'menu_items': ({'title': u'Mailing lists',
-                             'description': u'Mailing lists',
-                             'action': u'lists',
-                             'order': 0,
-                             },
-                            ),
-             }
-
-    _required_interfaces = BaseFeaturelet._required_interfaces + \
-                           (IProject,)
-
-    def deliverPackage(self, obj):
-        """
-        See IFeaturelet.
-        """
-        BaseFeaturelet.deliverPackage(self, obj)
-        container = obj._getOb(self._info['content'][0]['id'])
-        container.setLayout('mailing_lists')
-        alsoProvides(container, IListenContainer)
-        notify(ListenFeatureletCreatedEvent(obj))
-        return self._info
-
-
-            

Modified: opencore/trunk/opencore/featurelets/tests/test_listen.py
===================================================================
--- opencore/trunk/opencore/featurelets/tests/test_listen.py    2007-11-21 
04:15:43 UTC (rev 11182)
+++ opencore/trunk/opencore/featurelets/tests/test_listen.py    2007-11-21 
05:47:24 UTC (rev 11183)
@@ -20,7 +20,7 @@
 
 from topp.featurelets.interfaces import IFeatureletSupporter
 from topp.featurelets.interfaces import IMenuSupporter
-from opencore.featurelets.listen import ListenFeaturelet
+from opencore.listen.featurelet import ListenFeaturelet
 from opencore.featurelets.browser.listen import ListenConfigView
 
 class TestListenFeaturelet(OpenPlansTestCase):

Deleted: opencore/trunk/opencore/featurelets/wordpress.py
===================================================================
--- opencore/trunk/opencore/featurelets/wordpress.py    2007-11-21 04:15:43 UTC 
(rev 11182)
+++ opencore/trunk/opencore/featurelets/wordpress.py    2007-11-21 05:47:24 UTC 
(rev 11183)
@@ -1,37 +0,0 @@
-from zope.interface import implements, Interface
-from zope.component import getUtility
-from opencore.utility.interfaces import IHTTPClient 
-from topp.featurelets.interfaces import IFeaturelet
-from topp.featurelets.base import BaseFeaturelet
-from Products.CMFCore.utils import getToolByName
-
-from interfaces import IWordpressFeatureletInstalled
-from interfaces import IWordpressContainer
-
-from Products.OpenPlans.interfaces import IProject
-
-class WordpressFeaturelet(BaseFeaturelet):
-    """
-    A featurelet that installs a Wordpress blog
-    """
-
-    implements(IFeaturelet)
-    
-    id = "blog"
-    title = "Blog"
-    installed_marker = IWordpressFeatureletInstalled
-
-    _info = {'menu_items': ({'title': u'blog',
-                             'description': u'Blog',
-                             'action': 'blog'
-                             },
-                            ),
-             }
-
-    _required_interfaces = BaseFeaturelet._required_interfaces + (IProject,)
-
-    def deliverPackage(self, obj):
-        return BaseFeaturelet.deliverPackage(self, obj)
-
-    def removePackage(self, obj):
-        return BaseFeaturelet.removePackage(self, obj)

Copied: opencore/trunk/opencore/listen/featurelet.py (from rev 11181, 
opencore/trunk/opencore/featurelets/listen.py)
===================================================================
--- opencore/trunk/opencore/listen/featurelet.py                                
(rev 0)
+++ opencore/trunk/opencore/listen/featurelet.py        2007-11-21 05:47:24 UTC 
(rev 11183)
@@ -0,0 +1,55 @@
+import logging
+from opencore.featurelets.interfaces import IListenContainer
+from opencore.featurelets.interfaces import IListenFeatureletInstalled
+from opencore.interfaces import IProject
+from opencore.interfaces.event import ListenFeatureletCreatedEvent
+from topp.featurelets.base import BaseFeaturelet
+from topp.featurelets.interfaces import IFeaturelet
+from topp.featurelets.interfaces import IFeatureletSupporter
+from zope.component import getMultiAdapter
+from zope.interface import Interface
+from zope.interface import alsoProvides
+from zope.interface import implements
+from zope.event import notify
+
+
+log = logging.getLogger('opencore.featurelets.listen')
+
+class ListenFeaturelet(BaseFeaturelet):
+    """
+    A featurelet that installs a folder for managing listen based
+    mailing lists.
+    """
+    implements(IFeaturelet)
+
+    id = "listen"
+    title = "Mailing lists"
+    #config_view = "listen_config"
+    installed_marker = IListenFeatureletInstalled
+    
+    _info = {'content': ({'id': 'lists', 'title': 'Mailing lists',
+                          'portal_type': 'Folder'},),
+             'menu_items': ({'title': u'Mailing lists',
+                             'description': u'Mailing lists',
+                             'action': u'lists',
+                             'order': 0,
+                             },
+                            ),
+             }
+
+    _required_interfaces = BaseFeaturelet._required_interfaces + \
+                           (IProject,)
+
+    def deliverPackage(self, obj):
+        """
+        See IFeaturelet.
+        """
+        BaseFeaturelet.deliverPackage(self, obj)
+        container = obj._getOb(self._info['content'][0]['id'])
+        container.setLayout('mailing_lists')
+        alsoProvides(container, IListenContainer)
+        notify(ListenFeatureletCreatedEvent(obj))
+        return self._info
+
+
+            

Modified: opencore/trunk/opencore/listen/listen_discussion.txt
===================================================================
--- opencore/trunk/opencore/listen/listen_discussion.txt        2007-11-21 
04:15:43 UTC (rev 11182)
+++ opencore/trunk/opencore/listen/listen_discussion.txt        2007-11-21 
05:47:24 UTC (rev 11183)
@@ -14,7 +14,7 @@
 
 Add the mailing list featurelet to the project
     >>> from topp.featurelets.interfaces import IFeatureletSupporter
-    >>> from opencore.featurelets.listen import ListenFeaturelet
+    >>> from opencore.listen.featurelet import ListenFeaturelet
     >>> IFeatureletSupporter(proj).installFeaturelet(ListenFeaturelet())
 
 And verify that the mailing list automatically gets added

Modified: opencore/trunk/opencore/project/browser/tests.py
===================================================================
--- opencore/trunk/opencore/project/browser/tests.py    2007-11-21 04:15:43 UTC 
(rev 11182)
+++ opencore/trunk/opencore/project/browser/tests.py    2007-11-21 05:47:24 UTC 
(rev 11183)
@@ -32,9 +32,8 @@
     from opencore.testing import utils
     from opencore.nui.indexing import authenticated_memberid
 
-    # @@ bah... crappy irregular import scheme
     from opencore.tasktracker.featurelet import TaskTrackerFeaturelet
-    from opencore.featurelets.listen import ListenFeaturelet
+    from opencore.listen.featurelet import ListenFeaturelet
 
     # for delet-project
     from topp.featurelets.interfaces import IFeatureletSupporter



--
Archive: 
http://www.openplans.org/projects/opencore/lists/openplans-svn/archive/2007/11/1195624045564
To unsubscribe send an email with subject unsubscribe to [EMAIL PROTECTED]  
Please contact [EMAIL PROTECTED] for questions.

Reply via email to