[z3-checkins] r36874 - in z3/deliverance/DeliveranceVHoster/trunk: . ddemo dvhoster

[ianb at codespeak.net]

Author: ianb
Date: Wed Jan 17 15:53:55 2007
New Revision: 36874

Added:
   z3/deliverance/DeliveranceVHoster/trunk/dvhoster/
      - copied from r36859, z3/deliverance/DeliveranceVHoster/trunk/ddemo/
Removed:
   z3/deliverance/DeliveranceVHoster/trunk/ddemo/
Modified:
   z3/deliverance/DeliveranceVHoster/trunk/README.txt
   z3/deliverance/DeliveranceVHoster/trunk/development.ini
   z3/deliverance/DeliveranceVHoster/trunk/setup.cfg
   z3/deliverance/DeliveranceVHoster/trunk/setup.py
Log:
continuing renaming

Modified: z3/deliverance/DeliveranceVHoster/trunk/README.txt
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/README.txt	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/README.txt	Wed Jan 17 15:53:55 2007
@@ -1,16 +1,16 @@
-This file is for you to describe the DeliveranceDemo application. Typically
+This file is for you to describe the DeliveranceVHoster application. Typically
 you would include information such as the information below:
 
 Installation and Setup
 ======================
 
-Install ``DeliveranceDemo`` using easy_install::
+Install ``DeliveranceVHoster`` using easy_install::
 
-    easy_install DeliveranceDemo
+    easy_install DeliveranceVHoster
 
 Make a config file as follows::
 
-    paster make-config DeliveranceDemo config.ini
+    paster make-config DeliveranceVHoster config.ini
     
 Tweak the config file as appropriate and then setup the application::
 

Modified: z3/deliverance/DeliveranceVHoster/trunk/development.ini
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/development.ini	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/development.ini	Wed Jan 17 15:53:55 2007
@@ -5,7 +5,7 @@
 #
 [DEFAULT]
 debug = true
-email_to = you at yourdomain.com
+email_to = ianb at openplans.org
 smtp_server = localhost
 error_email_from = paste at localhost
 
@@ -15,32 +15,14 @@
 port = 5000
 
 [app:main]
-use = egg:DeliveranceDemo
-full_stack = True
-cache_dir = %(here)s/cache_data
+use = egg:DeliveranceVHoster
 data_dir = %(here)s/data
-session_key = ddemo
-session_secret = somesecret
 debug_headers = true
 # To view bodies:
 #debug_bodies = true
 # To disable the rewriting of links:
 #rewrite_links = false
 
-
-# If you'd like to fine-tune the individual locations of the cache data dirs
-# for Myghty, the Cache data, or the Session saves, un-comment the desired
-# settings here:
-#myghty_data_dir = %(here)s/data/templates
-#cache_data_dir = %(here)s/data/cache
-#session_data_dir = %(here)s/data/sessions
-
-# Specify the database for SQLObject to use via pylons.database.PackageHub.
-# %(here) may include a ':' character on Windows environments; this can
-# invalidate the URI when specifying a SQLite db via path name. Refer to the
-# SQLObject documentation for a special syntax to preserve the URI.
-#sqlobject.dburi = sqlite:%(here)s/somedb.db
-
 # WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*
 # Debug mode will enable the interactive debugging tool, allowing ANYONE to
 # execute malicious code after an exception is raised.

Modified: z3/deliverance/DeliveranceVHoster/trunk/setup.cfg
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/setup.cfg	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/setup.cfg	Wed Jan 17 15:53:55 2007
@@ -9,20 +9,17 @@
 theme = pythonpaste.org
 
 # Add extra doc files here with spaces between them
-docs = ddemo/docs/index.txt 
+docs = docs/index.txt 
 
 # Doc Settings
-doc_base = ddemo/docs/
-dest = ddemo/docs/html
+doc_base = docs/
+dest = docs/html
 
 # Add extra modules here separated with commas
 modules = ddemo
 title = Ddemo
 organization = Pylons
 
-# Optionally add extra links
-#organization_url = http://pylons.groovie.org/
-#trac_url=http://pylons.groovie.org/
 settings = no_about=true
 
 # Optionally add extra settings 
@@ -30,5 +27,5 @@
 #           link2=/download/ Download
  
 [publish]
-doc-dir=ddemo/docs/html
+doc-dir=docs/html
 make-dirs=1

Modified: z3/deliverance/DeliveranceVHoster/trunk/setup.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/setup.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/setup.py	Wed Jan 17 15:53:55 2007
@@ -1,14 +1,14 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='DeliveranceDemo',
+    name='DeliveranceVHoster',
     version="0.1",
-    description="A demo setup of Deliverance, self-configuring",
+    description="A virtual-hosting proxy for Deliverance",
     #author="",
     #author_email="",
     #url="",
     install_requires=[
-      'Paste==dev,>1.0', # There's a bug fix we need
+      'Paste==dev,>1.1.1', # There's a bug fix we need
       "Pylons>=0.9.3",
       'Deliverance',
       'WSGIFilter',
@@ -17,7 +17,6 @@
     packages=find_packages(),
     include_package_data=True,
     test_suite = 'nose.collector',
-    package_data={'ddemo': ['i18n/*/LC_MESSAGES/*.mo']},
     entry_points="""
     [paste.app_factory]
     main=ddemo:make_app