Changeset 7:0fbac5c2e97d in ralphm-patches

Timestamp:

Apr 7, 2009, 11:53:45 AM (12 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Save current state.

Files:

• compat-pre-twisted-8.0.0.patch (modified) (7 diffs)
• pubsub-disco-info-42.patch (added)
• pubsub_request.patch (modified) (20 diffs)
• pubsub_resource.patch (modified) (58 diffs)
• release-0.5.patch (modified) (5 diffs)
• s2s.patch (modified) (31 diffs)
• series (modified) (2 diffs)

compat-pre-twisted-8.0.0.patch

@@ -1 @@
-diff -r 6fa0283e522b wokkel/compat.py
---- a/wokkel/compat.py  Wed Mar 25 18:14:08 2009 +0100
-+++ b/wokkel/compat.py  Wed Mar 25 18:15:15 2009 +0100
+diff -r 84ffc75012b4 wokkel/compat.py
+--- a/wokkel/compat.py  Tue Apr 07 11:14:44 2009 +0200
++++ b/wokkel/compat.py  Tue Apr 07 11:15:52 2009 +0200
 @@ -7,40 +7,6 @@
  from twisted.words.protocols.jabber import xmlstream
@@ -43 +43 @@
      """
      XmlStream factory mixin to install bootstrap event observers.
-diff -r 6fa0283e522b wokkel/subprotocols.py
---- a/wokkel/subprotocols.py    Wed Mar 25 18:14:08 2009 +0100
-+++ b/wokkel/subprotocols.py    Wed Mar 25 18:15:15 2009 +0100
+diff -r 84ffc75012b4 wokkel/subprotocols.py
+--- a/wokkel/subprotocols.py    Tue Apr 07 11:14:44 2009 +0200
++++ b/wokkel/subprotocols.py    Tue Apr 07 11:15:52 2009 +0200
 @@ -1,6 +1,6 @@
  # -*- test-case-name: wokkel.test.test_subprotocols -*-
@@ -70 +70 @@
  
  class XMPPHandler(object):
-diff -r 6fa0283e522b wokkel/test/test_compat.py
---- a/wokkel/test/test_compat.py        Wed Mar 25 18:14:08 2009 +0100
-+++ b/wokkel/test/test_compat.py        Wed Mar 25 18:15:15 2009 +0100
+diff -r 84ffc75012b4 wokkel/test/test_compat.py
+--- a/wokkel/test/test_compat.py        Tue Apr 07 11:14:44 2009 +0200
++++ b/wokkel/test/test_compat.py        Tue Apr 07 11:15:52 2009 +0200
 @@ -1,5 +1,5 @@
 -# Copyright (c) 2001-2007 Twisted Matrix Laboratories.
@@ -166 +166 @@
      """
      Tests for L{XmlStreamServerFactory}.
-diff -r 6fa0283e522b wokkel/test/test_disco.py
---- a/wokkel/test/test_disco.py Wed Mar 25 18:14:08 2009 +0100
-+++ b/wokkel/test/test_disco.py Wed Mar 25 18:15:15 2009 +0100
+diff -r 84ffc75012b4 wokkel/test/test_disco.py
+--- a/wokkel/test/test_disco.py Tue Apr 07 11:14:44 2009 +0200
++++ b/wokkel/test/test_disco.py Tue Apr 07 11:15:52 2009 +0200
 @@ -10,6 +10,7 @@
  from twisted.internet import defer
@@ -189 +189 @@
  NS_DISCO_ITEMS = 'http://jabber.org/protocol/disco#items'
  
-diff -r 6fa0283e522b wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Wed Mar 25 18:14:08 2009 +0100
-+++ b/wokkel/test/test_pubsub.py        Wed Mar 25 18:15:15 2009 +0100
+diff -r 84ffc75012b4 wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Tue Apr 07 11:14:44 2009 +0200
++++ b/wokkel/test/test_pubsub.py        Tue Apr 07 11:15:52 2009 +0200
 @@ -1,4 +1,4 @@
 -# Copyright (c) 2003-2008 Ralph Meijer
@@ -198 +198 @@
  
  """
-@@ -12,16 +12,12 @@
+@@ -12,15 +12,11 @@
  from twisted.words.xish import domish
  from twisted.words.protocols.jabber import error
@@ -205 +205 @@
  
  from wokkel import data_form, disco, iwokkel, pubsub, shim
- from wokkel.generic import parseXml
  from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
  

pubsub_request.patch

@@ -11 +11 @@
 that is passed to the corresponding handler methods.
 
-diff -r 0bfc0b2a633c wokkel/generic.py
---- a/wokkel/generic.py Wed Apr 01 17:25:11 2009 +0200
-+++ b/wokkel/generic.py Wed Apr 01 17:26:46 2009 +0200
+diff -r 556fc011f965 wokkel/generic.py
+--- a/wokkel/generic.py Tue Apr 07 11:16:01 2009 +0200
++++ b/wokkel/generic.py Tue Apr 07 11:17:21 2009 +0200
 @@ -10,7 +10,7 @@
  from zope.interface import implements
@@ -61 +61 @@
      protocol = xmlstream.XmlStream
  
-diff -r 0bfc0b2a633c wokkel/iwokkel.py
---- a/wokkel/iwokkel.py Wed Apr 01 17:25:11 2009 +0200
-+++ b/wokkel/iwokkel.py Wed Apr 01 17:26:46 2009 +0200
+diff -r 556fc011f965 wokkel/iwokkel.py
+--- a/wokkel/iwokkel.py Tue Apr 07 11:16:01 2009 +0200
++++ b/wokkel/iwokkel.py Tue Apr 07 11:17:21 2009 +0200
 @@ -278,6 +278,7 @@
                               C{list} of L{domish.Element})
@@ -343 +343 @@
 +        @rtype: L{defer.Deferred}
          """
-diff -r 0bfc0b2a633c wokkel/pubsub.py
---- a/wokkel/pubsub.py  Wed Apr 01 17:25:11 2009 +0200
-+++ b/wokkel/pubsub.py  Wed Apr 01 17:26:46 2009 +0200
+diff -r 556fc011f965 wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Tue Apr 07 11:16:01 2009 +0200
++++ b/wokkel/pubsub.py  Tue Apr 07 11:17:21 2009 +0200
 @@ -16,7 +16,7 @@
  from twisted.words.protocols.jabber import jid, error, xmlstream
@@ -1415 +1415 @@
 +    def delete(self, request):
          raise Unsupported('delete-nodes')
-diff -r 0bfc0b2a633c wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Wed Apr 01 17:25:11 2009 +0200
-+++ b/wokkel/test/test_pubsub.py        Wed Apr 01 17:26:46 2009 +0200
-@@ -14,6 +14,7 @@
- from twisted.words.protocols.jabber.jid import JID
- 
- from wokkel import data_form, iwokkel, pubsub, shim
+diff -r 556fc011f965 wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Tue Apr 07 11:16:01 2009 +0200
++++ b/wokkel/test/test_pubsub.py        Tue Apr 07 11:17:21 2009 +0200
+@@ -15,6 +15,7 @@
+ from twisted.words.protocols.jabber.xmlstream import toResponse
+ 
+ from wokkel import data_form, disco, iwokkel, pubsub, shim
 +from wokkel.generic import parseXml
  from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
  
- try:
-@@ -490,6 +491,630 @@
+ NS_PUBSUB = 'http://jabber.org/protocol/pubsub'
+@@ -487,6 +488,630 @@
  
  
@@ -2057 +2057 @@
      """
      Tests for L{pubsub.PubSubService}.
-@@ -507,6 +1132,29 @@
+@@ -504,6 +1129,29 @@
          verify.verifyObject(iwokkel.IPubSubService, self.service)
  
@@ -2087 +2087 @@
          """
          Test getDiscoInfo calls getNodeInfo and returns some minimal info.
-@@ -524,28 +1172,6 @@
+@@ -569,28 +1217,6 @@
          return d
  
@@ -2116 +2116 @@
          """
          A publish request should result in L{PubSubService.publish} being
-@@ -561,27 +1187,147 @@
+@@ -606,27 +1232,147 @@
          </iq>
          """
@@ -2271 +2271 @@
          </iq>
          """
-@@ -627,14 +1373,141 @@
+@@ -672,14 +1418,141 @@
              self.assertEqual('subscribed', subscription['subscription'])
  
@@ -2416 +2416 @@
          d.addCallback(cb)
          return d
-@@ -665,10 +1538,7 @@
+@@ -710,10 +1583,7 @@
                       "label": "Deliver payloads with event notifications"}
                  }
@@ -2428 +2428 @@
  
          def cb(element):
-@@ -686,6 +1556,85 @@
+@@ -731,6 +1601,85 @@
          return d
  
@@ -2514 +2514 @@
          """
          On a node configuration get request L{PubSubService.getConfiguration}
-@@ -714,14 +1663,11 @@
+@@ -759,14 +1708,11 @@
                       "label": "Owner of the node"}
                  }
