Author: jhammel
Date: 2007-07-31 15:22:46 -0400 (Tue, 31 Jul 2007)
New Revision: 7895

Added:
   build/topp.build.tasktracker/trunk/topp/build/tasktracker/universal.ini
   build/topp.build.tasktracker/trunk/topp/build/tasktracker/uri.ini
Removed:
   build/topp.build.tasktracker/trunk/topp/build/tasktracker/openplans.ini
Modified:
   build/topp.build.tasktracker/trunk/topp/build/tasktracker/__init__.py
   build/topp.build.tasktracker/trunk/topp/build/tasktracker/build.ini
   
build/topp.build.tasktracker/trunk/topp/build/tasktracker/skel/development.ini
Log:
encapsulation of stack variables in "universal" namespace

Modified: build/topp.build.tasktracker/trunk/topp/build/tasktracker/__init__.py
===================================================================
--- build/topp.build.tasktracker/trunk/topp/build/tasktracker/__init__.py       
2007-07-31 19:22:15 UTC (rev 7894)
+++ build/topp.build.tasktracker/trunk/topp/build/tasktracker/__init__.py       
2007-07-31 19:22:46 UTC (rev 7895)
@@ -19,9 +19,6 @@
 
     builder.add_password(help='MySQL database password')
 
-    # XXX hack around buildit limitations
-    builder.set_variable('openplans_uri', '${openplans/openplans_uri}')
-
     # add build tasks
     builder += copyskeleton()
 

Modified: build/topp.build.tasktracker/trunk/topp/build/tasktracker/build.ini
===================================================================
--- build/topp.build.tasktracker/trunk/topp/build/tasktracker/build.ini 
2007-07-31 19:22:15 UTC (rev 7894)
+++ build/topp.build.tasktracker/trunk/topp/build/tasktracker/build.ini 
2007-07-31 19:22:46 UTC (rev 7895)
@@ -3,17 +3,14 @@
 app = tasktracker
 tasktracker_port = 5050
 
+# SQL
 dbuser = tasktracker
 database = tasktracker
 
-zope_port = 8080
-
 # filesystem location of protected data
 secret = /var/lib/secret.txt
 admin_filename = /var/lib/adminpw.txt
 
-login_uri = http://www.openplans.org/login_form
-profile_uri = http://www.openplans.org/people/%s/profile
-
 [namespaces]
-openplans = ${buildoutdir}/openplans.ini [openplans]
+universal = ${buildoutdir}/universal.ini [universal]
+uri = ${buildoutdir}/uri.ini [uri]

Deleted: build/topp.build.tasktracker/trunk/topp/build/tasktracker/openplans.ini
===================================================================
--- build/topp.build.tasktracker/trunk/topp/build/tasktracker/openplans.ini     
2007-07-31 19:22:15 UTC (rev 7894)
+++ build/topp.build.tasktracker/trunk/topp/build/tasktracker/openplans.ini     
2007-07-31 19:22:46 UTC (rev 7895)
@@ -1,2 +0,0 @@
-[openplans]
-openplans_uri = http://localhost:${zope_port}/openplans/
\ No newline at end of file

Modified: 
build/topp.build.tasktracker/trunk/topp/build/tasktracker/skel/development.ini
===================================================================
--- 
build/topp.build.tasktracker/trunk/topp/build/tasktracker/skel/development.ini  
    2007-07-31 19:22:15 UTC (rev 7894)
+++ 
build/topp.build.tasktracker/trunk/topp/build/tasktracker/skel/development.ini  
    2007-07-31 19:22:46 UTC (rev 7895)
@@ -43,9 +43,9 @@
 set debug = false
 
 openplans_wrapper = CookieAuth
-openplans_instance = <<openplans_uri>>
-login_uri = <<login_uri>>
-profile_uri == <<profile_uri>>
+openplans_instance = <<universal/zope_uri>>
+login_uri = <<uri/login_uri>>
+profile_uri = <<uri/profile_uri>>
 
 translate_environ topp.project_name = HTTP_X_OPENPLANS_PROJECT
 translate_environ SCRIPT_NAME = HTTP_X_SCRIPT_NAME

Added: build/topp.build.tasktracker/trunk/topp/build/tasktracker/universal.ini
===================================================================
--- build/topp.build.tasktracker/trunk/topp/build/tasktracker/universal.ini     
                        (rev 0)
+++ build/topp.build.tasktracker/trunk/topp/build/tasktracker/universal.ini     
2007-07-31 19:22:46 UTC (rev 7895)
@@ -0,0 +1,2 @@
+[universal]
+zope_uri = http://localhost:8080/openplans
\ No newline at end of file

Added: build/topp.build.tasktracker/trunk/topp/build/tasktracker/uri.ini
===================================================================
--- build/topp.build.tasktracker/trunk/topp/build/tasktracker/uri.ini           
                (rev 0)
+++ build/topp.build.tasktracker/trunk/topp/build/tasktracker/uri.ini   
2007-07-31 19:22:46 UTC (rev 7895)
@@ -0,0 +1,3 @@
+[uri]
+login_uri = ${universal/zope_uri}/login_form
+profile_uri = ${universal/zope_uri}/people/%s/profile



--
Archive: 
http://www.openplans.org/projects/opencore/lists/openplans-svn/archive/2007/07/1185909770182
To unsubscribe send an email with subject unsubscribe to [EMAIL PROTECTED]  
Please contact [EMAIL PROTECTED] for questions.

Reply via email to