[xiph-commits] r3262 - in arkaiv/trunk: . arkaiv arkaiv/config
arkaiv/controllers arkaiv/lib arkaiv/model data/templates
dcrowdy at svn.annodex.net
dcrowdy at svn.annodex.net
Mon Oct 29 00:58:10 PDT 2007
Author: dcrowdy
Date: 2007-10-29 00:58:10 -0700 (Mon, 29 Oct 2007)
New Revision: 3262
Removed:
arkaiv/trunk/arkaiv/config/.middleware.py.swp
Modified:
arkaiv/trunk/README.txt
arkaiv/trunk/arkaiv/__init__.pyc
arkaiv/trunk/arkaiv/config/__init__.pyc
arkaiv/trunk/arkaiv/config/environment.pyc
arkaiv/trunk/arkaiv/config/middleware.py
arkaiv/trunk/arkaiv/config/middleware.pyc
arkaiv/trunk/arkaiv/config/routing.pyc
arkaiv/trunk/arkaiv/controllers/__init__.pyc
arkaiv/trunk/arkaiv/controllers/error.pyc
arkaiv/trunk/arkaiv/controllers/page.py
arkaiv/trunk/arkaiv/controllers/page.pyc
arkaiv/trunk/arkaiv/lib/__init__.pyc
arkaiv/trunk/arkaiv/lib/app_globals.pyc
arkaiv/trunk/arkaiv/lib/base.pyc
arkaiv/trunk/arkaiv/lib/helpers.pyc
arkaiv/trunk/arkaiv/model/__init__.pyc
arkaiv/trunk/arkaiv/model/cmmlparser.pyc
arkaiv/trunk/arkaiv/model/oggzinfo.pyc
arkaiv/trunk/arkaiv/websetup.pyc
arkaiv/trunk/data/templates/addannodexform.mak.py
arkaiv/trunk/data/templates/addannodexform.mak.pyc
arkaiv/trunk/data/templates/autohandler.py
arkaiv/trunk/data/templates/autohandler.pyc
arkaiv/trunk/data/templates/collections.mak.py
arkaiv/trunk/data/templates/collections.mak.pyc
arkaiv/trunk/data/templates/displayitem.mak.py
arkaiv/trunk/data/templates/displayitem.mak.pyc
arkaiv/trunk/data/templates/mainpage.mak.py
arkaiv/trunk/data/templates/mainpage.mak.pyc
arkaiv/trunk/development.ini
Log:
Updated authentication for AuthKit 0.4
Modified: arkaiv/trunk/README.txt
===================================================================
--- arkaiv/trunk/README.txt 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/README.txt 2007-10-29 07:58:10 UTC (rev 3262)
@@ -15,9 +15,9 @@
Recent annodex libraries - including python-annodex and mod_annodex for apache
- see http://www.annodex.net
-Pylons 0.9.6
-AuthKit 0.3.0pre5
-SQLAlchemy 0.3.10
+Pylons 0.9.6.1
+AuthKit 0.4
+SQLAlchemy 0.4
All things pylons can be found at: http://pylonshq.com/ and info about
@@ -27,15 +27,11 @@
The best way to install these is using the easy_install script. Note that I
haven't tested the app with later versions of these.
-NOTE: This application currently works with SQLAlchemy 0.3. 0.4 is slated to
-be released soon, but has some significant changes to it. I doubt this
-application will work at all with 0.4, but I will upgrade it eventually.
+INSTALLATION OF ARKAIV
-INSTALLATION
+Only tested under linux (Ubuntu Feisty and Gutsy) so far.
-Only tested under linux so far.
-
Unpack the tarball, enter the directory, and edit production.ini to suit your
environment. At the moment the media files are kept in /var/www/arkaiv, so
you'll need to make sure that directory exists, and that you have write
Modified: arkaiv/trunk/arkaiv/__init__.pyc
===================================================================
(Binary files differ)
Deleted: arkaiv/trunk/arkaiv/config/.middleware.py.swp
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/config/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/config/environment.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/config/middleware.py
===================================================================
--- arkaiv/trunk/arkaiv/config/middleware.py 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/arkaiv/config/middleware.py 2007-10-29 07:58:10 UTC (rev 3262)
@@ -37,7 +37,8 @@
# CUSTOM MIDDLEWARE HERE (filtered by the error handling middlewares)
import authkit.authenticate
- app = authkit.authenticate.middleware(app, config_paste=app_conf)
+ #app = authkit.authenticate.middleware(app, config_paste=app_conf)
+ app = authkit.authenticate.middleware(app, app_conf)
if asbool(full_stack):
# Handle Python exceptions
Modified: arkaiv/trunk/arkaiv/config/middleware.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/config/routing.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/controllers/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/controllers/error.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/controllers/page.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/page.py 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/arkaiv/controllers/page.py 2007-10-29 07:58:10 UTC (rev 3262)
@@ -13,7 +13,7 @@
import os
import os.path
import shutil
-import annodex
+#import annodex
import logging
import subprocess
import sys
Modified: arkaiv/trunk/arkaiv/controllers/page.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/lib/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/lib/app_globals.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/lib/base.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/lib/helpers.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/model/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/model/cmmlparser.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/model/oggzinfo.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/websetup.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/addannodexform.mak.py
===================================================================
--- arkaiv/trunk/data/templates/addannodexform.mak.py 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/data/templates/addannodexform.mak.py 2007-10-29 07:58:10 UTC (rev 3262)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189555063.3636899
-_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/addannodexform.mak'
+_modified_time = 1193643813.2921801
+_template_filename='/home/dcrowdy/src/arkaiv/arkaiv/trunk/arkaiv/templates/addannodexform.mak'
_template_uri='/addannodexform.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/addannodexform.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/autohandler.py
===================================================================
--- arkaiv/trunk/data/templates/autohandler.py 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/data/templates/autohandler.py 2007-10-29 07:58:10 UTC (rev 3262)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189635019.326093
-_template_filename=u'/home/dcrowdy/src/working/trunk/arkaiv/templates/autohandler'
+_modified_time = 1193360629.749054
+_template_filename=u'/home/dcrowdy/src/arkaiv/arkaiv/trunk/arkaiv/templates/autohandler'
_template_uri=u'/autohandler'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/autohandler.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/collections.mak.py
===================================================================
--- arkaiv/trunk/data/templates/collections.mak.py 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/data/templates/collections.mak.py 2007-10-29 07:58:10 UTC (rev 3262)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189555169.8412819
-_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/collections.mak'
+_modified_time = 1193643831.5929699
+_template_filename='/home/dcrowdy/src/arkaiv/arkaiv/trunk/arkaiv/templates/collections.mak'
_template_uri='/collections.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/collections.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/displayitem.mak.py
===================================================================
--- arkaiv/trunk/data/templates/displayitem.mak.py 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/data/templates/displayitem.mak.py 2007-10-29 07:58:10 UTC (rev 3262)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189582730.0332439
-_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/displayitem.mak'
+_modified_time = 1193643913.4088931
+_template_filename='/home/dcrowdy/src/arkaiv/arkaiv/trunk/arkaiv/templates/displayitem.mak'
_template_uri='/displayitem.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/displayitem.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/mainpage.mak.py
===================================================================
--- arkaiv/trunk/data/templates/mainpage.mak.py 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/data/templates/mainpage.mak.py 2007-10-29 07:58:10 UTC (rev 3262)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189553891.345228
-_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/mainpage.mak'
+_modified_time = 1193360629.6704099
+_template_filename='/home/dcrowdy/src/arkaiv/arkaiv/trunk/arkaiv/templates/mainpage.mak'
_template_uri='/mainpage.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/mainpage.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/development.ini
===================================================================
--- arkaiv/trunk/development.ini 2007-10-29 04:38:36 UTC (rev 3261)
+++ arkaiv/trunk/development.ini 2007-10-29 07:58:10 UTC (rev 3262)
@@ -24,10 +24,14 @@
beaker.session.secret = somesecret
sqlalchemy.url = sqlite:///arkaiv.db
sqlalchemy.echo = true
-authkit.enable = true
-authkit.method = digest
-authkit.users.setup = user:pylons
+#authkit.enable = true
+#authkit.setup.method = digest
+#authkit.method = digest
+#authkit.users.setup = user:pylons
+authkit.setup.method = form, cookie
+authkit.form.authenticate.user.data = visitor:open_sesame
+authkit.cookie.secret = secret string
# If you'd like to fine-tune the individual locations of the cache data dirs
# for the Cache data, or the Session saves, un-comment the desired settings
More information about the commits
mailing list