@@ -2532 +2532 @@
          def cb(element):
              self.assertEqual('pubsub', element.name)
-@@ -749,8 +1695,12 @@
+@@ -794,8 +1740,12 @@
              field.typeCheck()
              self.assertEqual(JID('user@example.org'), field.value)
@@ -2545 +2545 @@
          d.addCallback(cb)
          return d
-@@ -789,16 +1739,14 @@
+@@ -834,16 +1784,14 @@
                       "label": "Deliver payloads with event notifications"}
                  }
@@ -2565 +2565 @@
  
  
-@@ -823,10 +1771,11 @@
+@@ -868,10 +1816,11 @@
          </iq>
          """
@@ -2578 +2578 @@
  
  
-@@ -862,14 +1811,47 @@
+@@ -907,14 +1856,47 @@
                       "label": "Deliver payloads with event notifications"}
                  }
@@ -2628 +2628 @@
          """
          On a items request, return all items for the given node.
-@@ -883,12 +1865,7 @@
+@@ -928,12 +1910,7 @@
          </iq>
          """
@@ -2642 +2642 @@
  
          def cb(element):
-@@ -925,11 +1902,7 @@
+@@ -970,11 +1947,7 @@
          </iq>
          """
@@ -2655 +2655 @@
  
          self.service.retract = retract
-@@ -951,10 +1924,7 @@
+@@ -996,10 +1969,7 @@
          </iq>
          """
@@ -2667 +2667 @@
  
          self.service.purge = purge
-@@ -976,10 +1946,7 @@
+@@ -1021,10 +1991,7 @@
          </iq>
          """
@@ -2679 +2679 @@
  
          self.service.delete = delete
-@@ -1031,3 +1998,461 @@
+@@ -1076,3 +2043,461 @@
          self.assertEqual(NS_PUBSUB_EVENT, message.event.delete.redirect.uri)
          self.assertTrue(message.event.delete.redirect.hasAttribute('uri'))

pubsub_resource.patch

@@ -1 @@
-diff -r 2ea6196efcdc wokkel/iwokkel.py
---- a/wokkel/iwokkel.py Wed Mar 25 18:14:07 2009 +0100
-+++ b/wokkel/iwokkel.py Mon Mar 30 08:35:05 2009 +0200
+diff -r cf770fa6bcb7 wokkel/iwokkel.py
+--- a/wokkel/iwokkel.py Tue Apr 07 11:17:23 2009 +0200
++++ b/wokkel/iwokkel.py Tue Apr 07 11:25:27 2009 +0200
 @@ -297,75 +297,46 @@
          """
@@ -208 +208 @@
          Called when a node configuration change request has been received.
  
-diff -r 2ea6196efcdc wokkel/pubsub.py
---- a/wokkel/pubsub.py  Wed Mar 25 18:14:07 2009 +0100
-+++ b/wokkel/pubsub.py  Mon Mar 30 08:35:05 2009 +0200
+diff -r cf770fa6bcb7 wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Tue Apr 07 11:17:23 2009 +0200
++++ b/wokkel/pubsub.py  Tue Apr 07 11:25:27 2009 +0200
 @@ -13,12 +13,13 @@
  from zope.interface import implements
@@ -296 +296 @@
 @@ -852,17 +845,33 @@
  
-                 info.append(form.toElement())
+                 info.append(form)
  
 -        d = self.getNodeInfo(requestor, target, nodeIdentifier or '')
@@ -765 +765 @@
 +    def subscriptionsSet(self, request):
 +        return defer.fail(Unsupported('manage-subscriptions'))
-diff -r 2ea6196efcdc wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Wed Mar 25 18:14:07 2009 +0100
-+++ b/wokkel/test/test_pubsub.py        Mon Mar 30 08:35:05 2009 +0200
-@@ -13,7 +13,7 @@
- from twisted.words.protocols.jabber import error
- from twisted.words.protocols.jabber.jid import JID
- 
--from wokkel import data_form, iwokkel, pubsub, shim
-+from wokkel import data_form, disco, iwokkel, pubsub, shim
- from wokkel.generic import parseXml
- from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
- 
-@@ -1225,7 +1225,8 @@
+diff -r cf770fa6bcb7 wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Tue Apr 07 11:17:23 2009 +0200
++++ b/wokkel/test/test_pubsub.py        Tue Apr 07 11:25:27 2009 +0200
+@@ -1222,7 +1222,8 @@
  
      def setUp(self):
@@ -787 +778 @@
  
      def test_interface(self):
-@@ -1263,19 +1264,120 @@
+@@ -1260,12 +1261,12 @@
          Test getDiscoInfo calls getNodeInfo and returns some minimal info.
          """
@@ -805 +796 @@
                                        JID('pubsub.example.org'), '')
          d.addCallback(cb)
+@@ -1282,11 +1283,11 @@
+                 discoInfo.append(item)
+             self.assertIn(('pubsub', 'collection'), discoInfo.identities)
+ 
+-        def getNodeInfo(requestor, target, nodeIdentifier):
++        def getInfo(requestor, target, nodeIdentifier):
+             return defer.succeed({'type': 'collection',
+                                   'meta-data': {}})
+ 
+-        self.service.getNodeInfo = getNodeInfo
++        self.resource.getInfo = getInfo
+         d = self.service.getDiscoInfo(JID('user@example.org/home'),
+                                       JID('pubsub.example.org'), '')
+         d.addCallback(cb)
+@@ -1307,20 +1308,100 @@
+             form = discoInfo.extensions[NS_PUBSUB_META_DATA]
+             self.assertIn('pubsub#node_type', form.fields)
+ 
+-        def getNodeInfo(requestor, target, nodeIdentifier):
++        def getInfo(requestor, target, nodeIdentifier):
+             metaData = [{'var': 'pubsub#persist_items',
+                          'label': 'Persist items to storage',
+                          'value': True}]
+             return defer.succeed({'type': 'leaf', 'meta-data': metaData})
+ 
+-        self.service.getNodeInfo = getNodeInfo
++        self.resource.getInfo = getInfo
+         d = self.service.getDiscoInfo(JID('user@example.org/home'),
+                                       JID('pubsub.example.org'), '')
+         d.addCallback(cb)
          return d
  
  
 -    def test_onPublish(self):
