# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1337212392 -7200
# Node ID 51af2ed8bd5018b3995403f55594eacea088e210
# Parent  564ae55219e1ab497d85c41d332f820bfcb460bf
replaced idavoll imports by sat_pubsub imports

diff -r 564ae55219e1 -r 51af2ed8bd50 doc/examples/idavoll.tac
--- a/doc/examples/idavoll.tac	Thu May 17 01:48:39 2012 +0200
+++ b/doc/examples/idavoll.tac	Thu May 17 01:53:12 2012 +0200
@@ -8,7 +8,7 @@
 from twisted.application import service
 from twisted.words.protocols.jabber.jid import JID
 
-from idavoll import tap
+from sat_pubsub import tap
 
 application = service.Application("Idavoll")
 
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub.tac
--- a/sat_pubsub.tac	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub.tac	Thu May 17 01:53:12 2012 +0200
@@ -10,7 +10,7 @@
 from twisted.application import service
 from twisted.words.protocols.jabber.jid import JID
 
-from idavoll import tap
+from sat_pubsub import tap
 
 application = service.Application("sat_pubsub")
 
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/backend.py
--- a/sat_pubsub/backend.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/backend.py	Thu May 17 01:53:12 2012 +0200
@@ -76,8 +76,8 @@
 from wokkel.iwokkel import IPubSubResource
 from wokkel.pubsub import PubSubResource, PubSubError
 
-from idavoll import error, iidavoll
-from idavoll.iidavoll import IBackendService, ILeafNode
+from sat_pubsub import error, iidavoll
+from sat_pubsub.iidavoll import IBackendService, ILeafNode
 
 def _getAffiliation(node, entity):
     d = node.getAffiliation(entity)
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/gateway.py
--- a/sat_pubsub/gateway.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/gateway.py	Thu May 17 01:53:12 2012 +0200
@@ -77,7 +77,7 @@
 from wokkel.pubsub import Item
 from wokkel.pubsub import PubSubClient
 
-from idavoll import error
+from sat_pubsub import error
 
 NS_ATOM = 'http://www.w3.org/2005/Atom'
 MIME_ATOM_ENTRY = 'application/atom+xml;type=entry'
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/memory_storage.py
--- a/sat_pubsub/memory_storage.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/memory_storage.py	Thu May 17 01:53:12 2012 +0200
@@ -59,7 +59,7 @@
 
 from wokkel.pubsub import Subscription
 
-from idavoll import error, iidavoll
+from sat_pubsub import error, iidavoll
 
 class Storage:
 
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/pgsql_storage.py
--- a/sat_pubsub/pgsql_storage.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/pgsql_storage.py	Thu May 17 01:53:12 2012 +0200
@@ -62,7 +62,7 @@
 from wokkel.generic import parseXml, stripNamespace
 from wokkel.pubsub import Subscription
 
-from idavoll import error, iidavoll
+from sat_pubsub import error, iidavoll
 
 class Storage:
 
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/tap.py
--- a/sat_pubsub/tap.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/tap.py	Thu May 17 01:53:12 2012 +0200
@@ -62,8 +62,8 @@
 from wokkel.iwokkel import IPubSubResource
 from wokkel.pubsub import PubSubService
 
