Merge lp:~madjar/wikkid/plugin into lp:wikkid

[Georges Dubus]

Updated the plugin, so that it works again after the transition from twisted to webbob.

[Tim Penhey (thumper)]

On Thu, 24 Jun 2010 06:39:53 you wrote:
> Georges Dubus has proposed merging lp:~madjar/wikkid/plugin into lp:wikkid.
>
> Requested reviews:
> Wikkid Hackers (wikkid)
>
>
> Updated the plugin, so that it works again after the transition from
> twisted to webbob.

Ah, thanks. That completely slipped my mind. Is there any way we could add a
test for this?

=== modified file 'plugin/commands.py'
--- plugin/commands.py	2010-05-21 09:16:54 +0000
+++ plugin/commands.py	2010-06-23 18:39:52 +0000
@@ -6,10 +6,9 @@
 
 from bzrlib.workingtree import WorkingTree
 
+from wikkid.app import WikkidApp
 from wikkid.filestore.bzr import FileStore
-from wikkid.model.factory import ResourceFactory
-from wikkid.twistedserver import TwistedServer
-from wikkid.user.bzr import UserFactory
+from wikkid.user.bzr import LocalBazaarUserMiddleware
 
 DEFAULT_PORT = 8080
 
@@ -42,8 +41,13 @@
         working_tree = WorkingTree.open(branch)
         logger.info('Using: %s', working_tree)
         filestore = FileStore(working_tree)
-        server = TwistedServer(
-            ResourceFactory(filestore),
-            UserFactory(working_tree.branch),
-            port=port)
-        server.run()
+
+        app = WikkidApp(filestore)
+        app = LocalBazaarUserMiddleware(app, working_tree.branch)
+        from wsgiref.simple_server import make_server
+        httpd = make_server('localhost', port, app)
+        logger.info('Serving on http://localhost:%s', port)
+        try:
+            httpd.serve_forever()
+        except KeyboardInterrupt:
+            logger.info('Done.')