-+    def test_getDiscoInfoNodeType(self):
-+        """
-+        Test getDiscoInfo calls getNodeInfo and returns some minimal info.
-+        """
-+        def cb(info):
-+            discoInfo = disco.DiscoInfo()
-+            for item in info:
-+                discoInfo.append(item)
-+            self.assertIn(('pubsub', 'collection'), discoInfo.identities)
-+
-+        def getInfo(requestor, target, nodeIdentifier):
-+            return defer.succeed({'type': 'collection',
-+                                  'meta-data': {}})
-+
-+        self.resource.getInfo = getInfo
-+        d = self.service.getDiscoInfo(JID('user@example.org/home'),
-+                                      JID('pubsub.example.org'), '')
-+        d.addCallback(cb)
-+        return d
-+
-+
 +    def test_getDiscoInfoResourceFeatures(self):
 +        """
-+        Test getDiscoInfo calls getNodeInfo and returns some minimal info.
++        Test getDiscoInfo with the resource features.
 +        """
 +        def cb(info):
@@ -914 +914 @@
          A publish request should result in L{PubSubService.publish} being
          called.
-@@ -1293,12 +1395,12 @@
+@@ -1338,12 +1419,12 @@
          def publish(request):
              return defer.succeed(None)
@@ -930 +930 @@
          A successful subscription should return the current subscription.
          """
-@@ -1326,14 +1428,14 @@
+@@ -1371,14 +1452,14 @@
              self.assertEqual('user@example.org/Home', subscription['jid'])
              self.assertEqual('subscribed', subscription['subscription'])
@@ -948 +948 @@
          A successful subscription on root node should return no node attribute.
          """
-@@ -1355,14 +1457,14 @@
+@@ -1400,14 +1481,14 @@
          def cb(element):
              self.assertFalse(element.subscription.hasAttribute('node'))
@@ -966 +966 @@
          A successful unsubscription should return an empty response.
          """
-@@ -1382,14 +1484,14 @@
+@@ -1427,14 +1508,14 @@
          def cb(element):
              self.assertIdentical(None, element)
@@ -984 +984 @@
          Getting subscription options is not supported.
          """
-@@ -1414,7 +1516,7 @@
+@@ -1459,7 +1540,7 @@
          return d
  
@@ -993 +993 @@
          Setting subscription options is not supported.
          """
-@@ -1446,7 +1548,7 @@
+@@ -1491,7 +1572,7 @@
          return d
  
@@ -1002 +1002 @@
          A subscriptions request should result in
          L{PubSubService.subscriptions} being called and the result prepared
-@@ -1462,6 +1564,11 @@
+@@ -1507,6 +1588,11 @@
          </iq>
          """
@@ -1014 +1014 @@
              self.assertEqual('pubsub', element.name)
              self.assertEqual(NS_PUBSUB, element.uri)
-@@ -1475,20 +1582,14 @@
+@@ -1520,20 +1606,14 @@
              self.assertEqual('test', subscription['node'])
              self.assertEqual('subscribed', subscription['subscription'])
@@ -1038 +1038 @@
          A subscriptions request should result in
          L{PubSubService.affiliations} being called and the result prepared
-@@ -1504,6 +1605,10 @@
+@@ -1549,6 +1629,10 @@
          </iq>
          """
@@ -1049 +1049 @@
              self.assertEqual('pubsub', element.name)
              self.assertEqual(NS_PUBSUB, element.uri)
-@@ -1516,19 +1621,14 @@
+@@ -1561,19 +1645,14 @@
              self.assertEqual('test', affiliation['node'])
              self.assertEqual('owner', affiliation['affiliation'])
@@ -1072 +1072 @@
          Replies to create node requests don't return the created node.
          """
-@@ -1548,14 +1648,14 @@
+@@ -1593,14 +1672,14 @@
          def cb(element):
              self.assertIdentical(None, element)
@@ -1090 +1090 @@
          Replies to create node requests return the created node if changed.
          """
-@@ -1579,14 +1679,14 @@
+@@ -1624,14 +1703,14 @@
              self.assertEqual(u'myrenamednode',
                               element.create.getAttribute('node'))
@@ -1108 +1108 @@
          Replies to create instant node requests return the created node.
          """
-@@ -1609,14 +1709,14 @@
+@@ -1654,14 +1733,14 @@
              self.assertEqual(NS_PUBSUB, element.create.uri)
              self.assertEqual(u'random', element.create.getAttribute('node'))
@@ -1126 +1126 @@
          A default request should result in
          L{PubSubService.getDefaultConfiguration} being called.
-@@ -1641,7 +1741,7 @@
+@@ -1686,7 +1765,7 @@
                       "label": "Deliver payloads with event notifications"}
                  }
@@ -1135 +1135 @@
  
          def cb(element):
-@@ -1651,15 +1751,15 @@
+@@ -1696,15 +1775,15 @@
              form = data_form.Form.fromElement(element.default.x)
              self.assertEqual(NS_PUBSUB_CONFIG, form.formNamespace)
@@ -1155 +1155 @@
          Responses to default requests should depend on passed node type.
          """
-@@ -1690,19 +1790,19 @@
+@@ -1735,19 +1814,19 @@
                       "label": "Deliver payloads with event notifications"}
                  }
@@ -1181 +1181 @@
  
          xml = """
-@@ -1724,24 +1824,25 @@
+@@ -1769,24 +1848,25 @@
          </iq>
          """
@@ -1213 +1213 @@
  
          xml = """
-@@ -1766,7 +1867,7 @@
+@@ -1811,7 +1891,7 @@
                       "label": "Owner of the node"}
                  }
@@ -1222 +1222 @@
                                    'pubsub#persist_items': '1',
                                    'pubsub#owner': JID('user@example.org'),
-@@ -1800,19 +1901,18 @@
+@@ -1845,19 +1925,18 @@
  
              self.assertNotIn('x-myfield', fields)
@@ -1247 +1247 @@
  
          xml = """
-@@ -1842,21 +1942,21 @@
+@@ -1887,21 +1966,21 @@
                       "label": "Deliver payloads with event notifications"}
                  }
@@ -1276 +1276 @@
  
          xml = """
-@@ -1874,15 +1974,15 @@
+@@ -1919,15 +1998,15 @@
          </iq>
          """
@@ -1296 +1296 @@
          On a node configuration set request unknown fields should be ignored.
          """
-@@ -1914,17 +2014,17 @@
+@@ -1959,17 +2038,17 @@
                       "label": "Deliver payloads with event notifications"}
                  }
@@ -1319 +1319 @@
          On a node configuration set request unknown fields should be ignored.
          """
-@@ -1955,7 +2055,7 @@
+@@ -2000,7 +2079,7 @@
          return d
  
@@ -1328 +1328 @@
          On a items request, return all items for the given node.
          """
-@@ -1981,16 +2081,17 @@
+@@ -2026,16 +2105,17 @@
              self.assertEqual(NS_PUBSUB, item.uri)
              self.assertEqual('current', item['id'])
@@ -1350 +1350 @@
  
          xml = """
-@@ -2008,13 +2109,14 @@
+@@ -2053,13 +2133,14 @@
          def retract(request):
              return defer.succeed(None)
@@ -1368 +1368 @@
          """
  
-@@ -2030,13 +2132,14 @@
+@@ -2075,13 +2156,14 @@
          def purge(request):
              return defer.succeed(None)
@@ -1386 +1386 @@
          """
  
-@@ -2052,7 +2155,8 @@
+@@ -2097,7 +2179,8 @@
          def delete(request):
              return defer.succeed(None)
@@ -1396 +1396 @@
  
  
-@@ -2103,7 +2207,7 @@
+@@ -2148,7 +2231,7 @@
          self.assertEqual(redirectURI, message.event.delete.redirect['uri'])
  
@@ -1405 +1405 @@
          Getting subscription options is not supported.
          """
-@@ -2130,7 +2234,7 @@
+@@ -2175,7 +2258,7 @@
          return d
  
@@ -1414 +1414 @@
          Setting subscription options is not supported.
          """
-@@ -2157,7 +2261,7 @@
+@@ -2202,7 +2285,7 @@
          return d
  
@@ -1423 +1423 @@
          Getting subscription options is not supported.
          """
