Index: /trunk/packages/sipb-xen-database/debian/changelog
===================================================================
--- /trunk/packages/sipb-xen-database/debian/changelog	(revision 990)
+++ /trunk/packages/sipb-xen-database/debian/changelog	(revision 991)
@@ -3,4 +3,5 @@
   * add remote and console to pg_hba.conf template
   * fix init script so it works
+  * port more code to sqlalchemy 0.4
 
  -- Greg Price <price@mit.edu>  Wed, 01 Oct 2008 19:30:26 -0400
Index: /trunk/packages/sipb-xen-database/python/database/__init__.py
===================================================================
--- /trunk/packages/sipb-xen-database/python/database/__init__.py	(revision 990)
+++ /trunk/packages/sipb-xen-database/python/database/__init__.py	(revision 991)
@@ -5,3 +5,5 @@
 def connect(uri = config.db.uri):
     """ Connect to a given database URI"""
-    meta.bind = sqlalchemy.create_engine(uri)
+    engine = sqlalchemy.create_engine(uri)
+    meta.bind = engine
+    session.configure(bind=engine)
Index: /trunk/packages/sipb-xen-database/python/database/models.py
===================================================================
--- /trunk/packages/sipb-xen-database/python/database/models.py	(revision 990)
+++ /trunk/packages/sipb-xen-database/python/database/models.py	(revision 991)
@@ -1,3 +1,4 @@
 from sqlalchemy import *
+from sqlalchemy import orm
 from sqlalchemy.orm import create_session, relation
 
@@ -6,5 +7,5 @@
 
 __all__ = ['meta',
-           'ctx',
+           'session',
            'clear_cache',
            'machine_table',
@@ -26,5 +27,5 @@
 
 meta = ThreadLocalMetaData()
-ctx = SessionContext(create_session)
+session = orm.scoped_session(orm.sessionmaker())
 
 machine_table = Table('machines', meta,
@@ -106,15 +107,15 @@
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
-assign_mapper(ctx, Machine, machine_table,
+session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine", lazy=False),
                           'disks': relation(Disk, backref="machine", lazy=False),
                           'type': relation(Type, lazy=False),
                           'acl': relation(MachineAccess, backref="machine", lazy=False, passive_deletes=True, cascade="all, delete-orphan")});
-assign_mapper(ctx, MachineAccess, machine_access_table)
-assign_mapper(ctx, NIC, nic_table)
-assign_mapper(ctx, Disk, disk_table)
-assign_mapper(ctx, Type, types_table)
-assign_mapper(ctx, CDROM, cdroms_table)
-assign_mapper(ctx, Autoinstall, autoinstalls_table)
+session.mapper(MachineAccess, machine_access_table)
+session.mapper(NIC, nic_table)
+session.mapper(Disk, disk_table)
+session.mapper(Type, types_table)
+session.mapper(CDROM, cdroms_table)
+session.mapper(Autoinstall, autoinstalls_table)
 
 def clear_cache():
@@ -124,3 +125,4 @@
     it.  Why is this so obscure?"""
 
-    ctx.registry.clear()
+    # XXX maybe we still need to do this, but it's not doc'd how.
+    #ctx.registry.clear()
Index: /trunk/packages/sipb-xen-remote-server/debian/changelog
===================================================================
--- /trunk/packages/sipb-xen-remote-server/debian/changelog	(revision 990)
+++ /trunk/packages/sipb-xen-remote-server/debian/changelog	(revision 991)
@@ -1,5 +1,8 @@
 sipb-xen-remote-server (0.9) unstable; urgency=low
 
+  [Evan Broder]
   * Make the acl/ subdir of RemConfFS listable
+  
+  [Greg Price]
   * Update RemConfFS for new SQLAlchemy code