# HG changeset patch # User Goffi # Date 1337467933 -7200 # Node ID 2b50e4664d7404be6935af2449160706328add62 # Parent a4511cb06352cfcc17cd5da02c05878e82fdf549 fixed setup.py and twistd plugin file diff -r a4511cb06352 -r 2b50e4664d74 doc/examples/idavoll.tac --- a/doc/examples/idavoll.tac Sat May 19 01:31:07 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -# Copyright (c) 2003-2008 Ralph Meijer -# See LICENSE for details. - -""" -Example TAC for Idavoll. -""" - -from twisted.application import service -from twisted.words.protocols.jabber.jid import JID - -from sat_pubsub import tap - -application = service.Application("Idavoll") - -config = { - 'jid': JID('pubsub.example.org'), - 'secret': 'secret', - 'rhost': '127.0.0.1', - 'rport': 5347, - 'backend': 'memory', - 'verbose': True, - 'hide-nodes': False, -} - -idavollService = tap.makeService(config) -idavollService.setServiceParent(application) - -# Set the maximum delay until trying to reconnect. -componentService = idavollService.getServiceNamed('component') -componentService.factory.maxdelay = 300 diff -r a4511cb06352 -r 2b50e4664d74 doc/examples/sat_pubsub.tac --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/examples/sat_pubsub.tac Sun May 20 00:52:13 2012 +0200 @@ -0,0 +1,81 @@ +#!/usr/bin/python +#-*- coding: utf-8 -*- + +""" +Copyright (c) 2003-2011 Ralph Meijer +Copyright (c) 2012 Jérôme Poisson + + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +-- + +This program is based on Idavoll (http://idavoll.ik.nu/), +originaly written by Ralph Meijer (http://ralphm.net/blog/) +It is sublicensed under AGPL v3 (or any later version) as allowed by the original +license. + +-- + +Here is a copy of the original license: + +Copyright (c) 2003-2011 Ralph Meijer + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +""" + +""" +Example TAC for Salut à Toi Pubsub. +""" + +from twisted.application import service +from twisted.words.protocols.jabber.jid import JID + +from sat_pubsub import tap + +application = service.Application(u"SàT Pubsub") + +config = { + 'jid': JID('pubsub.example.org'), + 'secret': 'secret', + 'rhost': '127.0.0.1', + 'rport': 5347, + 'backend': 'memory', + 'verbose': True, + 'hide-nodes': False, +} + +satPubsubService = tap.makeService(config) +satPubsubService.setServiceParent(application) + +# Set the maximum delay until trying to reconnect. +componentService = satPubsubService.getServiceNamed('component') +componentService.factory.maxdelay = 300 diff -r a4511cb06352 -r 2b50e4664d74 setup.py --- a/setup.py Sat May 19 01:31:07 2012 +0200 +++ b/setup.py Sun May 20 00:52:13 2012 +0200 @@ -64,23 +64,23 @@ if sys.version_info < (2, 5): install_requires.append('uuid') -setup(name='idavoll', +setup(name='sat_pubsub', version=__version__, description='Jabber Publish-Subscribe Service Component', - author='Ralph Meijer', - author_email='ralphm@ik.nu', - url='http://idavoll.ik.nu/', - license='MIT', + maintainer='Jérôme Poisson', + maintainer_email='goffi@goffi.org', + url='http://repos.goffi.org/sat_pubsub', + license='AGPLv3+', packages=[ - 'idavoll', - 'idavoll.test', + 'sat_pubsub', + 'sat_pubsub.test', ], - package_data={'twisted.plugins': ['twisted/plugins/idavoll.py', - 'twisted/plugins/idavoll_http.py']}, - data_files=[('share/idavoll', ['db/pubsub.sql', + package_data={'twisted.plugins': ['twisted/plugins/sat_pubsub.py', + 'twisted/plugins/sat_pubsub_http.py']}, + data_files=[('share/sat_pubsub', ['db/pubsub.sql', 'db/gateway.sql', 'db/to_idavoll_0.8.sql', - 'doc/examples/idavoll.tac', + 'doc/examples/sat_pubsub.tac', ])], zip_safe=False, install_requires=install_requires, diff -r a4511cb06352 -r 2b50e4664d74 twisted/plugins/idavoll.py --- a/twisted/plugins/idavoll.py Sat May 19 01:31:07 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -#!/usr/bin/python -#-*- coding: utf-8 -*- - -""" -Copyright (c) 2003-2011 Ralph Meijer -Copyright (c) 2012 Jérôme Poisson - - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . --- - -This program is based on Idavoll (http://idavoll.ik.nu/), -originaly written by Ralph Meijer (http://ralphm.net/blog/) -It is sublicensed under AGPL v3 (or any later version) as allowed by the original -license. - --- - -Here is a copy of the original license: - -Copyright (c) 2003-2011 Ralph Meijer - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -""" - -try: - from twisted.application.service import ServiceMaker -except ImportError: - from twisted.scripts.mktap import _tapHelper as ServiceMaker - -Idavoll = ServiceMaker( - "Idavoll", - "idavoll.tap", - "Jabber Publish-Subscribe Service Component", - "idavoll") diff -r a4511cb06352 -r 2b50e4664d74 twisted/plugins/sat_pubsub.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/twisted/plugins/sat_pubsub.py Sun May 20 00:52:13 2012 +0200 @@ -0,0 +1,64 @@ +#!/usr/bin/python +#-*- coding: utf-8 -*- + +""" +Copyright (c) 2003-2011 Ralph Meijer +Copyright (c) 2012 Jérôme Poisson + + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +-- + +This program is based on Idavoll (http://idavoll.ik.nu/), +originaly written by Ralph Meijer (http://ralphm.net/blog/) +It is sublicensed under AGPL v3 (or any later version) as allowed by the original +license. + +-- + +Here is a copy of the original license: + +Copyright (c) 2003-2011 Ralph Meijer + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +""" + +try: + from twisted.application.service import ServiceMaker +except ImportError: + from twisted.scripts.mktap import _tapHelper as ServiceMaker + +SatPubsub = ServiceMaker( + u"Sàt Pubsub", + "sat_pubsub.tap", + u"Salut à Toi Publish-Subscribe Service Component", + "sat_pubsub")