-@@ -2184,7 +2288,7 @@
+@@ -2229,7 +2312,7 @@
          return d
  
@@ -1432 +1432 @@
          Setting subscription options is not supported.
          """
-@@ -2211,18 +2315,38 @@
+@@ -2256,18 +2339,38 @@
          return d
  
@@ -1481 +1481 @@
  
          def cb(result):
-@@ -2231,7 +2355,7 @@
+@@ -2276,7 +2379,7 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('publish', result.appCondition['feature'])
@@ -1490 +1490 @@
          d.addCallback(cb)
          return d
-@@ -2239,16 +2363,7 @@
+@@ -2284,16 +2387,7 @@
  
      def test_subscribe(self):
@@ -1508 +1508 @@
  
          def cb(result):
-@@ -2257,7 +2372,7 @@
+@@ -2302,7 +2396,7 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('subscribe', result.appCondition['feature'])
@@ -1517 +1517 @@
          d.addCallback(cb)
          return d
-@@ -2265,16 +2380,7 @@
+@@ -2310,16 +2404,7 @@
  
      def test_unsubscribe(self):
@@ -1535 +1535 @@
  
          def cb(result):
-@@ -2283,7 +2389,7 @@
+@@ -2328,7 +2413,7 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('subscribe', result.appCondition['feature'])
@@ -1544 +1544 @@
          d.addCallback(cb)
          return d
-@@ -2291,16 +2397,7 @@
+@@ -2336,16 +2421,7 @@
  
      def test_subscriptions(self):
@@ -1562 +1562 @@
  
          def cb(result):
-@@ -2310,7 +2407,7 @@
+@@ -2355,7 +2431,7 @@
              self.assertEquals('retrieve-subscriptions',
                                result.appCondition['feature'])
@@ -1571 +1571 @@
          d.addCallback(cb)
          return d
-@@ -2318,16 +2415,7 @@
+@@ -2363,16 +2439,7 @@
  
      def test_affiliations(self):
@@ -1589 +1589 @@
  
          def cb(result):
-@@ -2337,7 +2425,7 @@
+@@ -2382,7 +2449,7 @@
              self.assertEquals('retrieve-affiliations',
                                result.appCondition['feature'])
@@ -1598 +1598 @@
          d.addCallback(cb)
          return d
-@@ -2345,16 +2433,7 @@
+@@ -2390,16 +2457,7 @@
  
      def test_create(self):
@@ -1616 +1616 @@
  
          def cb(result):
-@@ -2363,87 +2442,51 @@
+@@ -2408,87 +2466,51 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('create-nodes', result.appCondition['feature'])
@@ -1715 +1715 @@
  
          def cb(result):
-@@ -2452,7 +2495,7 @@
+@@ -2497,7 +2519,7 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('config-node', result.appCondition['feature'])
@@ -1724 +1724 @@
          d.addCallback(cb)
          return d
-@@ -2460,15 +2503,7 @@
+@@ -2505,15 +2527,7 @@
  
      def test_items(self):
@@ -1741 +1741 @@
  
          def cb(result):
-@@ -2477,7 +2512,7 @@
+@@ -2522,7 +2536,7 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('retrieve-items', result.appCondition['feature'])
@@ -1750 +1750 @@
          d.addCallback(cb)
          return d
-@@ -2485,18 +2520,7 @@
+@@ -2530,18 +2544,7 @@
  
      def test_retract(self):
@@ -1770 +1770 @@
  
          def cb(result):
-@@ -2505,7 +2529,7 @@
+@@ -2550,7 +2553,7 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('retract-items', result.appCondition['feature'])
@@ -1779 +1779 @@
          d.addCallback(cb)
          return d
-@@ -2513,15 +2537,7 @@
+@@ -2558,15 +2561,7 @@
  
      def test_purge(self):
@@ -1796 +1796 @@
  
          def cb(result):
-@@ -2530,7 +2546,7 @@
+@@ -2575,7 +2570,7 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('purge-nodes', result.appCondition['feature'])
@@ -1805 +1805 @@
          d.addCallback(cb)
          return d
-@@ -2538,15 +2554,7 @@
+@@ -2583,15 +2578,7 @@
  
      def test_delete(self):
@@ -1822 +1822 @@
  
          def cb(result):
-@@ -2555,7 +2563,7 @@
+@@ -2600,7 +2587,7 @@
              self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
              self.assertEquals('delete-nodes', result.appCondition['feature'])

release-0.5.patch

@@ -1 @@
-diff -r 64319a254f83 LICENSE
---- a/LICENSE   Wed Feb 04 14:42:34 2009 +0100
-+++ b/LICENSE   Wed Feb 04 15:30:11 2009 +0100
+diff -r a3563a451736 LICENSE
+--- a/LICENSE   Tue Apr 07 09:22:25 2009 +0200
++++ b/LICENSE   Tue Apr 07 09:24:47 2009 +0200
 @@ -1,4 +1,4 @@
 -Copyright (c) 2003-2008 Ralph Meijer
@@ -8 +8 @@
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
-diff -r 64319a254f83 NEWS
---- a/NEWS      Wed Feb 04 14:42:34 2009 +0100
-+++ b/NEWS      Wed Feb 04 15:30:11 2009 +0100
+diff -r a3563a451736 NEWS
+--- a/NEWS      Tue Apr 07 09:22:25 2009 +0200
++++ b/NEWS      Tue Apr 07 09:24:47 2009 +0200
 @@ -1,3 +1,37 @@
-+0.5.0 (2009-02-04)
++0.5.0 (2009-04-07)
 +==================
 +
@@ -36 +36 @@
 +-----
 +
-+ - Publish-Subscribe subscriptions requests work again (#22, Mike Malone).
++ - Publish-Subscribe subscriptions requests work again (#22).
 + - Publish-Subscribe delete node requests now have the correct namespace (#27).
 + - NodeIDs in Service Discovery requests are now returned in responses (#7).
@@ -49 +49 @@
  ==================
  
-diff -r 64319a254f83 README
---- a/README    Wed Feb 04 14:42:34 2009 +0100
-+++ b/README    Wed Feb 04 15:30:11 2009 +0100
+diff -r a3563a451736 README
+--- a/README    Tue Apr 07 09:22:25 2009 +0200
++++ b/README    Tue Apr 07 09:24:47 2009 +0200
 @@ -1,30 +1,53 @@
 -Wokkel 0.4.0
@@ -117 +117 @@
  Ralph Meijer
  <xmpp:ralphm@ik.nu>
-diff -r 64319a254f83 setup.py
---- a/setup.py  Wed Feb 04 14:42:34 2009 +0100
-+++ b/setup.py  Wed Feb 04 15:30:11 2009 +0100
+diff -r a3563a451736 setup.py
+--- a/setup.py  Tue Apr 07 09:22:25 2009 +0200
++++ b/setup.py  Tue Apr 07 09:24:47 2009 +0200
 @@ -1,12 +1,12 @@
  #!/usr/bin/env python

s2s.patch

@@ -1 @@
-diff -r c52801c0d6c2 wokkel/server.py
+diff -r 842c0a2f8fa1 wokkel/server.py
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/wokkel/server.py  Wed Apr 01 17:23:43 2009 +0200
-@@ -0,0 +1,566 @@
++++ b/wokkel/server.py  Tue Apr 07 09:17:35 2009 +0200
+@@ -0,0 +1,684 @@
 +# -*- test-case-name: wokkel.test.test_server -*-
 +#
@@ -225 +225 @@
 +
 +class XMPPServerConnectAuthenticator(xmlstream.ConnectAuthenticator):
++    """
++    Authenticator for an outgoing XMPP server-to-server connection.
++
++    This authenticator connects to C{otherHost} (the Receiving Server) and then
++    initiates dialback as C{thisHost} (the Originating Server) using
++    L{OriginatingDialbackInitializer}.
++
++    @ivar thisHost: The domain this server connects from (the Originating
++                    Server) .
++    @ivar otherHost: The domain of the server this server connects to (the
++                     Receiving Server).
++    @ivar secret: The shared secret that is used for verifying the validity
++                  of this new connection.
++    """
 +    namespace = 'jabber:server'
 +
@@ -250 +264 @@
 +
 +class XMPPServerVerifyAuthenticator(xmlstream.ConnectAuthenticator):
++    """
++    Authenticator for an outgoing connection to verify an incoming connection.
++
++    This authenticator connects to C{otherHost} (the Authoritative Server) and
++    then initiates dialback as C{thisHost} (the Receiving Server) using
++    L{ReceivingDialbackInitializer}.
++
++    @ivar thisHost: The domain this server connects from (the Receiving
++                    Server) .
++    @ivar otherHost: The domain of the server this server connects to (the
++                     Authoritative Server).
++    @ivar originalStreamID: The stream ID of the incoming connection that is
++                            being verified.
++    @ivar key: The key provided by the Receving Server to be verified.
++    """
 +    namespace = 'jabber:server'
 +
@@ -276 +305 @@
 +
 +class XMPPServerListenAuthenticator(xmlstream.ListenAuthenticator):
++    """
++    Authenticator for an incoming XMPP server-to-server connection.
++
++    This authenticator handles two types of incoming connections. Regular
++    server-to-server connections are from the Originating Server to the
++    Receiving Server, where this server is the Receiving Server. These
++    connections start out by receiving a dialback key, verifying the
++    key with the Authoritative Server, and then accept normal XMPP stanzas.
++
++    The other type of connections is from a Receiving Server to an
++    Authoritative Server, where this server acts as the Authoritative Server.
++    These connections are used to verify the validity of an outgoing connection
++    from this server. In this case, this server receives a verification
++    request, checks the key and then returns the result.
++
++    @ivar service: The service that keeps the list of domains we accept
++                   connections for.
++    """
 +    namespace = 'jabber:server'
-+    connectorClass = XMPPServerConnector
-+
-+    def __init__(self, domain, secret):
++
++    def __init__(self, service):
 +        xmlstream.ListenAuthenticator.__init__(self)
-+        self.domain = domain
-+        self.secret = secret
++        self.service = service
 +
 +
@@ -293 +338 @@
 +            self.xmlstream.sid = randbytes.secureRandom(8).encode('hex')
 +
-+        def prepareStream():
++        if self.xmlstream.thisEntity:
++            targetDomain = self.xmlstream.thisEntity.host
++        else:
++            targetDomain = self.service.defaultDomain
++
++        def prepareStream(domain):
 +            self.xmlstream.namespace = self.namespace
 +            self.xmlstream.prefixes = {xmlstream.NS_STREAMS: 'stream',
 +                                       NS_DIALBACK: 'db'}
-+            self.xmlstream.thisEntity = jid.internJID(self.domain)
++            self.xmlstream.thisEntity = jid.internJID(domain)
 +
 +        try:
@@ -305 +355 @@
 +                raise error.StreamError('invalid-namespace')
 +
-+            if self.xmlstream.thisEntity.full() != self.domain:
++            if targetDomain not in self.service.domains:
 +                raise error.StreamError('host-unknown')
 +        except error.StreamError, exc:
-+            prepareStream()
++            prepareStream(self.service.defaultDomain)
 +            self.xmlstream.sendStreamError(exc)
 +            return
@@ -318 +368 @@
 +                                   self.onResult)
 +
-+        prepareStream()
++        prepareStream(targetDomain)
 +        self.xmlstream.sendHeader()
 +
@@ -326 +376 @@
 +
 +
-+
 +    def onVerify(self, verify):
 +        try:
-+            receivingServer = jid.JID(verify['from'])
-+            originatingServer = jid.JID(verify['to'])
++            receivingServer = jid.JID(verify['from']).host
++            originatingServer = jid.JID(verify['to']).host
 +        except (KeyError, jid.InvalidFormat):
 +            raise error.StreamError('improper-addressing')
 +
-+        if originatingServer != self.domain:
++        if originatingServer not in self.service.domains:
 +            raise error.StreamError('host-unknown')
 +
-+        if receivingServer != self.xmlstream.thisEntity:
++        if (self.xmlstream.otherEntity and
++            receivingServer != self.xmlstream.otherEntity.host):
 +            raise error.StreamError('invalid-from')
 +
@@ -343 +393 @@
 +        key = unicode(verify)
 +
-+        calculatedKey = generateKey(self.secret, receivingServer,
++        calculatedKey = generateKey(self.service.secret, receivingServer,
 +                                    originatingServer, streamID)
 +        validity = (key == calculatedKey) and 'valid' or 'invalid'
@@ -356 +406 @@
 +
 +    def onResult(self, result):
-+        def connected(xs):
-+            self.verifyStream = xs
-+
-+            def logDataIn(buf):
-+                log.msg("RECV!: %r" % buf)
-+
-+            def logDataOut(buf):
-+                log.msg("SEND!: %r" % buf)
-+
-+            xs.rawDataInFn = logDataIn
-+            xs.rawDataOutFn = logDataOut
-+
 +        def reply(validity):
-+            factory.stopTrying()
-+            self.verifyStream.transport.loseConnection()
-+            self.verifyStream = None
-+
 +            reply = domish.Element((NS_DIALBACK, 'result'))
 +            reply['from'] = result['to']
@@ -386 +420 @@
 +
 +        def invalid(failure):
++            log.err(failure)
 +            reply('invalid')
 +
++        receivingServer = result['to']
 +        originatingServer = result['from']
-+
-+        authenticator = XMPPServerVerifyAuthenticator(self.domain,
-+                                                      originatingServer,
-+                                                      self.xmlstream.sid,
-+                                                      unicode(result))
-+        factory = xmlstream.XmlStreamFactory(authenticator)
-+        factory.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT, connected)
-+        factory.addBootstrap(xmlstream.STREAM_AUTHD_EVENT, valid)
-+        factory.addBootstrap(xmlstream.INIT_FAILED_EVENT, invalid)
-+        connector = self.connectorClass(reactor,
-+                                        originatingServer,
-+                                        factory)
-+        connector.connect()
++        key = unicode(result)
++
++        d = self.service.validateConnection(receivingServer, originatingServer,
++                                            self.xmlstream.sid, key)
++        d.addCallbacks(valid, invalid)
++        return d
 +
 +
@@ -414 +443 @@
 +    """
 +
