[z3-checkins] r44975 - in z3/deliverance/DeliveranceVHoster/trunk: docs dvhoster

[ltucker at codespeak.net]

Author: ltucker
Date: Thu Jul 12 17:19:13 2007
New Revision: 44975

Modified:
   z3/deliverance/DeliveranceVHoster/trunk/docs/example_init_domain.py
   z3/deliverance/DeliveranceVHoster/trunk/docs/hooks.txt
   z3/deliverance/DeliveranceVHoster/trunk/docs/openplans_hooks.py
   z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py
Log:
make find_remote_uri take domain_info

Modified: z3/deliverance/DeliveranceVHoster/trunk/docs/example_init_domain.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/docs/example_init_domain.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/docs/example_init_domain.py	Thu Jul 12 17:19:13 2007
@@ -35,7 +35,7 @@
         ('X-Openplans-Project', project),
         ]
     
-def find_remote_uri(remote_uri, remote_uri_info, environ,
+def find_remote_uri(remote_uri, remote_uri_info, domain_info, environ,
                     app_conf):
     from paste.request import path_info_pop
     if remote_uri is not None:

Modified: z3/deliverance/DeliveranceVHoster/trunk/docs/hooks.txt
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/docs/hooks.txt	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/docs/hooks.txt	Thu Jul 12 17:19:13 2007
@@ -41,7 +41,7 @@
 and a match found (or potentially no match found).  It returns the
 remote_uri that should be used.  It should look like::
 
-    def find_remote_uri(remote_uri, remote_uri_info, environ,
+    def find_remote_uri(remote_uri, remote_uri_info, domain_info, environ,
                         app_conf):
         if remote_uri is not None:
             # It was set explicitly in the remote_uris setting

Modified: z3/deliverance/DeliveranceVHoster/trunk/docs/openplans_hooks.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/docs/openplans_hooks.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/docs/openplans_hooks.py	Thu Jul 12 17:19:13 2007
@@ -48,7 +48,7 @@
     domain_info.set_rule_file(
         'rule.xml', rule_data)
 
-def find_remote_uri(remote_uri, remote_uri_info, environ,
+def find_remote_uri(remote_uri, remote_uri_info, domain_info, environ,
                     app_conf):
     """
     Maps request to a remote_uri (when none has been explicitly set).

Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py	Thu Jul 12 17:19:13 2007
@@ -322,9 +322,9 @@
                             header_name = 'HTTP_' + header_name
                         environ[str(header_name)] = str(header_value)
                 if self.find_remote_uri:
-                    remote_uri = self.find_remote_uri(remote_uri, remote_uri_info, environ, self.app_conf)
+                    remote_uri = self.find_remote_uri(remote_uri, remote_uri_info, domain_info, environ, self.app_conf)
                 return remote_uri
         if self.find_remote_uri:
             # Last change for find_remote_uri to do something
-            remote_uri = self.find_remote_uri(remote_uri, None, environ, self.app_conf)
+            remote_uri = self.find_remote_uri(remote_uri, None, domain_info, environ, self.app_conf)
         return remote_uri