-from idavoll import __version__
-from idavoll.backend import BackendService
+from sat_pubsub import __version__
+from sat_pubsub.backend import BackendService
 
 class Options(usage.Options):
     optParameters = [
@@ -99,7 +99,7 @@
 
     if config['backend'] == 'pgsql':
         from twisted.enterprise import adbapi
-        from idavoll.pgsql_storage import Storage
+        from sat_pubsub.pgsql_storage import Storage
         dbpool = adbapi.ConnectionPool('psycopg2',
                                        user=config['dbuser'],
                                        password=config['dbpass'],
@@ -111,7 +111,7 @@
                                        )
         st = Storage(dbpool)
     elif config['backend'] == 'memory':
-        from idavoll.memory_storage import Storage
+        from sat_pubsub.memory_storage import Storage
         st = Storage()
 
     bs = BackendService(st)
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/tap_http.py
--- a/sat_pubsub/tap_http.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/tap_http.py	Thu May 17 01:53:12 2012 +0200
@@ -58,8 +58,8 @@
 from twisted.web2 import channel, log, resource, server
 from twisted.web2.tap import Web2Service
 
-from idavoll import gateway, tap
-from idavoll.gateway import RemoteSubscriptionService
+from sat_pubsub import gateway, tap
+from sat_pubsub.gateway import RemoteSubscriptionService
 
 class Options(tap.Options):
     optParameters = [
@@ -91,10 +91,10 @@
     # Set up XMPP service for subscribing to remote nodes
 
     if config['backend'] == 'pgsql':
-        from idavoll.pgsql_storage import GatewayStorage
+        from sat_pubsub.pgsql_storage import GatewayStorage
         gst = GatewayStorage(bs.storage.dbpool)
     elif config['backend'] == 'memory':
-        from idavoll.memory_storage import GatewayStorage
+        from sat_pubsub.memory_storage import GatewayStorage
         gst = GatewayStorage()
 
     ss = RemoteSubscriptionService(config['jid'], gst)
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/test/test_backend.py
--- a/sat_pubsub/test/test_backend.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/test/test_backend.py	Thu May 17 01:53:12 2012 +0200
@@ -66,7 +66,7 @@
 
 from wokkel import iwokkel, pubsub
 
-from idavoll import backend, error, iidavoll
+from sat_pubsub import backend, error, iidavoll
 
 OWNER = jid.JID('owner@example.com')
 OWNER_FULL = jid.JID('owner@example.com/home')
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/test/test_gateway.py
--- a/sat_pubsub/test/test_gateway.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/test/test_gateway.py	Thu May 17 01:53:12 2012 +0200
@@ -64,7 +64,7 @@
 from twisted.web import error
 from twisted.words.xish import domish
 
-from idavoll import gateway
+from sat_pubsub import gateway
 
 AGENT = "Idavoll Test Script"
 NS_ATOM = "http://www.w3.org/2005/Atom"
diff -r 564ae55219e1 -r 51af2ed8bd50 sat_pubsub/test/test_storage.py
--- a/sat_pubsub/test/test_storage.py	Thu May 17 01:48:39 2012 +0200
+++ b/sat_pubsub/test/test_storage.py	Thu May 17 01:53:12 2012 +0200
@@ -62,7 +62,7 @@
 from twisted.internet import defer
 from twisted.words.xish import domish
 
-from idavoll import error, iidavoll
+from sat_pubsub import error, iidavoll
 
 OWNER = jid.JID('owner@example.com/Work')
 SUBSCRIBER = jid.JID('subscriber@example.com/Home')
@@ -484,8 +484,8 @@
 class MemoryStorageStorageTestCase(unittest.TestCase, StorageTests):
 
     def setUp(self):
-        from idavoll.memory_storage import Storage, PublishedItem, LeafNode
-        from idavoll.memory_storage import Subscription
+        from sat_pubsub.memory_storage import Storage, PublishedItem, LeafNode
+        from sat_pubsub.memory_storage import Subscription
 
         defaultConfig = Storage.defaultConfig['leaf']
 
@@ -528,7 +528,7 @@
     dbpool = None
 
     def setUp(self):
-        from idavoll.pgsql_storage import Storage
+        from sat_pubsub.pgsql_storage import Storage
         from twisted.enterprise import adbapi
         if self.dbpool is None:
             self.__class__.dbpool = adbapi.ConnectionPool('psycopg2',
diff -r 564ae55219e1 -r 51af2ed8bd50 setup.py
--- a/setup.py	Thu May 17 01:48:39 2012 +0200
+++ b/setup.py	Thu May 17 01:53:12 2012 +0200
@@ -54,7 +54,7 @@
 
 import sys
 from setuptools import setup
-from idavoll import __version__
+from sat_pubsub import __version__
 
 install_requires = [
     'wokkel >= 0.5.0',