-+    def __init__(self, domain, otherHost, secret):
-+        authenticator = XMPPServerConnectAuthenticator(domain,
-+                                                            otherHost,
-+                                                            secret)
++    def __init__(self, authenticator):
 +        DeferredXmlStreamFactory.__init__(self, authenticator)
++
++        self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
++                          self.onConnectionMade)
++
++        self.serial = 0
++
++
++    def onConnectionMade(self, xs):
++        xs.serial = self.serial
++        self.serial += 1
++
++        def logDataIn(buf):
++            log.msg("RECV (%d): %r" % (xs.serial, buf))
++
++        def logDataOut(buf):
++            log.msg("SEND (%d): %r" % (xs.serial, buf))
++
++        if self.logTraffic:
++            xs.rawDataInFn = logDataIn
++            xs.rawDataOutFn = logDataOut
 +
 +
@@ -430 +476 @@
 +
 +
-+class ServerService(service.Service):
++class XMPPS2SServerFactory(XmlStreamServerFactory):
++    """
++    XMPP Server-to-Server Server factory.
++
++    This factory accepts XMPP server-to-server connections.
++    """
++
++    logTraffic = False
++
++    def __init__(self, service):
++        self.service = service
++
++        def authenticatorFactory():
++            return XMPPServerListenAuthenticator(service)
++
++        XmlStreamServerFactory.__init__(self, authenticatorFactory)
++        self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
++                          self.onConnectionMade)
++        self.addBootstrap(xmlstream.STREAM_AUTHD_EVENT,
++                          self.onAuthenticated)
++
++        self.serial = 0
++
++
++    def onConnectionMade(self, xs):
++        """
++        Called when a server-to-server connection was made.
++
++        This enables traffic debugging on incoming streams.
++        """
++        xs.serial = self.serial
++        self.serial += 1
++
++        def logDataIn(buf):
++            log.msg("RECV (%d): %r" % (xs.serial, buf))
++
++        def logDataOut(buf):
++            log.msg("SEND (%d): %r" % (xs.serial, buf))
++
++        if self.logTraffic:
++            xs.rawDataInFn = logDataIn
++            xs.rawDataOutFn = logDataOut
++
++        xs.addObserver(xmlstream.STREAM_ERROR_EVENT, self.onError)
++
++
++    def onAuthenticated(self, xs):
++        thisHost = xs.thisEntity.host
++        otherHost = xs.otherEntity.host
++
++        log.msg("Incoming connection %d from %r to %r established" %
++                (xs.serial, otherHost, thisHost))
++
++        xs.addObserver(xmlstream.STREAM_END_EVENT, self.onConnectionLost,
++                                                   0, xs)
++        xs.addObserver('/*', self.onElement, 0, xs)
++
++
++    def onConnectionLost(self, xs, reason):
++        thisHost = xs.thisEntity.host
++        otherHost = xs.otherEntity.host
++
++        log.msg("Incoming connection %d from %r to %r disconnected" %
++                (xs.serial, otherHost, thisHost))
++
++
++    def onError(self, reason):
++        log.err(reason, "Stream Error")
++
++
++    def onElement(self, element, xs):
++        """
++        Called when an element was received from one of the connected streams.
++
++        """
++        if element.handled:
++            return
++
++        if jid.internJID(element["from"]).host != xs.otherEntity.host:
++            xs.sendStreamError(error.StreamError('invalid-from'))
++        else:
++            self.service.dispatch(element)
++
++
++
++class ServerService(object):
 +    """
 +    Service for managing XMPP server to server connections.
@@ -437 +568 @@
 +    logTraffic = False
 +
-+    def __init__(self, router, domain, port=5222):
++    def __init__(self, router, secret, domain):
 +        self.router = router
-+        self.domain = domain
-+        self.port = port
-+        self.secret = 'woei!'
-+
-+        def authenticatorFactory():
-+            return XMPPServerListenAuthenticator(self.domain, self.secret)
-+        self.factory = XmlStreamServerFactory(authenticatorFactory)
-+        self.factory.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
-+                                  self.makeConnection)
-+        self.factory.addBootstrap(xmlstream.STREAM_AUTHD_EVENT,
-+                                  self.incomingInitialized)
-+
-+        self.incomingStreams = {}
-+        self.outgoingStreams = {}
-+        self.outgoingQueues = {}
-+        self.outgoingConnecting = set()
++        self.secret = secret
++        self.defaultDomain = domain
++        self.domains = set([domain])
++
++        self._outgoingStreams = {}
++        self._outgoingQueues = {}
++        self._outgoingConnecting = set()
 +        self.serial = 0
 +
-+
-+    def startService(self):
 +        pipe = XmlPipe()
 +        self.xmlstream = pipe.source
@@ -464 +584 @@
 +        self.xmlstream.addObserver('/*', self.send)
 +
-+        service.Service.startService(self)
-+        reactor.listenTCP(self.port, self.factory)
-+
-+
-+    def makeConnection(self, xs):
-+        xs.serial = self.serial
-+        self.serial += 1
-+
-+        def logDataIn(buf):
-+            log.msg("RECV (%d): %r" % (xs.serial, buf))
-+
-+        def logDataOut(buf):
-+            log.msg("SEND (%d): %r" % (xs.serial, buf))
-+
-+        if self.logTraffic:
-+            xs.rawDataInFn = logDataIn
-+            xs.rawDataOutFn = logDataOut
-+
-+
-+    def incomingInitialized(self, xs):
-+        self.incomingStreams[xs.otherEntity.host] = xs
-+        xs.addObserver(xmlstream.STREAM_END_EVENT,
-+                       lambda _: self.incomingDisconnected(xs))
-+        xs.addObserver('/*', lambda element: self.onElement(element, xs))
-+
-+
-+    def incomingDisconnected(self, xs):
-+        del self.incomingStreams[xs.otherEntity.host]
-+
 +
 +    def outgoingInitialized(self, xs):
-+        self.outgoingStreams[xs.otherEntity.host] = xs
++        thisHost = xs.thisEntity.host
++        otherHost = xs.otherEntity.host
++
++        log.msg("Outgoing connection %d from %r to %r established" %
++                (xs.serial, thisHost, otherHost))
++
++        self._outgoingStreams[thisHost, otherHost] = xs
 +        xs.addObserver(xmlstream.STREAM_END_EVENT,
 +                       lambda _: self.outgoingDisconnected(xs))
 +
-+        if xs.otherEntity.host in self.outgoingQueues:
-+            print "Hier!"
-+            for element in self.outgoingQueues[xs.otherEntity.host]:
++        if (thisHost, otherHost) in self._outgoingQueues:
++            for element in self._outgoingQueues[thisHost, otherHost]:
 +                xs.send(element)
-+            del self.outgoingQueues[xs.otherEntity.host]
++            del self._outgoingQueues[thisHost, otherHost]
 +
 +
 +    def outgoingDisconnected(self, xs):
-+        del self.outgoingStreams[xs.otherEntity.host]
-+
-+
-+    def initiateOutgoingStream(self, otherHost):
-+        if otherHost in self.outgoingConnecting:
++        thisHost = xs.thisEntity.host
++        otherHost = xs.otherEntity.host
++
++        log.msg("Outgoing connection %d from %r to %r disconnected" %
++                (xs.serial, thisHost, otherHost))
++
++        del self._outgoingStreams[thisHost, otherHost]
++
++
++    def initiateOutgoingStream(self, thisHost, otherHost):
++        """
++        Initiate an outgoing XMPP server-to-server connection.
++        """
++
++        def resetConnecting(_):
++            self._outgoingConnecting.remove((thisHost, otherHost))
++
++        if (thisHost, otherHost) in self._outgoingConnecting:
 +            return
 +
-+        factory = DeferredS2SClientFactory(self.domain,
-+                                           otherHost,
-+                                           self.secret)
-+        factory.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
-+                             self.makeConnection)
++        authenticator = XMPPServerConnectAuthenticator(thisHost,
++                                                       otherHost,
++                                                       self.secret)
++        factory = DeferredS2SClientFactory(authenticator)
 +        factory.addBootstrap(xmlstream.STREAM_AUTHD_EVENT,
 +                             self.outgoingInitialized)
 +
-+        def resetConnecting(_):
-+            self.outgoingConnecting.remove(otherHost)
++        self._outgoingConnecting.add((thisHost, otherHost))
 +
 +        d = initiateS2S(factory)
-+        def debug(result):
-+            print result
-+            return result
-+        d.addBoth(debug)
 +        d.addBoth(resetConnecting)
-+        self.outgoingConnecting.add(otherHost)
-+
-+
-+    def onElement(self, element, xs):
-+        """
-+        Called when an element was received from one of the connected streams.
-+
-+        """
-+        if element.handled:
-+            return
-+
-+        if jid.internJID(element["from"]).host != xs.otherEntity.host:
-+            xs.sendStreamError(error.StreamError('invalid-from'))
-+        else:
-+            self.xmlstream.send(element)
++        return d
++
++
++    def validateConnection(self, thisHost, otherHost, sid, key):
++        """
++        Validate an incoming XMPP server-to-server connection.
++        """
++
++        def connected(xs):
++            # Set up stream for immediate disconnection.
++            def disconnect(_):
++                xs.transport.loseConnection()
++            xs.addObserver(xmlstream.STREAM_AUTHD_EVENT, disconnect)
++            xs.addObserver(xmlstream.INIT_FAILED_EVENT, disconnect)
++
++        authenticator = XMPPServerVerifyAuthenticator(thisHost, otherHost,
++                                                      sid, key)
++        factory = DeferredS2SClientFactory(authenticator)
++        factory.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT, connected)
++
++        d = initiateS2S(factory)
++        return d
 +
 +
@@ -556 +666 @@
 +        """
 +
-+        destination = jid.internJID(stanza["to"]).host
-+
-+        if destination not in self.outgoingStreams:
++        otherHost = jid.internJID(stanza["to"]).host
++        thisHost = jid.internJID(stanza["from"]).host
++
++        if (thisHost, otherHost) not in self._outgoingStreams:
 +            # There is no connection with the destination (yet). Cache the
 +            # outgoing stanza until the connection has been established.
 +            # XXX: If the connection cannot be established, the queue should
 +            #      be emptied at some point.
-+            if destination not in self.outgoingQueues:
-+                self.outgoingQueues[destination] = []
-+            self.outgoingQueues[destination].append(stanza)
-+            self.initiateOutgoingStream(destination)
++            if (thisHost, otherHost) not in self._outgoingQueues:
++                self._outgoingQueues[(thisHost, otherHost)] = []
++            self._outgoingQueues[(thisHost, otherHost)].append(stanza)
++            self.initiateOutgoingStream(thisHost, otherHost)
 +        else:
-+            self.outgoingStreams[destination].send(stanza)
-diff -r c52801c0d6c2 wokkel/test/test_server.py
++            self._outgoingStreams[(thisHost, otherHost)].send(stanza)
++
++
++    def dispatch(self, element):
++        """
++        Send on element to be routed within the server.
++        """
++        self.xmlstream.send(element)
+diff -r 842c0a2f8fa1 wokkel/test/test_server.py
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
-+++ b/wokkel/test/test_server.py        Wed Apr 01 17:23:43 2009 +0200
-@@ -0,0 +1,227 @@
++++ b/wokkel/test/test_server.py        Tue Apr 07 09:17:35 2009 +0200
+@@ -0,0 +1,412 @@
 +# Copyright (c) 2003-2008 Ralph Meijer
 +# See LICENSE for details.
@@ -580 +698 @@
 +"""
 +
++from twisted.internet import defer
++from twisted.python import failure
++from twisted.test.proto_helpers import StringTransport
 +from twisted.trial import unittest
-+from twisted.words.protocols.jabber import error, xmlstream
-+from twisted.test.proto_helpers import StringTransport
-+
-+from wokkel import server
++from twisted.words.protocols.jabber import error, jid, xmlstream
++from twisted.words.xish import domish
++
++from wokkel import component, server
 +
 +NS_STREAMS = 'http://etherx.jabber.org/streams'
-+DIALBACK_NS = "jabber:server:dialback"
++NS_DIALBACK = "jabber:server:dialback"
 +
 +class GenerateKeyTest(unittest.TestCase):
@@ -595 +716 @@
 +
 +    def testBasic(self):
++        originating = "example.org"
++        receiving = "xmpp.example.com"
++        sid = "D60000229F"
 +        secret = "s3cr3tf0rd14lb4ck"
-+        receiving = "example.net"
-+        originating = "example.com"
-+        id = "D60000229F"
-+
-+        key = server.generateKey(secret, receiving, originating, id)
++
++        key = server.generateKey(secret, receiving, originating, sid)
 +
 +        self.assertEqual(key,
-+            '008c689ff366b50c63d69a3e2d2c0e0e1f8404b0118eb688a0102c87cb691bdc')
++            '37c69b1cf07a3f67c04a5ef5902fa5114f2c76fe4a2686482ba5b89323075643')
 +
 +
@@ -612 +733 @@
 +    """
 +
-+    receiving = "example.org"
-+    originating = "example.net"
-+    id_ = "2093845023948"
-+    secret = "not-telling"
++    secret = "s3cr3tf0rd14lb4ck"
++    originating = "example.org"
++    receiving = "xmpp.example.com"
++    sid = "D60000229F"
++    key = '37c69b1cf07a3f67c04a5ef5902fa5114f2c76fe4a2686482ba5b89323075643'
 +
 +    def setUp(self):
 +        self.output = []
-+        self.authenticator = server.XMPPServerListenAuthenticator(
-+                        self.receiving, self.secret)
++
++        class MyService(object):
++            pass
++
++        self.service = MyService()
++        self.service.defaultDomain = self.receiving
++        self.service.domains = [self.receiving, 'pubsub.'+self.receiving]
++        self.service.secret = self.secret
++
++        self.authenticator = server.XMPPServerListenAuthenticator(self.service)
 +        self.xmlstream = xmlstream.XmlStream(self.authenticator)
 +        self.xmlstream.send = self.output.append
@@ -630 +760 @@
 +        Test attributes of authenticator and stream objects.
 +        """
-+        self.assertEquals(self.secret, self.authenticator.secret)
-+        self.assertEquals(self.receiving, self.authenticator.domain)
-+        self.assertEquals(self.xmlstream.initiating, False)
++        self.assertEqual(self.service, self.authenticator.service)
++        self.assertEqual(self.xmlstream.initiating, False)
 +
 +
@@ -644 +773 @@
 +                           "xmlns:db='jabber:server:dialback' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org'>")
++                           "to='xmpp.example.com'>")
 +        self.assertEqual((0, 0), self.xmlstream.version)
 +
@@ -657 +786 @@
 +                           "xmlns:db='jabber:server:dialback' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org' "
++                           "to='xmpp.example.com' "
 +                           "version='1.0'>")
 +        self.assertEqual((1, 0), self.xmlstream.version)
@@ -673 +802 @@
 +                           "xmlns:db='jabber:server:dialback' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org' "
++                           "to='xmpp.example.com' "
 +                           "version='1.0'>")
 +        self.assertNotIdentical(None, self.xmlstream.sid)
@@ -689 +818 @@
 +                           "xmlns:db='jabber:server:dialback' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org'>")
++                           "to='xmpp.example.com'>")
 +        self.assertTrue(self.xmlstream._headerSent)
 +
@@ -702 +831 @@
 +                           "xmlns:db='jabber:server:dialback' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org'>")
++                           "to='xmpp.example.com'>")
 +        self.assertEqual(1, len(self.output))
 +
@@ -715 +844 @@
 +                           "xmlns:db='jabber:server:dialback' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org' "
++                           "to='xmpp.example.com' "
 +                           "version='1.0'>")
 +        self.assertEqual(2, len(self.output))
@@ -732 +861 @@
 +                           "xmlns:db='jabber:server:dialback' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org'>")
-+
-+        self.assertEquals(3, len(self.output))
++                           "to='xmpp.example.com'>")
++
++        self.assertEqual(3, len(self.output))
 +        exc = error.exceptionFromStreamError(self.output[1])
-+        self.assertEquals('invalid-namespace', exc.condition)
++        self.assertEqual('invalid-namespace', exc.condition)
 +
 +
@@ -748 +877 @@
 +                           "xmlns:db='jabber:server:dialback' "
 +                           "xmlns='badns' "
-+                           "to='example.org'>")
-+
-+        self.assertEquals(3, len(self.output))
++                           "to='xmpp.example.com'>")
++
++        self.assertEqual(3, len(self.output))
 +        exc = error.exceptionFromStreamError(self.output[1])
-+        self.assertEquals('invalid-namespace', exc.condition)
++        self.assertEqual('invalid-namespace', exc.condition)
 +
 +
@@ -763 +892 @@
 +            "<stream:stream xmlns:stream='http://etherx.jabber.org/streams' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org'>")
-+
-+        self.assertEquals(3, len(self.output))
++                           "to='xmpp.example.com'>")
++
++        self.assertEqual(3, len(self.output))
 +        exc = error.exceptionFromStreamError(self.output[1])
-+        self.assertEquals('invalid-namespace', exc.condition)
++        self.assertEqual('invalid-namespace', exc.condition)
 +
 +
@@ -779 +908 @@
 +                           "xmlns:db='badns' "
 +                           "xmlns='jabber:server' "
-+                           "to='example.org'>")
-+
-+        self.assertEquals(3, len(self.output))
++                           "to='xmpp.example.com'>")
++
++        self.assertEqual(3, len(self.output))
 +        exc = error.exceptionFromStreamError(self.output[1])
-+        self.assertEquals('invalid-namespace', exc.condition)
++        self.assertEqual('invalid-namespace', exc.condition)
 +
 +
@@ -797 +926 @@
 +                           "to='badhost'>")
 +
-+        self.assertEquals(3, len(self.output))
++        self.assertEqual(3, len(self.output))
 +        exc = error.exceptionFromStreamError(self.output[1])
-+        self.assertEquals('host-unknown', exc.condition)
++        self.assertEqual('host-unknown', exc.condition)
++
++
++    def test_streamToOtherLocalHost(self):
++        """
++        The authenticator supports XMPP 1.0 streams.
++        """
++        self.xmlstream.connectionMade()
++        self.xmlstream.dataReceived(
++            "<stream:stream xmlns:stream='http://etherx.jabber.org/streams' "
++                           "xmlns:db='jabber:server:dialback' "
++                           "xmlns='jabber:server' "
++                           "to='pubsub.xmpp.example.com' "
++                           "version='1.0'>")
++
++        self.assertEqual(2, len(self.output))
++        self.assertEqual(jid.JID('pubsub.xmpp.example.com'),
++                         self.xmlstream.thisEntity)
++
++    def test_onResult(self):
++        def cb(result):
++            self.assertEqual(1, len(self.output))
++            reply = self.output[0]
++            self.assertEqual(self.originating, reply['to'])
++            self.assertEqual(self.receiving, reply['from'])
++            self.assertEqual('valid', reply['type'])
++
++        def validateConnection(thisHost, otherHost, sid, key):
++            self.assertEqual(thisHost, self.receiving)
++            self.assertEqual(otherHost, self.originating)
++            self.assertEqual(sid, self.sid)
++            self.assertEqual(key, self.key)
++            return defer.succeed(None)
++
++        self.xmlstream.sid = self.sid
++        self.service.validateConnection = validateConnection
++
++        result = domish.Element((NS_DIALBACK, 'result'))
++        result['to'] = self.receiving
++        result['from'] = self.originating
++        result.addContent(self.key)
++
++        d = self.authenticator.onResult(result)
++        d.addCallback(cb)
++        return d
++
++
++    def test_onResultFailure(self):
++        class TestError(Exception):
++            pass
++
++        def cb(result):
++            reply = self.output[0]
++            self.assertEqual('invalid', reply['type'])
++            self.assertEqual(1, len(self.flushLoggedErrors(TestError)))
++
++
++        def validateConnection(thisHost, otherHost, sid, key):
++            return defer.fail(TestError())
++
++        self.xmlstream.sid = self.sid
++        self.service.validateConnection = validateConnection
++
++        result = domish.Element((NS_DIALBACK, 'result'))
++        result['to'] = self.receiving
++        result['from'] = self.originating
++        result.addContent(self.key)
++
++        d = self.authenticator.onResult(result)
++        d.addCallback(cb)
++        return d
++
++
++
++class FakeService(object):
++    domains = set(['example.org', 'pubsub.example.org'])
++    defaultDomain = 'example.org'
++    secret = 'mysecret'
++
++    def __init__(self):
++        self.dispatched = []
++
++    def dispatch(self, element):
++        self.dispatch.append(element)
++
++
++
++class XMPPS2SServerFactoryTest(unittest.TestCase):
++    """
++    Tests for L{component.XMPPS2SServerFactory}.
++    """
++
++    def setUp(self):
++        self.service = FakeService
++        self.factory = server.XMPPS2SServerFactory(self.service)
++        self.xmlstream = self.factory.buildProtocol(None)
++        self.xmlstream.thisEntity = jid.JID('example.org')
++        self.xmlstream.otherEntity = jid.JID('example.com')
++
++
++    def test_makeConnection(self):
++        """
++        A new connection increases the stream serial count. No logs by default.
++        """
++        self.xmlstream.dispatch(self.xmlstream,
++                                xmlstream.STREAM_CONNECTED_EVENT)
++        self.assertEqual(0, self.xmlstream.serial)
++        self.assertEqual(1, self.factory.serial)
++        self.assertIdentical(None, self.xmlstream.rawDataInFn)
++        self.assertIdentical(None, self.xmlstream.rawDataOutFn)
++
++
++    def test_makeConnectionLogTraffic(self):
++        """
++        Setting logTraffic should set up raw data loggers.
++        """
++        self.factory.logTraffic = True
++        self.xmlstream.dispatch(self.xmlstream,
++                                xmlstream.STREAM_CONNECTED_EVENT)
++        self.assertNotIdentical(None, self.xmlstream.rawDataInFn)
++        self.assertNotIdentical(None, self.xmlstream.rawDataOutFn)
++
++
++    def test_onError(self):
++        """
++        An observer for stream errors should trigger onError to log it.
++        """
++        self.xmlstream.dispatch(self.xmlstream,
++                                xmlstream.STREAM_CONNECTED_EVENT)
++
++        class TestError(Exception):
++            pass
++
++        reason = failure.Failure(TestError())
++        self.xmlstream.dispatch(reason, xmlstream.STREAM_ERROR_EVENT)
++        self.assertEqual(1, len(self.flushLoggedErrors(TestError)))
++
++
++    def test_connectionInitialized(self):
++        """
++        """
++        self.xmlstream.dispatch(self.xmlstream,
++                                xmlstream.STREAM_CONNECTED_EVENT)
++        self.xmlstream.dispatch(self.xmlstream, xmlstream.STREAM_AUTHD_EVENT)
++
++
++    def test_connectionLost(self):
++        """
++        """
++        self.xmlstream.dispatch(self.xmlstream,
++                                xmlstream.STREAM_CONNECTED_EVENT)
++        self.xmlstream.dispatch(self.xmlstream, xmlstream.STREAM_AUTHD_EVENT)
++        self.xmlstream.dispatch(None, xmlstream.STREAM_END_EVENT)
++
++
++    def test_ElementNotAuthenticated(self):
++        self.xmlstream.dispatch(self.xmlstream,
++                                xmlstream.STREAM_CONNECTED_EVENT)
++        self.xmlstream.dataReceived("<presence/>")
++
++
++class ServerServiceTest(unittest.TestCase):
++
++    def setUp(self):
++        self.router = component.Router()
++        self.service = server.ServerService(self.router,
++                                            secret='mysecret',
++                                            domain='example.org')
++
++
++    def test_defaultDomainInDomains(self):
++        """
++        The default domain is part of the domains considered local.
++        """
++        self.assertIn(self.service.defaultDomain, self.service.domains)

series

@@ +1 @@
+pubsub-disco-info-42.patch
+compat-pre-twisted-8.0.0.patch
+release-0.5.patch
 component_multiple.patch
 deferred_xmlstream_factory.patch
@@ -6 +9 @@
 pubsub_client_sender.patch
 pubsub_resource.patch
-compat-pre-twisted-8.0.0.patch
-release-0.5.patch