From jwashin at codespeak.net  Sat Oct  7 23:20:50 2006
From: jwashin at codespeak.net (jwashin at codespeak.net)
Date: Sat,  7 Oct 2006 23:20:50 +0200 (CEST)
Subject: [z3-checkins] r32995 - z3/jsonserver/trunk
Message-ID: <20061007212050.8F07B1006E@code0.codespeak.net>

Author: jwashin
Date: Sat Oct  7 23:20:46 2006
New Revision: 32995

Added:
   z3/jsonserver/trunk/JSONViews.txt
   z3/jsonserver/trunk/ftests.py
Modified:
   z3/jsonserver/trunk/__init__.py
   z3/jsonserver/trunk/interfaces.py
   z3/jsonserver/trunk/jsonrpc.py
Log:
Added JSONViews, and JSONViews.txt as ftest


Added: z3/jsonserver/trunk/JSONViews.txt
==============================================================================
--- (empty file)
+++ z3/jsonserver/trunk/JSONViews.txt	Sat Oct  7 23:20:46 2006
@@ -0,0 +1,162 @@
+JSON Views are used when an HTTP GET is a reasonable way to get some 
+JSON-formatted data from the server, for example, if you have a javascript 
+library that employs JSON GETs, e.g., Dojo.
+
+A JSON View is simply a page that, instead of HTML, is a JSON.representation of
+some data.
+
+To do this you need to create a view class and register it in ZCML.
+
+We'll follow the xmlrpc README to demonstrate.
+
+First, write a view class, descended from JSONView.  Whatever is returned in the
+doResponse method is what will be sent as a response. The usual view instance 
+variables context and request are available.
+
+    >>> from jsonserver import JSONView
+    >>> class FolderListing(JSONView):
+    ...     def doResponse(self):
+    ...         return list(self.context.keys())
+
+Register it as a view.  Usually, this will be a browser:page or browser:view 
+directive (I'm not sure which is really preferred, either should work.).  
+browser2:page should also work, though I have not tried it.
+
+    >>> from zope.configuration import xmlconfig
+    >>> ignored = xmlconfig.string("""
+    ... <configure
+    ...   xmlns="http://namespaces.zope.org/zope"
+    ...   xmlns:browser="http://namespaces.zope.org/browser"
+    ...   >
+    ...  <!-- allow browser directives here -->
+    ...  <include package="zope.app.publisher.browser" file="meta.zcml" />
+    ...  <browser:page
+    ...     name="folderlist"
+    ...     for="zope.app.folder.folder.IFolder"
+    ...     class="jsonserver.JSONViews.FolderListing"
+    ...     permission="zope.ManageContent"
+    ...     />
+    ... </configure>
+    ... """)
+
+Exactly like the xmlrpc example, we add some items to the root folder.
+
+    >>> print http(r"""
+    ... POST /@@contents.html HTTP/1.1
+    ... Authorization: Basic bWdyOm1ncnB3
+    ... Content-Length: 73
+    ... Content-Type: application/x-www-form-urlencoded
+    ...
+    ... type_name=BrowserAdd__zope.app.folder.folder.Folder&new_value=f1""")
+    HTTP/1.1 303 See Other
+    ...
+
+    >>> print http(r"""
+    ... POST /@@contents.html HTTP/1.1
+    ... Authorization: Basic bWdyOm1ncnB3
+    ... Content-Length: 73
+    ... Content-Type: application/x-www-form-urlencoded
+    ...
+    ... type_name=BrowserAdd__zope.app.folder.folder.Folder&new_value=f2""")
+    HTTP/1.1 303 See Other
+    ...
+
+Before we can JSONView, there needs to be an IJSONWriter utility.  Here's one.
+    >>> import zope.component
+    >>> import jsoncomponent
+    >>> from jsonserver.interfaces import IJSONWriter
+    >>> zope.component.provideUtility(jsoncomponent.JSONWriter(),IJSONWriter)
+
+Let's set up a browser.
+    >>> from zope.testbrowser.testing import Browser
+    >>> browser = Browser('http://localhost/@@/testbrowser/simple.html')
+    >>> #this was how I figured out the need for the IJSONWriter utility...
+    >>> #browser.handleErrors = False
+
+Now, we can call our new JSONView and get a response:
+    >>> browser.open('/folderlist')
+    Traceback (most recent call last):
+    ...
+    HTTPError: HTTP Error 401: Unauthorized
+
+That was expected  Let's view again, and provide authentication this time.
+Content-type is set appropriately.
+    >>> browser.addHeader('Authorization','Basic mgr:mgrpw')
+    >>> browser.open('/folderlist')
+    >>> browser.headers['content-type']
+    'application/json;charset=utf-8'
+    >>> browser.contents
+    '["f1","f2"]'
+
+Pretty cool, yes?  This is much smaller than a similar xmlrpc response.
+
+But what about parameters?  Let's create another class with some error handling.
+There's no real standard on this, so you may need to commune with the cliemt
+implementation to see how to handle errors.
+    >>> import decimal
+    >>> class FolderStupidSum(JSONView):
+    ...     """return two values and their sum"""
+    ...     def doResponse(self, a=0, b=0):
+    ...         try:
+    ...             a = decimal.Decimal(a)
+    ...             b = decimal.Decimal(b)
+    ...         except decimal.InvalidOperation:
+    ...             self.request.response.setStatus(500)
+    ...             return {'error':'bad params','a':a, 'b':b}
+    ...         return {'a':a,'b':b,'sum':a+b}
+
+and register it.
+    >>> from zope.configuration import xmlconfig
+    >>> ignored = xmlconfig.string("""
+    ... <configure
+    ...   xmlns="http://namespaces.zope.org/zope"
+    ...   xmlns:browser="http://namespaces.zope.org/browser"
+    ...   >
+    ...  <!-- allow browser directives here -->
+    ...  <include package="zope.app.publisher.browser" file="meta.zcml" />
+    ...  <browser:page
+    ...     name="sum"
+    ...     for="zope.app.folder.folder.IFolder"
+    ...     class="jsonserver.JSONViews.FolderStupidSum"
+    ...     permission="zope.ManageContent"
+    ...     />
+    ... </configure>
+    ... """)
+
+Start a new browser.
+    >>> browser = Browser('http://localhost/@@/testbrowser/simple.html')
+    >>> #browser.handleErrors = False
+    >>> browser.addHeader('Authorization','Basic mgr:mgrpw')
+
+Let's do a couple of views.  browser is already authenticated.  Asssure the 
+parameters in the GET match the names in the doResponse method.  Default values
+are OK, and probably a good idea.
+    >>> browser.open('/sum?a=5')
+
+We are expecting something that looks like '{"a":5,"sum":5,"b":0}'
+    >>> '"a"' in browser.contents
+    True
+    >>> '"b"' in browser.contents
+    True
+    >>> '"sum"' in browser.contents
+    True
+    >>> browser.contents.count('5') == 2
+    True
+
+This request should get something that looks like '{"a":5,"sum":15,"b":10}'
+    >>> browser.open('/sum?a=5&b=10')
+    >>> browser.contents.count('15') == 1
+    True
+
+Let's see if the error handling works. We should get an HTTP error and something
+like '{"a":"zzz5","b":"10","error":"bad params"}
+    >>> browser.handleErrors = True
+    >>> browser.open('/sum?a=zzz5&b=10')
+    Traceback (most recent call last):
+    ...
+    HTTPError: HTTP Error 500: Internal Server Error
+    >>> 'zzz5' in browser.contents
+    True
+    >>> 'bad params' in browser.contents
+    True
+

Modified: z3/jsonserver/trunk/__init__.py
==============================================================================
--- z3/jsonserver/trunk/__init__.py	(original)
+++ z3/jsonserver/trunk/__init__.py	Sat Oct  7 23:20:46 2006
@@ -1 +1,2 @@
 #python package
+from jsonrpc import MethodPublisher, JSONView

Added: z3/jsonserver/trunk/ftests.py
==============================================================================
--- (empty file)
+++ z3/jsonserver/trunk/ftests.py	Sat Oct  7 23:20:46 2006
@@ -0,0 +1,57 @@
+##############################################################################
+#
+# Copyright (c) 2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Functional tests for JSON Views
+Original file z.a.publisher.xmlrpc/ftests.py
+$Id: ftests.py 29787 2005-04-01 16:41:05Z srichter $
+Mod by jmw 7 Oct 06 for JSON Views
+"""
+import zope.interface
+import zope.app.folder.folder
+import zope.publisher.interfaces.xmlrpc
+from zope.app.testing import ztapi, functional, setup
+
+def setUp(test):
+    setup.setUpTestAsModule(test, 'jsonserver.JSONViews')
+
+def tearDown(test):
+    # clean up the views we registered:
+    
+    # we use the fact that registering None unregisters whatever is
+    # registered. We can't use an unregistration call because that
+    # requires the object that was registered and we don't have that handy.
+    # (OK, we could get it if we want. Maybe later.)
+
+    ztapi.provideView(zope.app.folder.folder.IFolder,
+                        zope.publisher.interfaces.IRequest,
+                        zope.interface,
+                        'folderlist',
+                        None,
+                        )
+
+    ztapi.provideView(zope.app.folder.folder.IFolder,
+                        zope.publisher.interfaces.xmlrpc.IXMLRPCRequest,
+                        zope.interface,
+                        'sum',
+                        None,
+                        )
+    
+    setup.tearDownTestAsModule(test)
+
+def test_suite():
+    return functional.FunctionalDocFileSuite(
+        'JSONViews.txt', setUp=setUp, tearDown=tearDown)
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main(defaultTest='test_suite')

Modified: z3/jsonserver/trunk/interfaces.py
==============================================================================
--- z3/jsonserver/trunk/interfaces.py	(original)
+++ z3/jsonserver/trunk/interfaces.py	Sat Oct  7 23:20:46 2006
@@ -23,12 +23,15 @@
 from zope.publisher.interfaces.http import IHTTPApplicationRequest,\
         IHTTPCredentials
 from zope.interface import Interface
-from zope.component.interfaces import IView, IPresentation
+from zope.component.interfaces import IView
 from zope.interface import Attribute
 from zope.app.publisher.xmlrpc import IMethodPublisher
 from zope.publisher.interfaces.xmlrpc import IXMLRPCPublication
 from zope.app.publication.interfaces import IRequestFactory
-from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer, \
+        IBrowserPage
+from zope.schema.interfaces import TextLine
+
 
 class IJSONRPCRequestFactory(IRequestFactory):
     """Browser request factory"""
@@ -78,3 +81,12 @@
     """Premarshaller to remove security proxies"""
     def __call__():
         """return the object without proxies"""
+
+class IJSONView(IBrowserPage):
+    """A view that is a JSON representation of an object"""
+    contentType = TextLine(title=u"content-type", default=u"application/json")
+    def doResponse():
+        """return the list or dict that is response for this view"""
+    def doCacheControl():
+        """set any cache headers that may be needed.  Default sends 'no-cache'
+        to KHTML browsers.  May be extended/overridden in subclasses"""

Modified: z3/jsonserver/trunk/jsonrpc.py
==============================================================================
--- z3/jsonserver/trunk/jsonrpc.py	(original)
+++ z3/jsonserver/trunk/jsonrpc.py	Sat Oct  7 23:20:46 2006
@@ -22,12 +22,14 @@
 #2006-03-09 enabled gzip compression for large responses
 #2006-05-10 removed gzip compression and (prematurely) enabled json-rpc 1.1 jmw
 #2006-06-19 updated with ctheune's xmlrpc solution for removing proxies jmw
+#2006-09-27 added JSONView class
 
 __docformat__ = 'restructuredtext'
 
 from zope.app.publication.http import BaseHTTPPublication
 from interfaces import IMethodPublisher, IJSONRPCView, IJSONRPCPublisher,\
-    IJSONRPCRequest, IJSONReader, IJSONWriter, IJSONRPCPremarshaller
+    IJSONRPCRequest, IJSONReader, IJSONWriter, IJSONRPCPremarshaller, \
+    IJSONView
 from zope.interface import implements
 #from zope.publisher.http import IResult
 from zope.location.location import Location
@@ -36,8 +38,11 @@
 from zope.publisher.browser import BrowserRequest
 from zope.security.proxy import isinstance
 from zope.publisher.interfaces.browser import IBrowserRequest
+
 from zope.publisher.interfaces.browser import IBrowserApplicationRequest
 from zope.component import getUtility
+from zope.publisher.browser import BrowserPage
+
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -50,6 +55,8 @@
 
 keyword_key = "pythonKwMaRkEr"
 
+json_charsets = ('utf-8','utf-16', 'utf-32')
+
 #writeProfileData transcribes reads and writes files in the zope3
 # instance directory for profiling use.
 # profiledata.py has response dicts that can be read as python
@@ -208,6 +215,9 @@
     def _prepareResult(self,result):
         #we've asked json to return unicode; result should be unicode
         encoding = getCharsetUsingRequest(self._request) or 'utf-8'
+        enc = encoding.lower()
+        if not enc in json_charsets:
+            encoding = 'utf-8'
         #at outgoing boundary; encode it.
         if isinstance(result,unicode):
             body = result.encode(encoding)
@@ -268,7 +278,7 @@
         return map(premarshal, self.data)
 
 def premarshal(data):
-    """Premarshal data before handing it to xmlrpclib for marhalling
+    """Premarshal data before handing it to JSON writer for marshalling
 
     The initial purpose of this function is to remove security proxies
     without resorting to removeSecurityProxy.   This way, we can avoid
@@ -303,6 +313,69 @@
         #return premarshaller(data)
     #return data
 
+class JSONView(BrowserPage):
+    """This is a base view class for 'ordinary' JSON methods.
+    JSONViews are accessible by ordinary URLs and HTTP GETs.
+    """
+    implements(IJSONView)
+    contentType = 'application/json'
+
+    def doResponse(self, *args, **kw):
+        """return the python list or dict that will be the body of the response.
+        This needs to be overridden in subclasses"""
+        raise NotImplementedError("Subclasses should override doResponse to "
+                                  "provide a response body")
+    def doCacheControl(self):
+        """ at the moment, KHTML-based browsers do not handle cached JSON data
+        properly.  This may be Dojo-specific, and may be only necessary for
+        a short time until Konq and Safari behave like other browsers in this
+        respect.
+        Default here is to send 'no-cache' header to KHTML browsers.
+        For other user agents, a 1-hour public cache is specified.
+        
+        May be overridden/extended in subclasses.
+        """
+        agent = self.request.get('HTTP_USER_AGENT','')
+        response = self.request.response
+        if 'KHTML' in agent:
+            response.setHeader('cache-control','no-cache')
+        else:
+            response.setHeader('cache-control',
+                'public, must-revalidate, max-age=3600')
+                
+    def __call__(self, *args, **kw):
+        """the doResponse method is called.
+
+        First, anything that matches the method signature in request.form is 
+        put in the method's **kw.
+
+        After call, the response is JSONized and sent out with appropriate
+        encoding.
+
+        """
+        request = self.request
+        meth = self.doResponse
+        #introspect the method and set kw params if the arg is in request.form
+        params = meth.im_func.func_code.co_varnames[1:]
+        for key in request.form.keys():
+            if key in params:
+                kw[str(key)] = request.form.get(key)
+        resp = premarshal(self.doResponse(*args,**kw))
+
+        if not isinstance(resp,dict) and not isinstance(resp,list):
+            raise ValueError("JSON responses must be dicts or lists")
+
+        self.doCacheControl()
+
+        encoding = getCharsetUsingRequest(self.request)
+        enc = encoding.lower()
+        if not enc in json_charsets:
+            #we'll allow utf-32, utf-16 or utf-8; if not specified, use utf-8
+            enc = 'utf-8'
+        request.response.setHeader('content-type','%s;charset=%s' % (self.contentType,enc))
+        json = getUtility(IJSONWriter)
+        s = json.write(resp).encode(enc)
+        return s
 
 class JSONRPCView(object):
     """A base JSON-RPC view that can be used as mix-in for JSON-RPC views.

From jwashin at codespeak.net  Sun Oct  8 16:09:02 2006
From: jwashin at codespeak.net (jwashin at codespeak.net)
Date: Sun,  8 Oct 2006 16:09:02 +0200 (CEST)
Subject: [z3-checkins] r33001 - in z3/jsonserver/trunk: . tests
Message-ID: <20061008140902.B660710072@code0.codespeak.net>

Author: jwashin
Date: Sun Oct  8 16:08:59 2006
New Revision: 33001

Added:
   z3/jsonserver/trunk/tests/test_sum_form.pt
Modified:
   z3/jsonserver/trunk/JSONViews.txt
   z3/jsonserver/trunk/ftests.py
Log:
added a POST test to JSONViews.txt


Modified: z3/jsonserver/trunk/JSONViews.txt
==============================================================================
--- z3/jsonserver/trunk/JSONViews.txt	(original)
+++ z3/jsonserver/trunk/JSONViews.txt	Sun Oct  8 16:08:59 2006
@@ -10,8 +10,8 @@
 We'll follow the xmlrpc README to demonstrate.
 
 First, write a view class, descended from JSONView.  Whatever is returned in the
-doResponse method is what will be sent as a response. The usual view instance 
-variables context and request are available.
+doResponse method is what will be sent as a response. The usual view instance
+variables, context and request, are available.
 
     >>> from jsonserver import JSONView
     >>> class FolderListing(JSONView):
@@ -39,27 +39,21 @@
     ... </configure>
     ... """)
 
-Exactly like the xmlrpc example, we add some items to the root folder.
-
-    >>> print http(r"""
-    ... POST /@@contents.html HTTP/1.1
-    ... Authorization: Basic bWdyOm1ncnB3
-    ... Content-Length: 73
-    ... Content-Type: application/x-www-form-urlencoded
-    ...
-    ... type_name=BrowserAdd__zope.app.folder.folder.Folder&new_value=f1""")
-    HTTP/1.1 303 See Other
-    ...
+Let's set up a browser.
+    >>> from zope.testbrowser.testing import Browser
+    >>> browser = Browser('http://localhost/@@/testbrowser/simple.html')
+    >>> #N.B.,this was how I figured out the need for the IJSONWriter utility...
+    >>> #browser.handleErrors = False
+    >>> browser.addHeader('Authorization','Basic mgr:mgrpw')
 
-    >>> print http(r"""
-    ... POST /@@contents.html HTTP/1.1
-    ... Authorization: Basic bWdyOm1ncnB3
-    ... Content-Length: 73
-    ... Content-Type: application/x-www-form-urlencoded
-    ...
-    ... type_name=BrowserAdd__zope.app.folder.folder.Folder&new_value=f2""")
-    HTTP/1.1 303 See Other
-    ...
+Almost exactly like the xmlrpc example, we add some items to the root folder.
+    >>> typeName = "BrowserAdd__zope.app.folder.folder.Folder"
+    >>> newValue = 'f1'
+    >>> browser.open('/@@contents.html?type_name=%s&new_value=%s' % (typeName,
+    ... newValue))
+    >>> newValue = 'f2'
+    >>> browser.open('/@@contents.html?type_name=%s&new_value=%s' % (typeName,
+    ... newValue))
 
 Before we can JSONView, there needs to be an IJSONWriter utility.  Here's one.
     >>> import zope.component
@@ -67,11 +61,8 @@
     >>> from jsonserver.interfaces import IJSONWriter
     >>> zope.component.provideUtility(jsoncomponent.JSONWriter(),IJSONWriter)
 
-Let's set up a browser.
-    >>> from zope.testbrowser.testing import Browser
+We reset the browser just for fun...
     >>> browser = Browser('http://localhost/@@/testbrowser/simple.html')
-    >>> #this was how I figured out the need for the IJSONWriter utility...
-    >>> #browser.handleErrors = False
 
 Now, we can call our new JSONView and get a response:
     >>> browser.open('/folderlist')
@@ -91,8 +82,8 @@
 Pretty cool, yes?  This is much smaller than a similar xmlrpc response.
 
 But what about parameters?  Let's create another class with some error handling.
-There's no real standard on this, so you may need to commune with the cliemt
-implementation to see how to handle errors.
+There's no real standard on error handling in JSON, so you may need to commune
+with the client implementation to see how to handle errors.
     >>> import decimal
     >>> class FolderStupidSum(JSONView):
     ...     """return two values and their sum"""
@@ -105,7 +96,11 @@
     ...             return {'error':'bad params','a':a, 'b':b}
     ...         return {'a':a,'b':b,'sum':a+b}
 
-and register it.
+First, a hack to make the page template file findable, then register the sum 
+page and a sum_form page.
+    >>> import os
+    >>> loc = os.path.dirname(__file__)
+    >>> pt = os.path.join(loc,'tests','test_sum_form.pt')
     >>> from zope.configuration import xmlconfig
     >>> ignored = xmlconfig.string("""
     ... <configure
@@ -120,15 +115,21 @@
     ...     class="jsonserver.JSONViews.FolderStupidSum"
     ...     permission="zope.ManageContent"
     ...     />
+    ...  <browser:page
+    ...     name="sum_form.html"
+    ...     for="zope.app.folder.folder.IFolder"
+    ...     template="%s"
+    ...     permission="zope.ManageContent"
+    ...     />
     ... </configure>
-    ... """)
+    ... """ % pt)
 
 Start a new browser.
     >>> browser = Browser('http://localhost/@@/testbrowser/simple.html')
     >>> #browser.handleErrors = False
     >>> browser.addHeader('Authorization','Basic mgr:mgrpw')
 
-Let's do a couple of views.  browser is already authenticated.  Asssure the 
+Let's do a couple of views.  Browser is already authenticated.  Asssure the 
 parameters in the GET match the names in the doResponse method.  Default values
 are OK, and probably a good idea.
     >>> browser.open('/sum?a=5')
@@ -160,3 +161,15 @@
     >>> 'bad params' in browser.contents
     True
 
+Now, let's open the test form in the browser so that we can see if POST works.
+Ordinarily, a POST for a JSONView would be done in an XHR, but we are just
+testing functionality here.
+    >>> browser.open('/sum_form.html')
+    >>> a = browser.getControl(name='a')
+    >>> b = browser.getControl(name='b')
+    >>> a.value="34"
+    >>> b.value="66"
+    >>> submit = browser.getControl(name="submit")
+    >>> submit.click()
+    >>> '"sum":100' in browser.contents
+    True

Modified: z3/jsonserver/trunk/ftests.py
==============================================================================
--- z3/jsonserver/trunk/ftests.py	(original)
+++ z3/jsonserver/trunk/ftests.py	Sun Oct  8 16:08:59 2006
@@ -18,7 +18,7 @@
 """
 import zope.interface
 import zope.app.folder.folder
-import zope.publisher.interfaces.xmlrpc
+import zope.publisher.interfaces.browser
 from zope.app.testing import ztapi, functional, setup
 
 def setUp(test):
@@ -33,19 +33,23 @@
     # (OK, we could get it if we want. Maybe later.)
 
     ztapi.provideView(zope.app.folder.folder.IFolder,
-                        zope.publisher.interfaces.IRequest,
+                        zope.publisher.interfaces.browser.IBrowserRequest,
                         zope.interface,
                         'folderlist',
                         None,
                         )
-
     ztapi.provideView(zope.app.folder.folder.IFolder,
-                        zope.publisher.interfaces.xmlrpc.IXMLRPCRequest,
+                        zope.publisher.interfaces.browser.IBrowserRequest,
                         zope.interface,
                         'sum',
                         None,
                         )
-    
+    ztapi.provideView(zope.app.folder.folder.IFolder,
+                        zope.publisher.interfaces.browser.IBrowserRequest,
+                        zope.interface,
+                        'sum_form.html',
+                        None,
+                        )
     setup.tearDownTestAsModule(test)
 
 def test_suite():

Added: z3/jsonserver/trunk/tests/test_sum_form.pt
==============================================================================
--- (empty file)
+++ z3/jsonserver/trunk/tests/test_sum_form.pt	Sun Oct  8 16:08:59 2006
@@ -0,0 +1,14 @@
+<html>
+  <head>
+    <title>This is a form for testing stupid sums</title>
+  </head>
+  <body>
+    <h2>Stupid form test</h2>
+    <p>Enter two values, and submit</p>
+    <form action="sum" method="post">
+      <input type="text" name="a" value=""/>
+      <input type="text" name="b" value=""/>
+      <input type="submit" name="submit" value="OK" />
+    </form>
+  </body>
+</html>

From jwashin at codespeak.net  Sun Oct  8 20:18:07 2006
From: jwashin at codespeak.net (jwashin at codespeak.net)
Date: Sun,  8 Oct 2006 20:18:07 +0200 (CEST)
Subject: [z3-checkins] r33005 - z3/jsonserver/trunk
Message-ID: <20061008181807.ED81110068@code0.codespeak.net>

Author: jwashin
Date: Sun Oct  8 20:18:05 2006
New Revision: 33005

Modified:
   z3/jsonserver/trunk/JSONViews.txt
   z3/jsonserver/trunk/jsonrpc.py
Log:
a bit more error handling for JSONView


Modified: z3/jsonserver/trunk/JSONViews.txt
==============================================================================
--- z3/jsonserver/trunk/JSONViews.txt	(original)
+++ z3/jsonserver/trunk/JSONViews.txt	Sun Oct  8 20:18:05 2006
@@ -81,13 +81,14 @@
 
 Pretty cool, yes?  This is much smaller than a similar xmlrpc response.
 
-But what about parameters?  Let's create another class with some error handling.
-There's no real standard on error handling in JSON, so you may need to commune
-with the client implementation to see how to handle errors.
+But what about parameters?  Let's create another class with a parameter and an
+optional parameter.  We'll also do some local error handling.  There's no real 
+standard on error handling in JSON, so you may need to commune with the client 
+implementation to see how to handle errors.
     >>> import decimal
     >>> class FolderStupidSum(JSONView):
     ...     """return two values and their sum"""
-    ...     def doResponse(self, a=0, b=0):
+    ...     def doResponse(self, a, b=0):
     ...         try:
     ...             a = decimal.Decimal(a)
     ...             b = decimal.Decimal(b)
@@ -131,7 +132,7 @@
 
 Let's do a couple of views.  Browser is already authenticated.  Asssure the 
 parameters in the GET match the names in the doResponse method.  Default values
-are OK, and probably a good idea.
+in the method signature are OK, and probably a good idea.
     >>> browser.open('/sum?a=5')
 
 We are expecting something that looks like '{"a":5,"sum":5,"b":0}'
@@ -149,8 +150,25 @@
     >>> browser.contents.count('15') == 1
     True
 
-Let's see if the error handling works. We should get an HTTP error and something
-like '{"a":"zzz5","b":"10","error":"bad params"}
+This request does not send enough parameters.
+    >>> browser.open('/sum')
+    Traceback (most recent call last):
+    ...
+    HTTPError: HTTP Error 500: Internal Server Error
+    >>> browser.contents
+    '{"error":"doResponse() takes at least 2 arguments (1 given)"}'
+
+This request also does not send enough parameters, because the parameter 
+provided does not match the method signature.
+    >>> browser.open('/sum?d=20')
+    Traceback (most recent call last):
+    ...
+    HTTPError: HTTP Error 500: Internal Server Error
+    >>> browser.contents
+    '{"error":"doResponse() takes at least 2 arguments (1 given)"}'
+
+Let's see if the local error handling works. We should get an HTTP error and 
+something like '{"a":"zzz5","b":"10","error":"bad params"}
     >>> browser.handleErrors = True
     >>> browser.open('/sum?a=zzz5&b=10')
     Traceback (most recent call last):

Modified: z3/jsonserver/trunk/jsonrpc.py
==============================================================================
--- z3/jsonserver/trunk/jsonrpc.py	(original)
+++ z3/jsonserver/trunk/jsonrpc.py	Sun Oct  8 20:18:05 2006
@@ -360,7 +360,11 @@
         for key in request.form.keys():
             if key in params:
                 kw[str(key)] = request.form.get(key)
-        resp = premarshal(self.doResponse(*args,**kw))
+        try:
+            resp = premarshal(self.doResponse(*args,**kw))
+        except TypeError, err:
+            request.response.setStatus('500')
+            resp = {'error':'%s' % err}
 
         if not isinstance(resp,dict) and not isinstance(resp,list):
             raise ValueError("JSON responses must be dicts or lists")

From jwashin at codespeak.net  Sun Oct  8 20:24:15 2006
From: jwashin at codespeak.net (jwashin at codespeak.net)
Date: Sun,  8 Oct 2006 20:24:15 +0200 (CEST)
Subject: [z3-checkins] r33007 - z3/jsonserver/trunk
Message-ID: <20061008182415.2283210068@code0.codespeak.net>

Author: jwashin
Date: Sun Oct  8 20:24:13 2006
New Revision: 33007

Modified:
   z3/jsonserver/trunk/JSONViews.txt
Log:
Oops python error msgs are not always in English.


Modified: z3/jsonserver/trunk/JSONViews.txt
==============================================================================
--- z3/jsonserver/trunk/JSONViews.txt	(original)
+++ z3/jsonserver/trunk/JSONViews.txt	Sun Oct  8 20:24:13 2006
@@ -150,22 +150,23 @@
     >>> browser.contents.count('15') == 1
     True
 
-This request does not send enough parameters.
+This request does not send enough parameters.  The error I get is
+'{"error":"doResponse() takes at least 2 arguments (1 given)"}'
     >>> browser.open('/sum')
     Traceback (most recent call last):
     ...
     HTTPError: HTTP Error 500: Internal Server Error
-    >>> browser.contents
-    '{"error":"doResponse() takes at least 2 arguments (1 given)"}'
+    >>> 'error' in browser.contents
+    True
 
 This request also does not send enough parameters, because the parameter 
-provided does not match the method signature.
+provided does not match the method signature.  Same error as above.
     >>> browser.open('/sum?d=20')
     Traceback (most recent call last):
     ...
     HTTPError: HTTP Error 500: Internal Server Error
-    >>> browser.contents
-    '{"error":"doResponse() takes at least 2 arguments (1 given)"}'
+    >>> 'error' in browser.contents
+    True
 
 Let's see if the local error handling works. We should get an HTTP error and 
 something like '{"a":"zzz5","b":"10","error":"bad params"}

From jwashin at codespeak.net  Sun Oct  8 20:58:05 2006
From: jwashin at codespeak.net (jwashin at codespeak.net)
Date: Sun,  8 Oct 2006 20:58:05 +0200 (CEST)
Subject: [z3-checkins] r33011 - z3/jsonserver/trunk
Message-ID: <20061008185805.4708810068@code0.codespeak.net>

Author: jwashin
Date: Sun Oct  8 20:58:03 2006
New Revision: 33011

Modified:
   z3/jsonserver/trunk/JSONViews.txt
Log:
small typo fixed in JSONViews.txt


Modified: z3/jsonserver/trunk/JSONViews.txt
==============================================================================
--- z3/jsonserver/trunk/JSONViews.txt	(original)
+++ z3/jsonserver/trunk/JSONViews.txt	Sun Oct  8 20:58:03 2006
@@ -2,7 +2,7 @@
 JSON-formatted data from the server, for example, if you have a javascript 
 library that employs JSON GETs, e.g., Dojo.
 
-A JSON View is simply a page that, instead of HTML, is a JSON.representation of
+A JSON View is simply a page that, instead of HTML, is a JSON representation of
 some data.
 
 To do this you need to create a view class and register it in ZCML.

From cabraham at codespeak.net  Mon Oct  9 22:09:20 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  9 Oct 2006 22:09:20 +0200 (CEST)
Subject: [z3-checkins] r33076 -
	z3/deliverance/branches/packaged/deliverance/tests
Message-ID: <20061009200920.E439B100C8@code0.codespeak.net>

Author: cabraham
Date: Mon Oct  9 22:08:59 2006
New Revision: 33076

Removed:
   z3/deliverance/branches/packaged/deliverance/tests/
Log:
deletes old tests

From ltucker at codespeak.net  Mon Oct  9 22:04:02 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon,  9 Oct 2006 22:04:02 +0200 (CEST)
Subject: [z3-checkins] r33075 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
	test-data/nabuur test-data/nycsr test-data/static
Message-ID: <20061009200402.ED901100CC@code0.codespeak.net>

Author: ltucker
Date: Mon Oct  9 22:03:44 2006
New Revision: 33075

Added:
   z3/deliverance/branches/packaged/deliverance/handtransform.py
   z3/deliverance/branches/packaged/deliverance/htmlserialize.py
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/
   z3/deliverance/branches/packaged/deliverance/test-data/nabuur/
   z3/deliverance/branches/packaged/deliverance/test-data/nabuur/nabuur.html
   z3/deliverance/branches/packaged/deliverance/test-data/nabuur/nabuur.theme
   z3/deliverance/branches/packaged/deliverance/test-data/nabuur/rules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/nabuur/standardrules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.theme
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr_expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/openplans.html
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/standardrules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/static/
   z3/deliverance/branches/packaged/deliverance/test-data/static/example.html
   z3/deliverance/branches/packaged/deliverance/test-data/static/example_expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/static/rules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/static/standardrules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/static/standardrules2.xml
   z3/deliverance/branches/packaged/deliverance/test-data/static/text-rules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/static/texttest_expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/static/theme.html
   z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_rules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_theme.html
   z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_baserules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_comments.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_submatch.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
   z3/deliverance/branches/packaged/deliverance/tests.py
   z3/deliverance/branches/packaged/deliverance/utils.py
   z3/deliverance/branches/packaged/deliverance/xinclude.py
   z3/deliverance/branches/packaged/deliverance/xslt.py
Removed:
   z3/deliverance/branches/packaged/deliverance/ThemedHTTPServer.py
   z3/deliverance/branches/packaged/deliverance/main.py
   z3/deliverance/branches/packaged/deliverance/mpfilter.py
   z3/deliverance/branches/packaged/deliverance/renderer.xsl
   z3/deliverance/branches/packaged/deliverance/themecompiler.xsl
Modified:
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
parallel python and xslt renderers, tests, wsgi filter


Deleted: /z3/deliverance/branches/packaged/deliverance/ThemedHTTPServer.py
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/ThemedHTTPServer.py	Mon Oct  9 22:03:44 2006
+++ (empty file)
@@ -1,92 +0,0 @@
-"""Simple HTTP Server.
-
-This module builds on BaseHTTPServer by implementing the standard GET
-and HEAD requests in a fairly straightforward manner.
-
-"""
-
-
-__version__ = "0.6"
-
-__all__ = ["ThemedHTTPRequestHandler"]
-
-import os
-import mimetypes
-import BaseHTTPServer
-import SimpleHTTPServer
-from StringIO import StringIO
-
-from deliverance import AppMap
-appmap = AppMap()
-
-
-class ThemedHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
-
-    def send_head(self):
-        """Common code for GET and HEAD commands.
-
-        This sends the response code and MIME headers.
-
-        Return value is either a file object (which has to be copied
-        to the outputfile by the caller unless the command was HEAD,
-        and must be closed by the caller under all circumstances), or
-        None, in which case the caller has nothing further to do.
-
-        """
-        path = self.translate_path(self.path)
-        f = None
-        if os.path.isdir(path):
-            for index in "index.html", "index.htm":
-                index = os.path.join(path, index)
-                if os.path.exists(index):
-                    path = index
-                    break
-            else:
-                return self.list_directory(path)
-        ctype = self.guess_type(path)
-        try:
-            # Always read in binary mode. Opening files in text mode may cause
-            # newline translations, making the actual size of the content
-            # transmitted *less* than the content-length!
-            
-            # This is where we apply theming
-            
-            # First check to see if there is a query string.  If so, presume that 
-            # to mean they want the source version.
-            qs = len(self.path.split("?"))
-            if ctype == "text/html" and qs == 99:
-                print "Applying theme to", path
-                xmlstring = open(path, "r").read()
-                response = appmap.publish(xmlstring)
-                f = StringIO(response)
-                responsesize = str(len(xmlstring))
-            else:
-                f = open(path, 'rb')
-                responsesize = str(os.fstat(f.fileno())[6])
-        except IOError:
-            self.send_error(404, "File not found")
-            return None
-        self.send_response(200)
-        self.send_header("Content-type", ctype)
-        self.send_header("Content-Length", responsesize)
-        self.end_headers()
-        return f
-
-    extensions_map = mimetypes.types_map.copy()
-    extensions_map.update({
-        '': 'application/octet-stream', # Default
-        '.py': 'text/plain',
-        '.c': 'text/plain',
-        '.h': 'text/plain',
-        '.ico': 'image/x-icon',
-        })
-
-    
-
-def test(HandlerClass = ThemedHTTPRequestHandler,
-         ServerClass = BaseHTTPServer.HTTPServer):
-    BaseHTTPServer.test(HandlerClass, ServerClass)
-
-
-if __name__ == '__main__':
-    test()

Added: z3/deliverance/branches/packaged/deliverance/handtransform.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/handtransform.py	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,124 @@
+import sys 
+from lxml import etree
+from htmlserialize import tostring
+import urllib
+from interpreter import Renderer as PythonRenderer
+from xslt import Renderer as XSLTRenderer
+from optparse import OptionParser
+import re
+import os 
+
+"""
+Command line utility to run a deliverance transform 
+given the urls of the rules, theme and content. 
+
+
+themeurl, rulesfile and baseurl can be rolled into a file specified with -f 
+it should contain an element like 
+<blend theme="themeurl" baseurl="baseurl" rules="rulesfile" />
+
+
+
+"""
+
+
+DEFAULT_BASE_URL = "http://www.example.com"
+
+
+def grab_url(url):
+    f = urllib.urlopen(url)
+    data = f.read()
+    f.close()
+    return data
+
+def do_transform(renderer_type, theme_url, base_url, rules_url, content_url):
+    rules = etree.XML(grab_url(rules_url))
+    theme = etree.HTML(grab_url(theme_url))
+    content = etree.HTML(grab_url(content_url))
+    
+    def reference_resolver(href, parse, encoding=None):
+        if not href.startswith('/'):
+            href = os.path.join(os.path.dirname(rules_url),href)
+        text = grab_url(href)
+        if parse == "xml":
+            return etree.XML(text)
+        elif encoding:
+            return text.decode(encoding)
+
+    renderer = None
+    if renderer_type == 'xslt':
+        renderer = XSLTRenderer(theme,base_url,rules,reference_resolver)
+    elif renderer_type == 'py':
+        renderer = PythonRenderer(theme,base_url,rules,reference_resolver)
+    else:
+        print "Unknown renderer type '" + renderer_type + "'"
+        return etree.Element("error")
+
+    return renderer.render(content)
+        
+
+def parse_blend_file(filename):
+    b = etree.XML(open(filename).read())
+    return b.get('theme'),b.get('baseurl'),b.get('rules')
+
+
+def die(message,parser):
+    print message
+    parser.print_usage()
+    sys.exit(0)    
+    
+if __name__ == '__main__':
+
+
+    usage = "usage: %prog [options] <content_url>"
+    parser = OptionParser(usage=usage)
+    parser.add_option("-t","--theme",dest="theme_url",help="url of theme html")
+    parser.add_option("-b","--baseurl",dest="base_url",
+                      help="relative urls in the theme will be made absolute relative to this url [default %default]", 
+                      default=DEFAULT_BASE_URL)
+    parser.add_option("-r","--rules",dest="rules_file",
+                      help="path to file containing the deliverance rules to apply")
+    parser.add_option("-f","--from-file",dest="blend_file",
+                      help="take theme, baseurl and rules parameters from the referenced file")
+    parser.add_option("-R","--renderer",dest="renderer_type",
+                      help="(xslt|py) [default %default]", default="xslt", choices=['xslt','py'])
+
+    (options,args) = parser.parse_args()
+    
+    if len(args) == 0:
+        die("no content url specified.",parser)
+
+    content_url = args[0]
+    theme_url = None
+    base_url = None
+    rules_file = None
+        
+
+    if options.blend_file:
+        if (options.rules_file or options.theme_url or options.base_url != DEFAULT_BASE_URL):
+            die("cannot specify base url, rules file or theme url when taking parameters from file.",parser)
+
+        try:
+            theme_url,base_url,rules_file = parse_blend_file(options.blend_file)            
+
+        except Exception,message:
+            die(message,parser)
+
+    else:
+        theme_url = options.theme_url
+        rules_file = options.rules_file
+        base_url = options.base_url
+
+
+    if theme_url is None:
+        die("no theme url specified.",parser)
+
+    if rules_file is None:
+        die("no rules file specified.",parser)
+
+    if base_url is None:
+        die("no base url specified",parser)
+        
+
+    print tostring(do_transform(options.renderer_type,theme_url,base_url,rules_file,content_url))
+    

Added: z3/deliverance/branches/packaged/deliverance/htmlserialize.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/htmlserialize.py	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,39 @@
+from lxml import etree
+
+
+html_xsl = """
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html" encoding="UTF-8" />
+  <xsl:template match="/">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+</xsl:transform>
+"""
+
+# TODO: this should do real formatting 
+pretty_html_xsl = """
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html" indent="yes" />
+  <xsl:template match="/">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+</xsl:transform>
+"""
+
+html_transform = etree.XSLT(etree.XML(html_xsl))
+pretty_html_transform = etree.XSLT(etree.XML(pretty_html_xsl))
+
+
+#
+# creates an HTML string representation of the document given 
+# 
+# note: this will create a meta http-equiv="Content" tag in the head
+# and may replace any that are present 
+# 
+def tostring(doc,pretty = False):
+    if pretty:
+        return str(pretty_html_transform(doc))
+    else:
+        return str(html_transform(doc))
+                  
+

Added: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,263 @@
+from lxml import etree
+import xinclude 
+import copy
+import utils
+from utils import RuleSyntaxError
+from utils import RendererBase
+
+class Renderer(RendererBase):
+    """
+    implements a deliverance renderer programmatically using 
+    lxml api.  The rules, theme and content are all processed at 
+    render time.
+    """
+
+    def __init__(self, theme, theme_uri, rules, reference_resolver=None):  
+        self.theme = self.fixup_links(theme, theme_uri)
+        self.remove_http_equiv_metas(self.theme)
+        self.rules = rules
+        # perform xincludes on the rules
+        if reference_resolver:
+            xinclude.include(self.rules, loader=reference_resolver)
+
+
+    def render(self, content):
+        result = copy.deepcopy(self.theme)
+        input = copy.deepcopy(content)
+        self.remove_http_equiv_metas(input)
+        self.apply_rules(self.rules,result,input)
+        return result
+
+
+    def apply_rules(self,rules,theme,content):
+        for rule in rules:
+            self.apply_rule(rule,theme,content)
+
+
+    def apply_rule(self,rule,theme,content):
+        if rule.tag == self.APPEND_RULE_TAG:
+            self.apply_append(rule,theme,content)
+        elif rule.tag == self.PREPEND_RULE_TAG:
+            self.apply_prepend(rule,theme,content)
+        elif rule.tag == self.REPLACE_RULE_TAG:
+            self.apply_replace(rule,theme,content)
+        elif rule.tag == self.COPY_RULE_TAG:
+            self.apply_copy(rule,theme,content)
+        elif rule.tag == self.APPEND_OR_REPLACE_RULE_TAG:
+            self.apply_append_or_replace(rule,theme,content)
+        elif rule.tag == self.SUBRULES_TAG:
+            self.apply_rules(rule,theme,content)
+        elif rule.tag is etree.Comment:
+            pass
+        else:
+            raise RuleSyntaxError(
+                "Rule %s (%s) not understood" % (
+                    rule.tag, etree.tostring(rule)))
+
+    def apply_append(self,rule,theme,content):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+
+        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+
+        if (len(content_els) == 0):
+            return 
+
+        non_text_els = self.elements_in(content_els)
+        self.strip_tails(non_text_els)
+
+        # the xpath may return a mixture of strings and elements, handle strings 
+        # by attaching them to the proper element 
+        if (type(content_els[0]) is type(str())):
+            # if the element we're appending to has children, the text is 
+            # appended to the tail of the last child. 
+            if len(theme_el): 
+                if theme_el[-1].tail:
+                    theme_el[-1].tail += content_els[0]
+                else:
+                    theme_el[-1].tail = content_els[0]
+            # otherwise, the text is appeded to the text attribute of the 
+            # element we're appending to 
+            else: 
+                if theme_el.text:
+                    theme_el.text += content_els[0]
+                else:
+                    theme_el.text = content_els[0]
+            
+        self.attach_tails(content_els)
+        theme_el.extend(non_text_els)
+
+    def apply_prepend(self,rule,theme,content):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+
+        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+
+        if (len(content_els) == 0):
+            return 
+
+        non_text_els = self.elements_in(content_els)
+        
+        # if we only get some text, just tack it on and return 
+        if len(non_text_els) == 0 and type(content_els[0]) is type(str()): 
+            if theme_el.text:
+                theme_el.text = content_els[0] + theme_el.text
+            else:
+                theme_el.text = content_els[0]
+            return 
+
+        # here we have some elements and possibly some text 
+
+        self.strip_tails(non_text_els)
+
+        # the xpath may return a mixture of strings and elements, handle the 
+        # first string by making it the text of the parent element. In any 
+        # case if the parent element has text, we need put it after the 
+        # elements we're prepending so we save it here
+        old_start_text = theme_el.text 
+        if (type(content_els[0]) is type(str())):
+            theme_el.text = content_els[0]
+        else:
+            theme_el.text = None
+            
+        self.attach_tails(content_els)
+        for index,el in enumerate(non_text_els):
+            theme_el.insert(index,el)
+
+        # tack on the previous text of the parent element 
+        if old_start_text:
+            if (non_text_els[-1].tail):
+                non_text_els[-1].tail += old_start_text
+            else:
+                non_text_els[-1].tail = old_start_text
+
+    def apply_replace(self,rule,theme,content):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+
+        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+
+        if len(content_els) == 0:
+            self.attach_text_to_previous(theme_el,theme_el.tail)
+            theme_el.getparent().remove(theme_el)
+            return       
+
+        non_text_els = self.elements_in(content_els)
+        self.strip_tails(non_text_els)
+
+
+        # the xpath may return a mixture of strings and elements, handle strings 
+        # by attaching them to the proper element 
+        if (type(content_els[0]) is type(str())):
+            # text must be appended to the tail of the most recent sibling or appended 
+            # to the text of the parent of the replaced element
+            self.attach_text_to_previous(theme_el,content_els[0])
+
+        if len(non_text_els) == 0:
+            self.attach_text_to_previous(theme_el,theme_el.tail)
+            theme_el.getparent().remove(theme_el)
+            return
+            
+        self.attach_tails(content_els)
+
+        # this tail, if there is one, should stick around 
+        preserve_tail = non_text_els[0].tail 
+
+        self.replace_element(theme_el, non_text_els[0])
+        temptail = non_text_els[0].tail 
+        non_text_els[0].tail = None
+        parent = non_text_els[0].getparent()
+        i = parent.index(non_text_els[0])
+        for index,cel in enumerate(non_text_els[1:]):
+            parent.insert(i + index + 1,cel)
+
+        if non_text_els[-1].tail:
+            non_text_els[-1].tail += temptail
+        else:
+            non_text_els[-1].tail = temptail
+        
+        # tack in any preserved tail we stored above
+        if preserve_tail:
+            if non_text_els[0].tail:
+                non_text_els[0].tail = preserve_tail + non_text_els[0].tail
+            else:
+                non_text_els[0].tail = preserve_tail
+        
+
+    def apply_copy(self,rule,theme,content):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+
+        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+
+        if len(content_els) == 0:
+            return 
+
+        non_text_els = self.elements_in(content_els)
+        self.strip_tails(non_text_els)
+        # attach any leading matched text as the text of the element 
+        # we're copying into 
+        if (type(content_els[0]) is type(str())):
+            theme_el.text = content_els[0]
+        # otherwise knock out any existing text 
+        else:
+            theme_el.text = None
+
+        self.attach_tails(content_els)
+        theme_el[:] = non_text_els        
+    
+    def apply_append_or_replace(self,rule,theme,content):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+
+        content_xpath = rule.attrib[self.RULE_CONTENT_KEY]
+        remove_tag = self.get_tag_from_xpath(content_xpath)
+
+        if remove_tag is None:
+            self.add_to_body_start(theme,self.format_error("invalid xpath for content", rule=rule))
+            return
+
+        for el in theme_el:
+            if el.tag == remove_tag:
+                theme_el.remove(el)
+
+        content_els = copy.deepcopy(content.xpath(content_xpath))
+        self.strip_tails(content_els)
+        theme_el.extend(content_els)
+
+
+    def elements_in(self, els):
+        """
+        return a list containing elements from els which are not strings 
+        """
+        return [x for x in els if type(x) is not type(str())]
+            
+
+
+    def strip_tails(self, els):
+        for el in els:
+            el.tail = None
+
+
+    def attach_tails(self,els):
+        """
+        whereever an lxml element in the list is followed by 
+        a string, set the tail of the lxml element to the string 
+        """
+        for index,el in enumerate(els): 
+            # if we run into a string after the current element, 
+            # attach it to the current element as the tail 
+            if (type(el) is not type(str()) and 
+                index + 1 < len(els) and 
+                type(els[index+1]) is type(str())):
+                el.tail = els[index+1]   
+
+
+
+                
+

Deleted: /z3/deliverance/branches/packaged/deliverance/main.py
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/main.py	Mon Oct  9 22:03:44 2006
+++ (empty file)
@@ -1,157 +0,0 @@
-import os
-from lxml import etree
-from time import time
-from lxml.etree import Namespace, ElementBase, XMLParser
-try:
-    from lxml.etree import ElementNamespaceClassLookup
-except ImportError:
-    ElementNamespaceClassLookup = None
-
-nsmap = {
-    "dv": "http://www.plone.org/deliverance",
-    "html": "http://www.w3.org/1999/xhtml",
-    "xsl": "http://www.w3.org/1999/XSL/Transform",
-    "at": "http://plone.org/archetypes",
-    }
-
-parser = XMLParser()
-if ElementNamespaceClassLookup is not None:
-    # Earlier versions of lxml did class lookup in all
-    # cases; newer versions require this explicit parser
-    # setup
-    lookup = ElementNamespaceClassLookup()
-    parser.setElementClassLookup(lookup)
-
-class AppMap:
-
-    def __init__(self, layout_dir):
-        
-        # Open the appmap file, make a tree, and process XIncludes
-        self.module_dir = os.path.dirname(os.path.abspath(__file__))
-        self.layout_dir = os.path.join(self.module_dir, layout_dir)
-        layoutsfn = os.path.join(self.layout_dir, "appmap.xml")
-        self.tree = etree.ElementTree(
-            file=layoutsfn, parser=parser)
-        self.tree.xinclude()
-
-        # Make a themeprocessor to style all outgoing pages.  Note that the 
-        # .processor attribute comes from an lxml namespace binding, meaning it is 
-        # defined via a custom Python class defined below (class LayoutElement)
-        root = self.tree.getroot()
-        layout = root.xpath("dv:layouts/dv:layout", nsmap)[0]
-        #self.themeprocessor = make_processor(layout)
-        self.themeprocessor = layout.processor
-
-
-    def publish(self, xmlstring):
-        """Given a string of XML, theme it"""
-        
-        resource = etree.XML(xmlstring)
-        response = str(self.themeprocessor(resource))
-
-        return response
-
-# The following are extensions based on lxml namespace extensions.  It 
-# adds Python behavior to XML nodes.
-
-class DVRuleBase(ElementBase):
-
-    def getThemeNode(self):
-        """Get a node in the theme doc"""
-
-        # Current node is a rule, get xpath from the @theme attr
-        themedoc = self.xpath("../../dv:theme", nsmap)[0][0]
-        xpath = self.get("theme")
-        try:
-            themenode = themedoc.xpath(xpath, nsmap)[0]
-        except IndexError:
-            msg = "Themedoc has no node at: %s" % xpath
-            print msg
-            themenode = None
-
-        return themenode
-
-
-class LayoutElement(ElementBase):
-
-    def processor(self):
-        """Make XSLT processor by changing theme based on rules"""
-
-        # Apply all the rules
-        for rule in self.xpath("./dv:rules/*", nsmap):
-            rule.apply()
-
-        # Merge applied rules into compilerdoc
-        compilerroot = self.xpath("../dv:compiler/xsl:stylesheet", nsmap)[0]
-        themeroot = self.xpath("dv:theme/html:html", nsmap)[0]
-        target = compilerroot.xpath("xsl:template[@match='/']", nsmap)[0]
-        target.append(themeroot)
-
-        #print etree.tostring(compilerroot)
-
-        return etree.XSLT(compilerroot)
-    
-    processor = property(processor)
-        
-
-class RuleReplaceElement(DVRuleBase):
-
-    def apply(self):
-        # TODO: Someething here
-        themenode = self.getThemeNode()
-        if themenode is None:
-            return
-        del(themenode[:])
-        themenode.text = None
-        xslvalueof = etree.SubElement(themenode,
-                                      "{%s}value-of" % nsmap["xsl"])
-        xslvalueof.set("select", self.get("content"))
-
-
-class RuleCopyElement(DVRuleBase):
-
-    def apply(self):
-        themenode = self.getThemeNode()
-        if themenode is None:
-            return
-        del(themenode[:])
-        themenode.text = None
-        xslvalueof = etree.SubElement(themenode,
-                                      "{%s}apply-templates" % nsmap["xsl"])
-        xslvalueof.set("select", self.get("content"))
-
-
-class RuleAppendElement(DVRuleBase):
-
-    def apply(self):
-        themenode = self.getThemeNode()
-        if themenode is None:
-            return
-        xslvalueof = etree.SubElement(themenode,
-                                      "{%s}apply-templates" % nsmap["xsl"])
-        xslvalueof.set("select", self.get("content"))
-
-
-# Bind Python classes for lxml namespace support
-namespace = Namespace(nsmap['dv'])
-namespace['layout'] = LayoutElement
-namespace['replace'] = RuleReplaceElement
-namespace['copy'] = RuleCopyElement
-namespace['append'] = RuleAppendElement
-    
-
-def timeit(xmlstring):
-    appmap = AppMap()
-    start = time()
-    iters = 50
-    for i in range(iters):
-        result = appmap.publish(xmlstring)
-    print "*** Average time:", (time() - start) / iters, " ***\n"
-    print result[0:2000]
-    
-def main():
-    xmlstring = open("content/index.html").read()
-    timeit(xmlstring)
-    
-if __name__ == "__main__":
-    main()

Deleted: /z3/deliverance/branches/packaged/deliverance/mpfilter.py
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/mpfilter.py	Mon Oct  9 22:03:44 2006
+++ (empty file)
@@ -1,70 +0,0 @@
-"""
-Deliverance theming for mod_python filters
-
-Deliverance applies a theme to content.  This mod_python module acts as an 
-Apache "filter", transforming content as it passes through Apache.
-
-This module gets imported by mod_python during its startup.  Thus, the 
-appmap instance becomes a global, computed only once.  If you need to 
-recompute the theme, for example, restart the Apache.
-"""
-import time
-from cStringIO import StringIO
-
-from mod_python import apache
-from deliverance.main import AppMap
-appmap = AppMap() # Theme is generated once at module import time
-
-def outputfilter(filter):
-    if not hasattr(filter.req, 'notheme'):
-        # Check for a flag to not apply theme
-        args = filter.req.args
-        if args and args.find("notheme") > -1:
-            filter.req.notheme = True
-        else:
-            filter.req.notheme = False
-            
-    try:
-        streambuffer = filter.req.streambuffer
-    except AttributeError:
-        if filter.req.notheme:
-            # pass on if no theme
-            filter.pass_on()
-            return
-        elif not filter.req.headers_out.has_key("content-type"):
-            # pass on if no content type specified
-            filter.pass_on()
-            return
-        elif not filter.req.headers_out["content-type"].startswith("text/html"):
-            # pass on if not HTML
-            filter.pass_on()
-            return
-
-        filter.req.streambuffer = StringIO()
-        streambuffer = filter.req.streambuffer
-
-    streamlet = filter.readline()
-    while streamlet:
-        streambuffer.write(streamlet)
-        streamlet = filter.readline()
-
-    if streamlet is None:
-        output = appmap.publish(streambuffer.getvalue())
-        filter.req.headers_out["Content-Length"] = str(len(output))
-        filter.write(output)
-        filter.close()
-
-
-def handler(req):
-    """Basic filter applying to all mime types it is registered for"""
-
-    # Get the path, strip off leading slash, and convert to a 
-    # dotted notation for xml:id compatibility
-    path_info = req.path_info[1:]
-    dotted_path = path_info.replace("/", ".")
-
-    response = appmap.publish(dotted_path)
-    req.content_type = "text/html"
-    req.write(response)
-
-    return apache.OK

Deleted: /z3/deliverance/branches/packaged/deliverance/renderer.xsl
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/renderer.xsl	Mon Oct  9 22:03:44 2006
+++ (empty file)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:trois="http://www.plone.org/trois" xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns:at="http://plone.org/archetypes" exclude-result-prefixes="trois at html" version="1.0">
-    <xsl:output indent="yes"/>
-    <xsl:param name="pathinfo">localhello</xsl:param>
-    <xsl:param name="siteurl">/sandboxes/trois/trunk/deliverance/examples/plonenet.py</xsl:param>
-    <xsl:variable name="contentnode" select="id($pathinfo)"/>
-    <xsl:template match="/">
-        <html xmlns="http://www.w3.org/1999/xhtml">
-            <head>
-                <title>
-                    <xsl:value-of select="$contentnode/@title"/>
-                </title>
-            </head>
-            <body>
-                <div id="navtree">
-                    <xsl:apply-templates select="id('root')" mode="navtree"/>
-                </div>
-                <div id="pagecontent">
-                    <xsl:apply-templates select="$contentnode"/>
-
-                </div>
-
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template match="at:collection" mode="navtree">
-        <div
-            style="float:left; width: 10em; background-color: yellow; height: 10em; margin-right: 5em">
-            <h2 style="text-align: center">sitenav</h2>
-            <ul>
-                <xsl:for-each select=".//*[@name]">
-                    <li>
-                        <a href="{$siteurl}/{@name}">
-                            <xsl:value-of select="@title"/>
-                        </a>
-                    </li>
-                </xsl:for-each>
-            </ul>
-
-        </div>
-    </xsl:template>
-
-    <xsl:template match="at:providers">
-        <ul>
-            <li>Item one</li>
-            <xsl:for-each select="at:provider">
-                <li>
-                    <xsl:value-of select="@title"/>
-                </li>
-            </xsl:for-each>
-        </ul>
-    </xsl:template>
-    
-    <xsl:template match="at:provider">
-        <p>
-            <xsl:value-of select="@title"/>
-        </p>
-    </xsl:template>
-
-    <xsl:template match="at:localfile">
-        <xsl:copy-of select="html:html/html:body/*"/>
-    </xsl:template>
-    
-</xsl:stylesheet>

Added: z3/deliverance/branches/packaged/deliverance/test-data/nabuur/nabuur.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nabuur/nabuur.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,556 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="content-language" content="en" />
+<meta name="robots" content="index,follow" />
+<meta name="keywords" content="Volunteer, Volunteering, Online volunteer
+opportunities, Nabuur" />
+<meta name="description" content="1001 Online volunteering opportunities.
+Everyone has something important to offer. We need you. Check it out at
+NABUUR.COM!" />
+<meta name="rating" content="general" />
+<meta name="author" content="Nabuur" />
+<meta name="copyright" content="Copyright ? 2003 - 2004" />
+<title>Nabuur volunteer opportunities | Volunteer in Bukavu DR of the Congo</title>
+<link href="http://www.nabuur.com/favicon.ico" rel="SHORTCUT ICON" />
+
+<link rel="stylesheet" type="text/css" media="all" href="http://www.nabuur.com/xoops.css" />
+<link rel="stylesheet" type="text/css" media="all" href="http://www.nabuur.com/themes/nabuur_new/styleNN.css" />
+
+<style type="text/css">
+#fadeinbox{
+position:absolute;
+width: 300px;
+left: 0;
+top: -400px;
+border: 2px solid white;
+background-color: #7a0c14;
+color: white;
+padding: 4px;
+z-index: 100;
+visibility:hidden;
+}
+</style>
+
+
+<!-- script to include for enquete on homepage -->
+<!--<script src='http://www.nabuur.com/survey.js' language='javascript'></script>-->
+<SCRIPT type="text/javascript">
+<!--
+			/*
+		function checkCount() 
+		{ 
+			return false;
+
+			if (!locallink)
+			{
+				var count = GetCookie('count'); 
+				if (count == null) 
+				{ 
+					count=1; 
+					SetCookie('count', count, exp); 
+					window.open(page, "", windowprops); 
+				} 
+				else 
+				{ 
+					count++; 
+					SetCookie('count', count, exp); 
+				} 
+			}
+
+		}
+
+		function showlayernow()
+		{
+			count=1; 
+			SetCookie('count', count, exp); 
+			initfunction_enq(); 
+		}
+		
+		function checkCount2() 
+		{ 
+			var count = GetCookie('count'); 
+			if (count == null) 
+			{ 
+				setTimeout('showlayernow()', 20*1000);
+			} 
+			else 
+			{ 
+				count++; 
+				SetCookie('count', count, exp); 
+			} 
+		}
+*/
+//window.attachEvent("onload", checkCount2);
+//window.attachEvent("onunload", checkCount);
+
+function newImage(arg) {
+	if (document.images) {
+		rslt = new Image();
+		rslt.src = arg;
+		return rslt;
+	}
+}
+
+function changeImages() {
+	if (document.images && (preloadFlag == true)) {
+		for (var i=0; i<changeImages.arguments.length; i+=2) {
+			document[changeImages.arguments[i]].src = changeImages.arguments[i+1];
+		}
+	}
+}
+
+// -->
+</SCRIPT>
+<!-- RMV: added module header -->
+<script type="text/javascript">
+<!--
+//--></script><script type="text/javascript" src="http://www.nabuur.com/include/xoops.js"></script><script type="text/javascript"><!--
+
+//-->
+					
+			/*
+	var locallink=false;
+	function setupLinks()
+	{
+		for (var i=0;i<document.links.length;i++)
+		{
+			if ((document.links[i].href.substring(0, 4) != 'http') || (document.links[i].href.substring(0, 21) == 'http://www.nabuur.com') )
+			{
+				if(!document.links[i].onclick)
+				{
+					document.links[i].onclick = function(){ locallink = true; };
+				}
+			} 
+		}
+		
+		for (var i=0;i<document.forms.length;i++)
+		{
+			if (document.forms[i].name != 'chatForm')
+			{ document.forms[i].onsubmit = function(){ locallink = true;} }
+		}	
+		
+	}			
+	
+	window.attachEvent("onload", setupLinks);
+	window.attachEvent("onload", checkCount2);
+*/
+</script>
+<!--  onLoad="checkCount2(); setupLinks();" onUnload="checkCount();"-->
+</head>
+<body class="bodyHome printversion">
+
+	<script type="text/javascript"> 
+		var page = "http://www.nabuur.com/enquete_question1.php"; 
+		var windowprops = "width=700,height=400,location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes"; 
+		var expDays = 100;
+		
+		function GetCookie(name) 
+		{ 
+			var arg = name + "="; var alen = arg.length; 
+			var clen = document.cookie.length; 
+			var i = 0; 
+			while (i < clen) 
+			{ 
+				var j = i + alen; 
+				
+				if (document.cookie.substring(i, j) == arg) { return getCookieVal (j); }
+				
+				i = document.cookie.indexOf(" ", i) + 1; 
+				if (i == 0) { break };
+			} 
+			return null; 
+		} 
+		
+		function SetCookie(name, value) 
+		{ 
+			var argv = SetCookie.arguments; 
+			var argc = SetCookie.arguments.length; 
+			var expires = (argc > 2) ? argv[2] : null; 
+			var path = (argc > 3) ? argv[3] : null; 
+			var domain = (argc > 4) ? argv[4] : null; 
+			var secure = (argc > 5) ? argv[5] : false; 
+			
+			document.cookie = name + "=" + escape (value) + ((expires == null) ? "" : ("; expires=" + expires.toGMTString())) + ((path == null) ? "" : ("; path=" + path)) + ((domain == null) ? "" : ("; domain=" + domain)) + ((secure == true) ? "; secure" : ""); 
+		} 
+		function DeleteCookie(name) 
+		{ 
+			var exp = new Date(); 
+			exp.setTime (exp.getTime() - 1); 
+			var cval = GetCookie(name); 
+			document.cookie = name + "=" + cval + "; expires=" + exp.toGMTString(); 
+		} 
+		
+		var exp = new Date(); exp.setTime(exp.getTime() + (expDays*24*60*60*1000)); 
+			
+		function amt()
+		{ 
+			var count = GetCookie('count'); 
+			if(count == null) 
+			{ 
+				SetCookie('count','1');
+				return 1; 
+			} 
+			else 
+			{ 
+				var newcount = parseInt(count) + 1; 
+				DeleteCookie('count'); 
+				SetCookie('count',newcount,exp);
+				return count; 
+			}
+		} 
+		
+		function getCookieVal(offset) 
+		{ 
+			var endstr = document.cookie.indexOf(";", offset); 
+			if (endstr == -1) 
+			{ endstr = document.cookie.length; }
+			return unescape(document.cookie.substring(offset, endstr)); 
+		} 
+		
+
+	</script>
+<div id="force-scrollbar"></div> 
+<a name='top'></a>
+<div class='container'>
+
+		<!-- header -->
+		
+		<table bgcolor='#2a603e' style='border: 0px solid white; border-left: 1px solid white; border-right: 1px solid white; ' width=757 cellspacing=0 cellpadding=0 >
+			<tr><td width=200 rowspan=2><a href="http://www.nabuur.com" onFocus="this.blur()"><img style='border-right: 1px solid white;' width=200 height=46 src="http://www.nabuur.com/themes/nabuur_new/images/logo_new.gif" title="NABUUR.COM, the global Neighbour network" alt="NABUUR.COM, the global Neighbour network"  border="0" /></a></td>
+			<td colspan=14 align=center>
+			
+<!-- Ticker start -->
+
+<!-- Ticker end -->			
+			</td>
+			</tr>
+			<tr>
+			<td width=120></td>
+			<td class='headermenu' nowrap>&nbsp;</td>
+			<td class='headermenu' nowrap>&nbsp;</td>
+			<td class='headermenu' nowrap align=right>
+						<a href="http://www.nabuur.com/">Home</a>
+
+						
+			</td>
+			<td class='headermenu' nowrap align=center> 
+			|			</td>
+			<td class='headermenu' nowrap align=center>
+			<a class="headerlink" href="http://www.nabuur.com/search.php" onFocus="this.blur()">Search</a>
+			</td>
+			<td class='headermenu' nowrap align=center> 
+			| 
+			</td>
+
+			<td class='headermenu' nowrap align=center>
+			<a class="headerlink" href="http://www.nabuur.com/modules/freepage/article.php?articleid=5" onFocus="this.blur()">About NABUUR.COM</a>
+			</td>
+			<td class='headermenu' nowrap align=center> 
+			| 
+			</td>
+			<td class='headermenu2' nowrap align=center>
+			<a class="headerlink2" href="http://www.nabuur.com/modules/freepage/article.php?articleid=4" onFocus="this.blur()">what can I do?</a>
+			</td>
+
+			<td class='headermenu' nowrap align=center> 
+			| 
+			</td>
+			<td class='headermenu' nowrap align=center>
+			<a class="headerlink" href="http://www.nabuur.com/user.php?xoops_redirect=%2Fmodules%2Fvillages_issues%2Findex.php%3Fvillageid%3D235" onFocus="this.blur()">Login</a>
+			</td>
+			<td class='headermenu' nowrap align=center> 
+			| 
+			</td>
+			<td class='headermenu' nowrap align=center>
+
+			<a class="headerlink" href="http://www.nabuur.com/register.php" onFocus="this.blur()">Join now</a>
+			</td>
+			<td class='headermenu' nowrap></td>
+			</tr>
+		</table>
+
+
+							
+		<div class='content printversion'>
+
+				<!-- leftcenterblock - use as top row -->
+
+				
+												
+				
+				
+				<!-- left row  + content block -->
+				<table style='border-left: 1px solid white; border-right: 0px solid white; border-top: 0px; border-bottom: 0px solid white;' width=755 border=0 cellspacing=0 cellpadding=0>
+				<tr><td><table cellspacing=0 cellpadding=0 border=0 width=755 style='border-right: 0px solid white;'>
+				<tr>
+				
+					
+							
+										
+															<td width='754' bgcolor='#FFFFFF' valign=top> <!-- <td width='754' bgcolor='#7e5501' valign=top> -->
+													
+					<!-- content -->
+		        	<script type="text/javascript" src="http://www.nabuur.com/modules/villages_issues/checks.js"></script>
+<table class="tbl_village_white" cellpadding="0" cellspacing="0" border="0" style='border-top: 1px solid white; '>
+
+	<tr>
+		<td colspan="2" class="td_top_bar" valign="middle"><div id="village_breadcrumb1"><a style="text-decoration:none; " href="http://www.nabuur.com/modules/villages_issues/index.php?villageid=235"><span class="breadCrumbVillagename">Bukavu</span></a>&nbsp;&nbsp;&nbsp;
+		<a href="http://www.nabuur.com">Home</a>&raquo;<a href="http://www.nabuur.com/modules/villages/list_continent_villages.php?continentid=Africa">Africa</a>&raquo;<a href="http://www.nabuur.com/modules/villages/list_country_villages.php?countryid=13">DR of the Congo</a>&raquo;<a href="http://www.nabuur.com/modules/villages_issues/index.php?villageid=235">Bukavu</a>&raquo;<a href="http://www.nabuur.com/modules/villages_issues/index.php?villageid=235" style="text-decoration:none;" >Issue</a>
+						
+				</div>
+		</td>	
+
+	</tr>
+
+	<tr>
+		<td colspan="2" height="25" style="margin:0px; background-image:url(http://www.nabuur.com/images/vtabs_1_white.gif); background-position:left; background-repeat: no-repeat;background-color: #996600; "><table class="tbl_tab_village" cellpadding="0" cellspacing="0" border="0" >
+			<tr>
+					<td class="td_tab_end"></td>
+					<td class="td_tab_text_white" ><a href="http://www.nabuur.com/modules/villages_issues/index.php?villageid=235" onFocus='this.blur();' style="display: block; width: 120px; height: 20px; text-align: middle; padding-top: 5px; text-decoration: none; color: #663300;">Issue</a></td>
+					<td class="td_tab_text" ><a href="http://www.nabuur.com/modules/villages_home/locallife.php?villageid=235" onFocus='this.blur();' style="display: block; width: 120px; height: 20px; text-align: middle; padding-top: 5px; text-decoration: none">Stories &amp; Photos</a></td>
+					<td class="td_tab_text" ><a href="http://www.nabuur.com/modules/neighbors_village/list_neighbors_village.php?villageid=235" onFocus='this.blur();' style="display: block; width: 120px; height: 20px; text-align: middle; padding-top: 5px; text-decoration: none">Neighbours</a></td>
+
+					<td class="td_tab_text" ><a href="http://www.nabuur.com/modules/villages_home/whatsnew.php?villageid=235" onFocus='this.blur();' style="display: block; width: 120px; height: 20px; text-align: middle; padding-top: 5px; text-decoration: none">What&acute;s new</a></td>
+							
+					<td width="50"></td>
+			</tr>
+		</table></td>
+	</tr>
+	<tr><td colspan="2" height="10"></td></tr>					
+			<tr><td align="left" valign="top"><table cellpadding="0" cellspacing="0" border="0">
+					<tr>
+
+				<td width="260" valign="top" align="center"><table cellpadding="0" cellspacing="0" border="0" width="213">
+										<tr><td class="titleBigWhite_white" align="left">Bukavu: Women and young girls victims of violence</td></tr>
+					<tr>
+						<td class="td_text_village_white">The context of war which characterized the city of Bukavu during several years has caused a procession of violence of all kinds. Its principal victims have been women and young girls. The large number of women and girls that fell victim to violence, rape, prostitution and abandonment is a big issue in the community.												<a style="color: #663300; " href="http://www.nabuur.com/modules/villages_issues/index.php?villageid=235&amp;rm=issue&amp;issueId=332">Read more...</a></td>
+											</tr>
+					<tr><td height="30">&nbsp;</td></tr>	
+					<tr>
+						<td valign="middle" align="center"><table cellpadding="5" cellspacing="0" border="0"  width="213" style="background-color: #7a0c14 ">
+
+							<tr>
+								<td align="center" valign="middle" style="cursor: hand; cursor: pointer; " onClick="javascript:window.location='http://www.nabuur.com/register.php?villageid=235&redirect_page=%2Fmodules%2Fvillages_issues%2Findex.php%3Fvillageid%3D235'"><span style="font-size: 12px; font-weight:bold">Help Bukavu<br /><a href="http://www.nabuur.com/register.php?villageid=235&redirect_page=%2Fmodules%2Fvillages_issues%2Findex.php%3Fvillageid%3D235">Join as an online volunteer</a></span></td>
+							</tr>
+						</table></td>
+					</tr>
+				</table></td>
+				<td width="12" style="border-right: 1px solid #996600; ">&nbsp;</td>
+				<td width="477" valign="top" align="center"><table cellpadding="0" cellspacing="0" border="0" width="455">				
+											<tr>
+
+							<td class="td_overview_left_village_fac" valign="top" rowspan=3> 
+	<div style="position: relative; width: 60px; height:90px; top:3px; left: 0px;">
+	<div style="position: absolute; top: 0px; left: 0px; text-align:left "><a href="http://www.nabuur.com/userinfo.php?uid=4435"><img src="http://www.nabuur.com/uploads/cavt441c3b18e9c49.jpg" alt="The Local Representative represents the people of Bukavu  on these web pages" title="The Local Representative represents the people of Bukavu  on these web pages"  width="60" height="75" align="left" /></a></div>
+	</div>
+	<div class="td_avatar_white"><a style="color: #663300; " href="http://www.nabuur.com/userinfo.php?uid=4435"><strong>Amina Gis?le</strong><br /></a>Local Representative		</div>
+								</td>
+							<td class="titleBigWhite_white" align="left" height="25">Focus: Setting up a Women Trauma and Care Centre</td>
+						</tr>
+
+						<tr>
+							<td class="td_text_village_white">100 women have united in ?Women Against Violence?. Their ambition is to start a Women Trauma and Care Centre. The Centre will assist women victims of violence and abuse. It will give them a space where they can see hope again, know about their health, learn self-help skills and help each other campaign for their rights.																<a style="color: #663300; " href="/modules/villages_issues/index.php?villageid=235&amp;rm=focus&amp;focusId=361">Read more...</a>
+																	
+																</td>
+						</tr>		
+						<tr><td colspan="2" style="height:10px; border-bottom: 1px solid; border-color: #996600; ">&nbsp;</td></tr>
+						<tr><td colspan="2" style="height:10px; "></td></tr>						
+						<tr><td class="td_overview_left_village_fac" rowspan=3 align="left">
+						 
+	<div style="position: relative; width: 60px; height:90px; top:3px; left: 0px;">
+	<div style="position: absolute; top: 0px; left: 0px; text-align:left "><a href="http://www.nabuur.com/userinfo.php?uid=5591"><img src="http://www.nabuur.com/uploads/cavt444fc2c1d0d5f.jpg" alt="The Facilitator is an online volunteer who coordinates the efforts of the other volunteers ('Neighbours') of this Village" title="The Facilitator is an online volunteer who coordinates the efforts of the other volunteers ('Neighbours') of this Village"  width="60" height="75" align="left" /></a></div>
+
+	</div>
+	<div class="td_avatar_white"><a style="color: #663300; " href="http://www.nabuur.com/userinfo.php?uid=5591"><strong>Maria Samper</strong><br /></a>Facilitator		<br /><a style="color: #663300; " href="http://www.nabuur.com/modules/neighbors_village/list_neighbors_village.php?villageid=235&amp;facilitatorId=5591">contact</a>
+		</div>
+	</td>
+						<td class="titleBigWhite_white" height="25" valign="top" align="left">Here&acute;s what YOU can do</td></tr>
+						<tr>
+
+						<td class="td_text_village_white" valign="top"><table cellpadding="0" cellspacing="0" border="0" width="315" >
+							<tr><td colspan="2"><a style="color: #663300; font-weight: bold;" href="http://www.nabuur.com/modules/villages_issues/index.php?villageid=235&amp;actionId=4821">Contact organizations that can provide our village with useful information to create a good project proposal and that could guide us on how to establish a succesful trauma center.</a></td></tr><tr><td colspan="2" height="10"></td></tr>									<tr><td width="10" valign="top" style="color: #663300;">&raquo;</td><td><a style="color: #663300;" href="http://www.nabuur.com/modules/villages_issues/index.php?villageid=235&amp;rm=focus&amp;focusId=361#results">See the results of earlier actions</a></td></tr>
+																<tr><td width="10" valign="top" style="color: #663300;">&raquo;</td><td><a style="color: #663300;" href="http://www.nabuur.com/modules/villages_newsletter/index.php?villageid=235">Subscribe to the Bukavu newsletter</a></td></tr>
+						</table>
+						</td></tr>
+						<tr><td colspan="2" style="height:10px; border-bottom: 1px solid; border-color: #996600; ">&nbsp;</td></tr>
+						<tr><td colspan="2" style="height:10px; "></td></tr>	
+												</table></td></tr>
+
+										
+				
+				</table></td>
+			</tr>
+			<tr><td height="10"></td></tr>
+			
+		</table>
+<script type="text/javascript">
+	var svi = false;
+</script>
+				
+				</td>
+				
+									
+											
+											
+											
+											
+											
+											
+							
+																														</tr>				
+				</table>				
+				</td></tr>
+				</table>
+
+				<!-- rightcenterblock - use as bottom row -->
+				
+				
+																
+				
+		</div>
+
+						<!-- footer -->
+		<table width=757  bgcolor='#2a603e' cellspacing=0 cellpadding=0 style='border: 0px solid white; border-top: 1px solid white; border-bottom: 1px solid white; border-left: 1px solid white; border-right: 1px solid white;'>
+			
+			<tr><td height=6></td></tr>	
+
+			<tr><td align=center class='footermenu'>
+			Volunteering in : 
+			<a href='http://www.nabuur.com/modules/villages/list_continent_villages.php?continentid=Africa'>Africa</a>
+
+			 - 
+			<a href='http://www.nabuur.com/modules/villages/list_continent_villages.php?continentid=Asia'>Asia</a>
+			 - 
+			<a href='http://www.nabuur.com/modules/villages/list_continent_villages.php?continentid=Americas'>America</a>
+			</td></tr>
+			<tr><td align=center class='footermenu'>
+			<a class="footerlink" href="http://www.nabuur.com/modules/freepage/article.php?articleid=5" onFocus="this.blur()">About NABUUR.COM</a>
+			 - 
+			 <a class="footerlink" href="http://www.nabuur.com/modules/freepage/article.php?articleid=4" onFocus="this.blur()">What can I do?</a>
+
+			 - 
+			 <a class="footerlink" href="http://www.nabuur.com/modules/freepage/article.php?articleid=7" onFocus="this.blur()">Policy</a>
+			 - 
+			<a class="footerlink" href="http://www.nabuur.com/modules/xoopsfaq" onFocus="this.blur()">FAQ</a>
+			 - 
+			<a class="footerlink" href="http://www.nabuur.com/modules/contact/" onFocus="this.blur()">Contact</a>
+			 - 
+			<a class="footerlink" href="http://www.nabuur.com/sitemap/index.html" onFocus="this.blur()">Sitemap</a>
+			
+			<!-- - 
+			<a class="footerlink" href="#" onFocus="this.blur()">Sitemap</a>  --> 
+			 - 
+			<a class="footerlink" href="http://www.nabuur.com" onFocus="this.blur()">Home</a>   
+			</td></tr>
+
+			<tr><td align=center class='footermenu'>
+			<a href='http://www.nabuur.com'>NABUUR.COM - Online Volunteering</a>
+			</td></tr>		
+			<tr><td height=6></td></tr>	
+
+			<!--
+			<tr>
+			<td class='footermenu' width=200>&nbsp;
+			
+			&nbsp;<a title='Print this page' href='javascript:window.print();'><img src='http://www.nabuur.com/images/print_home.gif' height=13 border=0></a>
+			&nbsp;&nbsp;
+			<a title='Tell a friend' href='mailto:?subject=Tell a Friend&body=Thought you would find the following website interesting:  
+			http://www.nabuur.com/modules/villages_issues/index.php?villageid=235'><img src='http://www.nabuur.com/images/email_home.gif' height=13 border=0></a>
+			
+			</td>	
+			<td class='footermenu' width=100>&nbsp;
+				
+			</td>	
+			<td class='footermenu' nowrap>
+								&nbsp;
+							</td>
+			<td class='footermenu' nowrap>
+								&nbsp;
+								
+			</td>
+			<td class='footermenu2' nowrap>
+								&nbsp;
+							</td>
+			<td class='footermenu' nowrap>
+								&nbsp;
+							</td>
+			<td class='footermenu' nowrap>
+								&nbsp;
+							</td>
+			<td class='footermenu' nowrap>
+								&nbsp;
+							</td>	
+			<td class='footermenu' nowrap>
+								&nbsp;
+							</td>
+			<td class='footermenu' nowrap>
+								&nbsp;
+							</td>	
+			<td class='footermenu' nowrap>
+								&nbsp;
+							</td>
+			</tr>
+			-->
+		</table>
+		
+	
+		
+</div>
+
+</DIV>
+
+<!--ONESTAT SCRIPTCODE START-->
+
+<script type="text/javascript">
+<!--
+// Account ID : 279277
+// Website URL: http://www.nabuur.com
+// Copyright (C) 2002-2006 OneStat.com All Rights Reserved
+function OneStat_Pageview()
+{
+    var d=document;
+    var sid="279277";
+    var CONTENTSECTION="";
+    var osp_ACTION="";
+    var osp_TRANSACTION="";
+    var osp_AMOUNT="";
+    var osp_PRODUCTCODE="";
+    var osp_PRODUCTGROUP="";
+    var osp_ADCAMPAIGN="";
+    var osp_URL=d.URL;
+    var osp_Title=d.title;
+    var t=new Date();
+    var p="http"+(d.URL.indexOf('https:')==0?'s':'')+"://stat.onestat.com/stat.aspx?tagver=2&sid="+sid;
+    p+="&url="+escape(osp_URL);
+    p+="&ti="+escape(osp_Title);
+    p+="&section="+escape(CONTENTSECTION);
+    p+="&cma="+escape(osp_ACTION);
+    p+="&cmt="+escape(osp_TRANSACTION);
+    p+="&cmm="+escape(osp_AMOUNT);
+    p+="&cmp="+escape(osp_PRODUCTCODE);
+    p+="&cmg="+escape(osp_PRODUCTGROUP);
+    p+="&cmad="+escape(osp_ADCAMPAIGN);
+    p+="&rf="+escape(parent==self?document.referrer:top.document.referrer);
+    p+="&tz="+escape(t.getTimezoneOffset());
+    p+="&ch="+escape(t.getHours());
+    p+="&js=1";
+    p+="&ul="+escape(navigator.appName=="Netscape"?navigator.language:navigator.userLanguage);
+    if(osp_URL!=d.URL) p+="&ol="+escape(d.URL);
+    if(typeof(screen)=="object"){
+       p+="&sr="+screen.width+"x"+screen.height;p+="&cd="+screen.colorDepth;
+       p+="&jo="+(navigator.javaEnabled()?"Yes":"No");
+    }
+    d.write('<img id="ONESTAT_TAG" border="0" width="1" height="1" src="'+p+'" >');
+}
+
+OneStat_Pageview();
+//-->
+</script>
+<noscript>
+<a href="http://www.onestat.com"><img border="0" width="1" height="1" src="http://stat.onestat.com/stat.aspx?tagver=2&amp;sid=279277&amp;js=No&amp;" ALT="OneStat.com Web Analytics"></a>
+</noscript>
+<!--ONESTAT SCRIPTCODE END-->
+</body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/nabuur/nabuur.theme
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nabuur/nabuur.theme	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,6 @@
+
+<!-- helper file for doing hand transforms with this theme -->
+<blend 
+   theme="./test-data/nabuur/nabuur.html" 
+   baseurl="http://www.nabuur.com" 
+   rules="./test-data/nabuur/rules.xml" /> 

Added: z3/deliverance/branches/packaged/deliverance/test-data/nabuur/rules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nabuur/rules.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+  <xi:include href="standardrules.xml" />
+
+  <copy theme="//table[@class='tbl_village_white']/tr[4]/td[1]" content="//table[@id='portal-columns']" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/nabuur/standardrules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nabuur/standardrules.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
+  <prepend theme="//head" content="//head/link" /> 
+  <prepend theme="//head" content="//head/style" /> 
+  <append theme="//head" content="//head/script" />    
+  <append theme="//head" content="//head/meta" />
+  <append-or-replace theme="//head" content="//head/title" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.theme
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.theme	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,7 @@
+
+<!-- helper file for doing hand transforms with this theme --> 
+
+<blend 
+   theme="http://www.nycsr.org" 
+   baseurl="http://www.nycsr.org" 
+   rules="./test-data/nycsr/nycsr.xml" /> 

Added: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+  <xi:include href="standardrules.xml" />
+
+  <copy theme="//div[@id='container']" content="//table[@id='portal-columns']" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr_expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr_expected.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,409 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3910.css); --></style>
+<style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles7546.css); --></style>
+<style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3831.css); --></style>
+<link rel="alternate stylesheet" type="text/css" media="screen" href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3993.css" title="Small Text">
+<link rel="alternate stylesheet" type="text/css" media="screen" href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles5069.css" title="Large Text">
+<link rel="alternate stylesheet" type="text/css" media="screen" href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3656.css" title="Small Text">
+<link rel="alternate stylesheet" type="text/css" media="screen" href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles8929.css" title="Large Text">
+<link rel="shortcut icon" type="image/x-icon" href="http://www.openplans.org/favicon.ico">
+<link rel="home" href="http://www.openplans.org" title="Front page">
+<link rel="search" title="Search this site" href="http://www.openplans.org/search_form">
+<link rel="author" title="Author information" href="http://www.openplans.org/author/Jacqueline">
+<link rel="contents" href="http://www.openplans.org/sitemap" title="Site Map">
+<link rel="up" href="http://www.openplans.org/projects" title="Up one level">
+<meta name="author" content="New York City Streets Renaissance">
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="generator" content="BBEdit 8.2">
+<meta name="MSSmartTagsPreventParsing" content="true">
+<meta name="robots" content="all">
+<style type="text/css" media="screen">@import url(http://www.nycsr.org/css/style.css);</style>
+<style type="text/css" media="screen">@import url(http://www.nycsr.org/css/nav.css);</style>
+<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = function() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	</script><script src="http://www.nycsr.org/js/gallery.js" type="text/javascript" language="javascript"></script><!-- image fade: http://www.dynamicdrive.com/dynamicindex14/fadeinslideshow.htm --><script type="text/javascript" src="http://www.openplans.org/projects/nycstreets/openplans.js"></script><script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts6565.js">
+                </script><script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts0569.js">
+                </script><meta name="generator" content="Plone - http://plone.org">
+<meta http-equiv="imagetoolbar" content="no">
+<title>
+        NYCSR 
+        ???
+        OpenPlans
+    </title>
+</head>
+<body id="page-home" class="index">
+<!-- Header --><div id="header"><h1 class="logo"><a href="http://www.nycsr.org/"><span>The New York City Streets Renaissance</span></a></h1></div>
+<!-- / Header --><hr>
+<script type="text/javascript"><!--//--><![CDATA[//><!--
+startList = function() {
+	if (document.all&&document.getElementById) {
+		navRoot = document.getElementById("menu");
+		for (i=0; i<navRoot.childNodes.length; i++) {
+			node = navRoot.childNodes[i];
+			if (node.nodeName=="LI") {
+				node.onmouseover=function() {
+					this.className+=" over";
+				}
+				node.onmouseout=function() {
+					this.className=this.className.replace(" over", "");
+				}
+			}
+		}
+	}
+}
+window.onload=startList;
+
+//--><!]]></script><!-- Top Level Links --><div id="toplevel"><ul class="links">
+<li id="top-home"><a href="http://www.nycsr.org/"><strong><span>Home Page</span></strong></a></li>
+<li id="top-join"><a href="http://www.nycsr.org/involved/join.php"><strong><span>Join Us</span></strong></a></li>
+</ul></div>
+<!-- / Top Level Links --><!-- Navigation Bar --><div id="nav">
+<ul id="menu" class="tabs">
+<li id="nav-who">
+<a href="http://www.nycsr.org/who/"><strong><span>Who We Are</span></strong></a><ul class="sub">
+<li><a href="http://www.nycsr.org/who/supporters.php"><span>Supporters List</span></a></li>
+<li><a href="http://www.nycsr.org/who/contact.php"><span>Contact Us</span></a></li>
+</ul>
+</li>
+<li id="nav-nyc">
+<a href="http://www.nycsr.org/nyc/"><strong><span>New York Streets</span></strong></a><ul class="sub">
+<li><a href="http://www.nycsr.org/nyc/truth.php"><span>The Truth About Traffic</span></a></li>
+<li><a href="http://www.nycsr.org/nyc/broken.php"><span>Broken Streets</span></a></li>
+<li><a href="http://www.nycsr.org/nyc/building.php"><span>Building on Progress</span></a></li>
+<li><a href="http://www.nycsr.org/nyc/video.php"><span>Video Gallery</span></a></li>
+<li><a href="http://www.nycsr.org/nyc/photo.php"><span>Photo Gallery</span></a></li>
+</ul>
+</li>
+<li id="nav-lessons">
+<a href="http://www.nycsr.org/lessons/"><strong><span>Global Lessons</span></strong></a><ul class="sub">
+<li><a href="http://www.nycsr.org/lessons/chicago.php"><span>Chicago</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/philadelphia.php"><span>Philadelphia</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/london.php"><span>London</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/paris.php"><span>Paris</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/copenhagen.php"><span>Copenhagen</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/great.php"><span>What Makes a Great Street?</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/benefits.php"><span>The Benefits of Great Streets</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/photo.php"><span>Photo Gallery</span></a></li>
+</ul>
+</li>
+<li id="nav-involved">
+<a href="http://www.nycsr.org/involved/"><strong><span>Get Involved</span></strong></a><ul class="sub">
+<li><a href="http://www.nycsr.org/involved/join.php"><span>Join Us</span></a></li>
+<li><a href="http://www.nycsr.org/involved/ways.php"><span>Ways to Get Involved</span></a></li>
+<li><a href="http://www.nycsr.org/involved/resources.php"><span>Resources</span></a></li>
+</ul>
+</li>
+<li id="nav-events"><a href="http://www.nycsr.org/events/"><strong><span>Events</span></strong></a></li>
+</ul>
+<div class="clear"></div>
+</div>
+<!-- / Navigation Bar --><hr>
+<!-- Container --><div id="container"><table id="portal-columns"><tbody><tr>
+<td id="portal-column-content">
+
+                    
+                      <div id="content" class="documentEditable">
+
+                        
+                          
+
+        <h5 class="hiddenStructure">Views</h5>
+
+        <ul class="contentViews">
+<li id="contentview-view" class="selected">
+                <a href="http://www.openplans.org/projects/nycstreets/project-home">View</a>
+              </li>
+
+            
+            
+              <li id="contentview-edit" class="plain">
+                <a href="http://www.openplans.org/projects/nycstreets/project-home/edit">Edit</a>
+              </li>
+            
+
+        </ul>
+<div class="contentActions">
+
+        
+
+        
+
+        
+
+
+
+
+
+    </div>
+                        
+
+                        <div class="documentContent" id="region-content">
+
+                          <a name="documentContent"></a>
+
+                          
+
+                          
+
+                          
+    
+
+        <div class="documentActions">
+    
+
+    <h5 class="hiddenStructure">Document Actions</h5>
+
+    <ul>
+<li>
+            <a href="http://www.openplans.org/projects/nycstreets/project-home/sendto_form">
+
+                <img src="http://www.openplans.org/mail_icon.gif" alt="Send this page to somebody" title="Send this page to somebody"></a>
+        </li>
+    
+    
+        <li>
+            <a href="javascript:this.print();">
+
+                <img src="http://www.openplans.org/print_icon.gif" alt="Print this page" title="Print this page"></a>
+        </li>
+
+    
+
+    </ul>
+</div>
+
+        <h1 class="documentFirstHeading">NYCSR </h1>
+    
+        <div>
+
+    <div class="documentByLine">
+        
+
+        
+
+        <span>
+        last modified
+        </span>
+
+        2006-09-15 11:18
+
+        
+
+        
+
+        
+
+        
+
+        <div class="reviewHistory">
+    
+</div>
+
+    </div>
+
+</div>
+
+        
+    
+
+    
+        <div class="plain">
+            <h2 class="heading">
+<b>Welcome to the NYC Streets Renaissance Campaign Headquarters</b><br>
+</h2>
+<h3 class="subheading">The goal of the NYCSR is to tranform New York City streets so that they are safer, more productive and more livable. </h3>
+<p><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Sociable%20Men-1.jpg" height="200" width="314"><b><em>Streets can be places for neighbors to meet</em></b></p>
+<p>New York City is defined by its vibrant and diverse streets and neighborhoods. Unfortunately, our neighborhoods and business districts are buckling under increasing amounts of dangerous car and truck  traffic.  Children can no longer 
+  
+     
+      
+	<span class="wicked_resolved" id="text-860339cd275a35aed13ed4d80e8a8ff6">
+
+	  <a href="http://www.openplans.org/projects/nycstreets/play-on-their-own-blocks">
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif"><span class="chunk">play on their own blocks</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+, while parents worry about turning cars smashing into baby carriages. Senior citizens are losing their independence, shut up in their homes for fear of crossing the street.   And shoppers and investors are being turned away by chaotic, traffic-choked avenues.  </p>
+<p>This is unacceptable. <strong>The time is long overdue for our great city to strike a better balance between traffic and the needs of pedestrians.   </strong></p>
+<p>The <strong>NYC Streets Renaissance Campaign</strong> aims to: </p>
+<ul type="disc">
+<li>
+<b>Educate</b> New Yorkers about potential transportation policy changes that will improve quality of life across New York City</li>
+<li>
+<b>Promote</b> a rebalancing of this public space away from private vehicles and toward community needs</li>
+<li>
+<b>Demonstrate</b> the widespread public support for reform on these issues</li>
+<li>
+<b>Tap </b>the potential of New Yorkers to re-imagine their own streets</li>
+</ul>
+<p><strong></strong></p>
+<p><strong>Our Initiatives:</strong></p>
+<ul type="none">
+<li>Official launch with an <a title="MAS Exhibition Preparations" href="../mas/project-home" target="_self">exhibition</a>/event at the Municipal Arts Society</li>
+<li>Preparation of a multimedia information packet, including a <a title="inclusionletter" href="inclusionletter" target="_self">inclusion letter</a>, a dvd featuring <a title="TOPP: video production" href="../topp-video-production/project-home" target="_self">Clarence's work</a>, and a intro booklet</li>
+<li>Improvements <a title="website building" href="website-building" target="_self">requested</a> for the <a href="http://www.nycsr.org/" target="_self">nycstreets.org </a>homepage</li>
+<li>Host many <a title="Postcard Revised" href="../mas/mas-nycsr-postcard-revision-2.pdf" target="_self">events</a> to supplement our exhibition at the MAS.</li>
+<li>Promote and distribute 
+  
+     
+      
+	<span class="wicked_resolved" id="text-401890cd2f8c74f7d8106ecbddde78fe">
+
+	  <a href="http://www.openplans.org/projects/nycstreets/studies-and-papers">
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif"><span class="chunk">studies and papers</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+ <a href="../studies-and-papers"></a>that dispel myths of streets and transit in NYC.</li>
+</ul>
+<p></p>
+<p></p>
+<ul type="none"><li>Help neighborhood leaders in the fight for long overdue, common sense improvements to their neighborhood streets</li></ul>
+<p></p>
+<p><strong></strong></p>
+<p><strong>To get involved</strong>, add your ideas for making New York City a better place to live and work to our Taking it Citywide 
+  
+     
+      
+	<span class="wicked_resolved" id="text-215018586e8c7cf5386a1bdcdae59e1a">
+	  <a href="http://www.openplans.org/projects/nycstreets/neighborhoods">
+
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif"><span class="chunk">Neighborhoods</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+ page, or visit us at <a href="http://www.nycsr.org/involved.php">http://www.nycsr.org/involved.php</a> </p>
+<p></p>
+<p></p>
+<p></p>
+<p></p>
+<p><a title="old landing page" href="old-landing-page" target="_self">old landing page </a><br></p>
+<p><br></p>
+<p><strong>Together, we can re-imagine the streets of New York City.</strong></p>
+
+
+<!-- <p>Grand Street Before:<br /><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Grand_street_Before-1.jpg" height="237" width="501" /><br /></p><p></p><p>Grand Street Re-imaged as public space:</p><p><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Grand_street_AFTER-1.jpg" height="336" width="800" /></p> --> 
+        </div>
+
+        <div class="visualClear"><!-- --></div>
+
+        
+
+	
+	
+
+        
+        <div id="relatedItems">
+    
+        
+            
+        
+    
+</div>
+    
+    
+
+
+                          
+                            <div class="discussion">
+    
+        
+            
+            
+
+        
+    
+</div>
+                          
+
+                        </div>
+
+                      </div>
+
+                    
+                  </td>
+                  
+
+                  
+                  
+                  
+                </tr></tbody></table></div>
+<!-- / Container --><hr>
+<!-- Footer --><div id="footer">
+<p class="links">
+		[ 
+		<a href="http://www.nycsr.org/"><span>Home</span></a> 
+		| 
+		<a href="http://www.nycsr.org/who/"><span>Who We Are</span></a> 
+		| 
+		<a href="http://www.nycsr.org/nyc/"><span>New York Lessons</span></a> 
+		| 
+		<a href="http://www.nycsr.org/lessons/"><span>Global Lessons</span></a> 
+		| 
+		<a href="http://www.nycsr.org/involved/"><span>Get Involved</span></a> 
+		| 
+		<a href="http://www.nycsr.org/events/"><span>Events</span></a> 
+		| 
+		<a href="http://www.nycsr.org/involved/join.php"><span>Join Us</span></a> 
+		]
+		</p>
+<p class="cc"><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="http://www.nycsr.org/img/logos/cc.png" class="logo"><br>
+				These works are licensed under a Creative Commons License
+			</a></p>
+<!--
+		<rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+			<Work rdf:about="">
+				<license rdf:resource="http://creativecommons.org/licenses/by-nc-nd/2.5/" />
+				<dc:type rdf:resource="http://purl.org/dc/dcmitype/Text" />
+			</Work>
+			<License rdf:about="http://creativecommons.org/licenses/by-nc-nd/2.5/">
+				<permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+				<permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+				<requires rdf:resource="http://web.resource.org/cc/Notice"/>
+				<requires rdf:resource="http://web.resource.org/cc/Attribution"/>
+				<prohibits rdf:resource="http://web.resource.org/cc/CommercialUse"/>
+			</License>
+		</rdf:RDF>
+		-->
+</div>
+<!-- / Footer -->
+</body>
+</html>
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/openplans.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/openplans.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,648 @@
+
+  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en">
+
+<head>
+    <meta http-equiv="Content-Type"
+          content="text/html;charset=utf-8" />
+
+    <title>
+        NYCSR 
+        &mdash;
+        OpenPlans
+    </title>
+
+    
+    
+      <base href="http://www.openplans.org/projects/nycstreets/project-home/" />
+    
+  
+
+    <meta name="generator" content="Plone - http://plone.org" />
+
+
+
+
+    <!--//openplans JS add//-->
+    <script type="text/javascript" src="http://www.openplans.org/projects/nycstreets/openplans.js"></script>
+
+    <!-- Plone ECMAScripts -->
+    
+        
+            
+                <script type="text/javascript"
+                        src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts6565.js">
+                </script>
+                
+            
+            
+                <script type="text/javascript"
+                        src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts0569.js">
+                </script>
+                
+            
+        
+    
+
+    
+        
+            
+                
+                    
+                    
+                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3910.css); --></style>
+                    
+                    
+                
+            
+            
+                
+                    <link rel="alternate stylesheet"
+                          type="text/css" media="screen"
+                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3993.css"
+                          title="Small Text" />
+                    
+                    
+                
+            
+            
+                
+                    <link rel="alternate stylesheet"
+                          type="text/css" media="screen"
+                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles5069.css"
+                          title="Large Text" />
+                    
+                    
+                
+            
+            
+                
+                    
+                    
+                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles7546.css); --></style>
+
+                    
+                    
+                
+            
+            
+                
+                    <link rel="alternate stylesheet"
+                          type="text/css" media="screen"
+                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3656.css"
+                          title="Small Text" />
+                    
+                    
+                
+            
+            
+                
+                    <link rel="alternate stylesheet"
+                          type="text/css" media="screen"
+                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles8929.css"
+                          title="Large Text" />
+                    
+                    
+                
+            
+            
+                
+                    
+                    
+                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3831.css); --></style>
+                    
+                    
+                
+            
+        
+    
+    
+    <!-- Internet Explorer CSS Fixes + IE7 for compliance fixes (limited set) -->
+    <!--[if lt IE 7]>
+        <style type="text/css" media="all">@import url(http://www.openplans.org/IEFixes.css);</style>
+    <![endif]-->
+
+    <link rel="shortcut icon" type="image/x-icon"
+          href="http://www.openplans.org/favicon.ico" />
+
+    <!-- Put this inside iefixstart to apply the IE7 script. It will be very slow, and currently
+         breaks with plonePrint.css and plonePresentation.css for unknown reasons.
+        <script src="ie7-standard.js" type="text/javascript" tal:attributes="src string:$portal_url/ie7/ie7-standard.js"></script>
+    -->
+
+
+    <link rel="home" href="http://www.openplans.org"
+          title="Front page" />
+    <link rel="search" title="Search this site"
+          href="http://www.openplans.org/search_form" />
+    <link rel="author" title="Author information"
+          href="http://www.openplans.org/author/Jacqueline" />
+    <link rel="contents"
+          href="http://www.openplans.org/sitemap"
+          title="Site Map" />
+    
+    
+
+    
+
+    <link rel="up" href="http://www.openplans.org/projects"
+          title="Up one level" />
+
+    
+
+    <!-- Disable IE6 image toolbar -->
+    <meta http-equiv="imagetoolbar" content="no" />
+
+    
+    
+    
+  
+
+    
+
+    
+    
+    
+    
+    
+    
+
+
+    
+    
+  
+
+    
+    
+    
+
+    
+
+  
+
+
+  </head>
+
+<body class="section-projects" dir="ltr">
+    
+  <div id="visual-portal-wrapper">
+
+    <table id="tablemain">
+      <tbody>
+        <tr>
+          <td id="topleftshadow_out"><div class="fill"></div></td>
+          <td id="topshadow"><div id="topleftshadow_in"></div><div id="toprightshadow_in"></div></td>
+
+          <td id="toprightshadow_out"><div class="fill"></div></td>
+        </tr>
+
+        <tr>
+          <td rowspan="3" id="leftshadow"><div class="fill"></div></td>
+          <td id="headerrow">
+            <div id="portal-top">
+              <div id="portal-header">
+                <a class="hiddenStructure" accesskey="2"
+                   href="http://www.openplans.org/projects/projects/nycstreets/project-home#documentContent">Skip to content</a>
+
+                <a class="hiddenStructure" accesskey="6"
+                   href="http://www.openplans.org/projects/projects/nycstreets/project-home#portlet-navigation-tree">Skip to navigation</a>
+
+		<div style="float:left; clear:both; width: 100%">
+
+                  <!-- div metal:use-macro="here/global_skinswitcher/macros/skin_tabs">
+                       The skin switcher tabs. Based on which role you have, you
+                       get a selection of skins that you can switch between.
+
+                       </div -->
+
+                  <h1 id="portal-logo">
+    <a href="http://www.openplans.org" accesskey="1">OpenPlans</a>
+</h1>
+
+                  
+    <!-- h5 class="hiddenStructure" i18n:translate="heading_sections">Sections</h5 -->
+    <div id="navwrap">
+    <ul id="portal-globalnav">
+        
+	  <li id="portaltab-people" class="plain">
+            <a href="http://www.openplans.org/people">People</a>
+	</li>
+	
+        
+	  <li id="portaltab-projects" class="selected">
+            <a href="http://www.openplans.org/projects">Projects</a>
+
+	</li>
+	
+    </ul>
+    </div>
+	
+	<!--//old links for reference
+	
+	   
+        	<li><a href="#">OpenPlans home |</a></li>
+			<li><a href="#">My Projects or Login |</a></li>
+			<li><a href="#">Logout (only if My Projects is on</a></li>
+			<li id="ts-startproject"><a href="#">Start a Project</a></li>
+	</ul>
+	//-->
+
+
+                  <div id="portal-searchbox">
+    <form name="searchform"
+          action="http://www.openplans.org/search"
+          style="white-space:nowrap"
+          onsubmit="return liveSearchSubmit()">
+
+        <label for="searchGadget" class="hiddenStructure">Search Site</label>
+
+        <div class="LSBox">
+        <input id="searchGadget" tabindex="30001"
+               name="SearchableText" type="text" size="15"
+               title="Search Site" accesskey="4"
+               class="visibility:visible" />
+
+        <input class="searchButton" type="submit"
+               tabindex="30002" value="Search" />
+
+        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
+        </div>
+    </form>
+
+    <div id="portal-advanced-search" class="hiddenStructure">
+
+        <a href="http://www.openplans.org/search_form"
+           accesskey="5">
+            Advanced Search&hellip;
+        </a>
+    </div>
+
+</div>
+		</div>
+              </div>
+	    </div>
+
+          </td>
+          <td rowspan="3" id="rightshadow"><div class="fill"></div></td>
+        </tr>
+        <tr>
+	  <td id="bannerrow">
+	    <div id="banner_header">
+
+    <div id="portal-bannerheader">
+  <table id="ts_bannerheader">
+
+    <tr>
+      <td id="ts-titleheadercol">
+        <div id="ts-titleheader">
+          
+            <a href="http://www.openplans.org/projects/nycstreets">
+              <h1>New York City Streets Renaissance Campaign</h1>
+            </a>
+          
+          
+        </div>
+      </td>
+
+      <td id="project-tabs">
+	<div>
+	  <ul condition="inProject">
+	    
+	      <li>
+		<a href="http://www.openplans.org/projects/nycstreets/contact_project_admins"
+     id="project_tabs-get-involved">Get Involved!</a>
+	      </li>
+	    
+	  </ul>
+	   
+	</div>
+
+      </td>
+      <td id="ts_imagecol"><div id="ts_image"></div></td>
+    </tr>
+  </table>
+</div>
+
+
+  </div>
+	    
+      <!--//
+	  <h5 class="hiddenStructure" i18n:translate="heading_personal_tools">Personal tools</h5>//-->
+      <div id="portal-navigation-personal">
+
+	<div id="portal-personaltools"> 
+	  <ul>
+	    
+	    
+	      <li>
+		<a href="http://www.openplans.org/login_form">
+		  Log in
+		</a>
+	      </li>
+	    
+	    
+	      <li>
+		<a href="http://www.openplans.org/createMember">
+		  Join
+		</a>
+
+	      </li>
+	    
+	</ul></div>
+	
+
+        <div id="portal-breadcrumbs">
+          
+            
+            <ul>
+              <li>
+                <a href="http://www.openplans.org/projects/nycstreets/">Project Home</a>
+              </li>
+              <li>
+
+                <a href="http://www.openplans.org/projects/nycstreets/proj_roster">Project Roster</a>
+              </li>
+            </ul>
+          
+        </div>
+
+      </div>
+     
+          </td>
+        </tr>
+
+        <!--// table row for main content
+            THIS NEVER CHANGES//-->	
+        <tr>
+          <td>
+            <div class="visualClear"><!-- --></div>
+
+            
+            <table id="portal-columns">
+              <tbody>
+                <tr>
+                  
+                  
+                  
+
+                  
+                  <td id="portal-column-content">
+
+                    
+                      <div id="content"
+                           class="documentEditable">
+
+                        
+                          
+
+        <h5 class="hiddenStructure">Views</h5>
+
+        <ul class="contentViews">
+
+            
+              <li id="contentview-view" class="selected">
+                <a href="http://www.openplans.org/projects/nycstreets/project-home">View</a>
+              </li>
+
+            
+            
+              <li id="contentview-edit" class="plain">
+                <a href="http://www.openplans.org/projects/nycstreets/project-home/edit">Edit</a>
+              </li>
+            
+
+        </ul>
+
+    
+
+                          <div class="contentActions">
+
+        
+
+        
+
+        
+
+
+
+
+
+    </div>
+                        
+
+                        <div class="documentContent" id="region-content">
+
+                          <a name="documentContent"></a>
+
+                          
+
+                          
+
+                          
+    
+
+        <div class="documentActions">
+    
+
+    <h5 class="hiddenStructure">Document Actions</h5>
+
+    <ul>
+    
+        <li>
+            <a href="http://www.openplans.org/projects/nycstreets/project-home/sendto_form">
+
+                <img src="http://www.openplans.org/mail_icon.gif"
+                     alt="Send this page to somebody"
+                     title="Send this page to somebody" />
+            </a>
+        </li>
+    
+    
+        <li>
+            <a href="javascript:this.print();">
+
+                <img src="http://www.openplans.org/print_icon.gif"
+                     alt="Print this page"
+                     title="Print this page" />
+            </a>
+        </li>
+
+    
+
+    </ul>
+    
+
+    
+
+</div>
+
+        <h1 class="documentFirstHeading">NYCSR </h1>
+    
+        <div>
+
+    <div class="documentByLine">
+        
+
+        
+
+        <span>
+        last modified
+        </span>
+
+        2006-09-15 11:18
+
+        
+
+        
+
+        
+
+        
+
+        <div class="reviewHistory">
+    
+</div>
+
+    </div>
+
+</div>
+
+        
+    
+
+    
+        <div class="plain">
+            <h2 class="heading"><b>Welcome to the NYC Streets Renaissance Campaign Headquarters</b><br /></h2><h3 class="subheading">The goal of the NYCSR is to tranform New York City streets so that they are safer, more productive and more livable. </h3><p><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Sociable%20Men-1.jpg" height="200" width="314" />  <b><em>Streets can be places for neighbors to meet</em></b></p><p>New York City is defined by its vibrant and diverse streets and neighborhoods. Unfortunately, our neighborhoods and business districts are buckling under increasing amounts of dangerous car and truck  traffic.  Children can no longer 
+  
+     
+      
+	<span class="wicked_resolved"
+       id="text-860339cd275a35aed13ed4d80e8a8ff6">
+
+	  <a href="http://www.openplans.org/projects/nycstreets/play-on-their-own-blocks">
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
+    class="chunk">play on their own blocks</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+, while parents worry about turning cars smashing into baby carriages. Senior citizens are losing their independence, shut up in their homes for fear of crossing the street.   And shoppers and investors are being turned away by chaotic, traffic-choked avenues.  </p><p>This is unacceptable. <strong>The time is long overdue for our great city to strike a better balance between traffic and the needs of pedestrians.   </strong></p><p>The <strong>NYC Streets Renaissance Campaign</strong> aims to: </p><ul type="disc"><li><b>Educate</b> New Yorkers about potential transportation policy changes that will improve quality of life across New York City</li><li><b>Promote</b> a rebalancing of this public space away from private vehicles and toward community needs</li><li><b>Demonstrate</b> the widespread public support for reform on these issues</li><li><b>Tap </b>the potential of New Yorkers to re-imagine their own streets</li></ul><p><strong></strong></p><p><strong>Our Initiatives:</strong></p><ul type="none"><li>Official launch with an <a title="MAS Exhibition Preparations" href="../mas/project-home" target="_self">exhibition</a>/event at the Municipal Arts Society</li><li>Preparation of a multimedia information packet, including a <a title="inclusionletter" href="inclusionletter" target="_self">inclusion letter</a>, a dvd featuring <a title="TOPP: video production" href="../topp-video-production/project-home" target="_self">Clarence's work</a>, and a intro booklet</li><li>Improvements <a title="website building" href="website-building" target="_self">requested</a> for the <a href="http://www.nycsr.org/" target="_self">nycstreets.org </a>homepage</li><li>Host many <a title="Postcard Revised" href="../mas/mas-nycsr-postcard-revision-2.pdf" target="_self">events</a> to supplement our exhibition at the MAS.</li><li>Promote and distribute 
+  
+     
+      
+	<span class="wicked_resolved"
+       id="text-401890cd2f8c74f7d8106ecbddde78fe">
+
+	  <a href="http://www.openplans.org/projects/nycstreets/studies-and-papers">
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
+    class="chunk">studies and papers</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+ <a href="../studies-and-papers"></a>that dispel myths of streets and transit in NYC.</li></ul><p></p><p></p><ul type="none"><li>Help neighborhood leaders in the fight for long overdue, common sense improvements to their neighborhood streets</li></ul><p></p><p><strong></strong></p><p><strong>To get involved</strong>, add your ideas for making New York City a better place to live and work to our Taking it Citywide 
+  
+     
+      
+	<span class="wicked_resolved"
+       id="text-215018586e8c7cf5386a1bdcdae59e1a">
+	  <a href="http://www.openplans.org/projects/nycstreets/neighborhoods">
+
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
+    class="chunk">Neighborhoods</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+ page, or visit us at <a href="http://www.nycsr.org/involved.php">http://www.nycsr.org/involved.php</a> </p><p></p><p></p><p></p><p></p><p><a title="old landing page" href="old-landing-page" target="_self">old landing page </a><br /></p><p><br /></p><p><strong>Together, we can re-imagine the streets of New York City.</strong></p>
+
+
+<!-- <p>Grand Street Before:<br /><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Grand_street_Before-1.jpg" height="237" width="501" /><br /></p><p></p><p>Grand Street Re-imaged as public space:</p><p><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Grand_street_AFTER-1.jpg" height="336" width="800" /></p> --> 
+        </div>
+
+        <div class="visualClear"><!-- --></div>
+
+        
+
+	
+	
+
+        
+        <div id="relatedItems">
+    
+        
+            
+        
+    
+</div>
+    
+    
+
+
+                          
+                            <div class="discussion">
+    
+        
+            
+            
+
+        
+    
+</div>
+                          
+
+                        </div>
+
+                      </div>
+
+                    
+                  </td>
+                  
+
+                  
+                  
+                  
+                </tr>
+              </tbody>
+            </table>
+	    
+          </td>
+        </tr>
+
+        <tr>
+          <td id="bottomleftshadow_out"><div class="fill"></div></td>
+
+          <td id="bottomshadow"><div id="bottomleftshadow_in"></div><div id="bottomrightshadow_in"></div></td>
+          <td id="bottomrightshadow_out"><div class="fill"></div></td>
+        </tr>
+
+      </tbody>
+    </table>  
+  </div>
+  
+  <div class="visualClear"><!-- --></div>
+
+</body>
+</html>
+
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/standardrules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/standardrules.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
+  <prepend theme="//head" content="//head/link" /> 
+  <prepend theme="//head" content="//head/style" /> 
+  <append theme="//head" content="//head/script" />    
+  <append theme="//head" content="//head/meta" />
+  <append-or-replace theme="//head" content="//head/title" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/example.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/example.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,10 @@
+<html>
+ <head>
+  <title>I am a title</title>
+  <link rel="rss" href="/rss.xml" />
+ </head>
+ <body>Early text<p>Paragraph one</p>
+   <p>Paragraph two</p>
+   extra
+ </body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/example_expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/example_expected.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,14 @@
+<html>
+ <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>I am a title</title>
+  <link rel="rss" href="/rss.xml" />
+ </head>
+ <body>
+   Some text
+   <div id="content">
+   <p>Paragraph one</p>
+   <p>Paragraph two</p>
+   </div>
+ </body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/rules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/rules.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme="//head" content="//head/title" />
+    <append theme="//head" content="//head/link" />
+    <append theme="//head" content="//head/script" />    
+    <append theme="//head" content="//head/style" />    
+    <append theme="//head" content="//head/meta" />
+    <copy theme="//div[@id='content']" content="//body/*" />
+  </rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/standardrules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/standardrules.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
+  <append-or-replace theme="//head" content="//head/title" />
+  <append theme="//head" content="//head/link" />
+  <xi:include href="standardrules2.xml" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/standardrules2.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/standardrules2.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<rules xmlns="http://www.plone.org/deliverance">
+  <append theme="//head" content="//head/script" />    
+  <append theme="//head" content="//head/style" />    
+  <append theme="//head" content="//head/meta" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/text-rules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/text-rules.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme="//head" content="//head/title" />
+    <append theme="//head" content="//head/link" />
+    <append theme="//head" content="//head/script" />    
+    <append theme="//head" content="//head/style" />    
+    <append theme="//head" content="//head/meta" />
+    <copy theme="//div[@id='content']" content="//body/child::node()" />
+  </rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/texttest_expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/texttest_expected.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,16 @@
+<html>
+ <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>I am a title</title>
+  <link rel="rss" href="/rss.xml" />
+ </head>
+ <body>
+   Some text
+   <div id="content">
+   Early text
+   <p>Paragraph one</p>
+   <p>Paragraph two</p>
+   extra
+   </div>
+ </body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/theme.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,9 @@
+<html>
+ <head>
+  <title>Example</title>
+ </head>
+ <body>
+  Some text
+  <div id="content">replace this</div>
+</body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_expected.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,13 @@
+
+
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>I am a title</title>
+    <link rel="rss" href="/rss.xml" />
+  </head> 
+   <body>Early text<p>Paragraph one</p>
+   <p>Paragraph two</p>
+   extra
+ </body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_rules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_rules.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+  <xi:include href="standardrules.xml" />
+
+  <replace content="//body" theme="//body" />
+</rules>
+
+
+
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/xinclude_theme.html	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,7 @@
+<html>
+<head>
+</head>
+<body>
+<div>I should go away</div>
+</body> 
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests append command successfully appends the contents of a div tag with all matched 
+span tags in the content --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme=".//div[@id='foo']" content=".//span[@class='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></html>
+  </content>
+  
+  <output>
+    <html><head><title>Blah</title></head><body><div></div>
+	<div id="foo">Dummy Content<p>HI!</p><span class="bar">1</span><span class="bar">3</span></div></body></html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if append command does not find a target element in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme=".//div[@id='foo']" content=".//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body></body></html>
+  </theme>
+
+  <content> 
+    <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>Blah</title>
+      </head>
+      <body>
+	<div class="deliverance-error">Deliverance error: no element found in theme<br/>
+	  rule: &lt;append theme=".//div[@id='foo']" content=".//div[@id='bar']"/&gt;
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if append command finds more than one target element in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme=".//div[@class='foo']" content=".//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div class="foo">Dummy Content</div><div class="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+    <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>Blah</title>
+      </head>
+      <body>
+	<div class="foo">Dummy Content<div class="deliverance-error">
+	    Deliverance error: multiple elements found in theme<br/>rule: &lt;append theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
+	</div></div>
+	<div class="foo">Dummy Content</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests append command successfully appends the contents of a div tag with all contents of body tag, 
+including unelemented text --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme=".//div[@id='foo']" content="//body/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p>
+	  leading text <br/> more <p>inside p </p>trailing text</div>
+    </body></html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests append command successfully appends the contents of a div tag with all contents of body tag, 
+including unelemented text --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme=".//div[@id='foo']" content="//body/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content </div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content leading text <br/> more 
+	  <p>inside p </p>trailing text</div>
+    </body></html>
+  </output> 
+</deliverance-test>
+
+
+</deliverance-test-suite>

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests append-or-replace command successfully replaces span tags in the div tag matched 
+  in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme=".//div[@id='foo']" content=".//span" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p><span>This should go away</span></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body><div class="bar">Real Content</div><span>1</span><p>zzz</p><span>3</span></body></html>
+  </content>
+  
+  <output>
+    <html><head><title>Blah</title></head><body><div></div>
+	<div id="foo">Dummy Content<p>HI!</p><span>1</span><span>3</span></div></body></html>
+  </output> 
+</deliverance-test>
+
+<!-- tests append-or-replace can accomplish a normal append when there is nothing to replace --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme=".//div[@id='foo']" content=".//span" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body><div class="bar">Real Content</div><span>1</span><p>zzz</p><span>3</span></body></html>
+  </content>
+  
+  <output>
+    <html><head><title>Blah</title></head><body><div></div>
+	<div id="foo">Dummy Content<p>HI!</p><span>1</span><span>3</span></div></body></html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if append-or-replace command does not find a target element 
+     in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme=".//div[@id='foo']" content=".//div" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body></body></html>
+  </theme>
+
+  <content> 
+    <html><body><div>Real Content</div></body></html>
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>Blah</title>
+      </head>
+      <body>
+	<div class="deliverance-error">Deliverance error: no element found in theme<br/>
+	  rule: &lt;append-or-replace theme=".//div[@id='foo']" content=".//div"/&gt;
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if append-or-replace command finds more than one 
+     target element in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme=".//div" content=".//div" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div>Dummy Content</div><div>Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+    <html><body><div>Real Content</div></body></html>
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>Blah</title>
+      </head>
+      <body>
+	<div>Dummy Content<div class="deliverance-error">
+	    Deliverance error: multiple elements found in theme<br/>rule: &lt;append-or-replace theme=".//div" content=".//div"/&gt;
+	</div></div>
+	<div>Dummy Content</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that when append-or-replace finds unelemented text in the matched content tag it produces an error --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme=".//div[@id='foo']" content="//span/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p><span>This should go away</span></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body><div class="bar">Real Content</div><span>1</span><p>zzz</p><span>3</span></body></html>
+  </content>
+  
+  <output>
+ <html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: invalid xpath for content<br/>rule: &lt;append-or-replace theme=".//div[@id='foo']" content="//span/child::node()"/&gt;
+  </div>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p><span>This should go away</span></div>
+  </body>
+  </html>
+ </output> 
+</deliverance-test>
+
+
+<!-- tests that when append-or-replace finds unelemented text in the matched content tag it produces an error --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme=".//div[@id='foo']" content="//span/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p><span>This should go away</span></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body><div class="bar">Real Content</div><span><p>in p</p>1</span><p>zzz</p><span>3</span></body></html>
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>Blah</title>
+      </head>
+      <body>
+	<div class="deliverance-error">Deliverance error: invalid xpath for content<br/>rule: &lt;append-or-replace theme=".//div[@id='foo']" content="//span/child::node()"/&gt;
+</div>
+	<div/>
+	<div id="foo">Dummy Content<p>HI!</p><span>This should go away</span></div>
+      </body>
+    </html>
+  </output>
+</deliverance-test>
+
+</deliverance-test-suite>

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_baserules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_baserules.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+<!-- test the base rules used for all pages --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme="//head" content="//head/title" />
+    <append theme="//head" content="//head/link" />
+    <append theme="//head" content="//head/script" />    
+    <append theme="//head" content="//head/style" />    
+    <append theme="//head" content="//head/meta" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head>
+	<title>Title to be replaced</title>
+	<link rel="preexisting link" />
+         <script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/existing.js"></script>
+	 <style type="text/css">	  
+	   #effbot-nav {
+	  float: left;
+	  width: 180px;
+	  margin: 0;
+	  padding: 10px;
+	  }
+	 </style>
+	 <meta name="generator" content="existing meta" />
+      </head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><head>
+	<title>New Title</title>
+	<link rel="appended link1" /><link rel="appended link2" />
+         <style type="text/css"> #added-style {}</style>
+	 <script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/new.js"></script>
+	 <meta name="generator" content="new meta" />
+      </head><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></html>
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<link rel="preexisting link" />
+        <script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/existing.js"></script>
+	<style type="text/css">	  
+	  #effbot-nav {
+	  float: left;
+	  width: 180px;
+	  margin: 0;
+	  padding: 10px;
+	  }
+	</style>
+	<meta name="generator" content="existing meta" />
+	<title>New Title</title>
+	<link rel="appended link1" /><link rel="appended link2" />
+        <script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/new.js"></script>
+        <style type="text/css"> #added-style {}</style>
+	<meta name="generator" content="new meta" />
+      </head>
+      <body>
+	<div></div>
+	<div id="foo">Dummy Content<p>HI!</p></div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+</deliverance-test-suite>
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_comments.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_comments.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deliverance-test-suite>
+
+<!-- tests comment preservation --> 
+
+
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme="//body" content="//div[@class='foo']" /> 
+  </rules>
+
+  <theme base="http://nycsr.org"> 
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>some text</p>
+	<!-- a theme comment --> 
+      </body>
+    </html>
+  </theme>
+
+  <content>
+    <html>
+      <body>
+	<div class="foo">
+	  <!-- a content comment --> 
+	</div>
+      </body>
+    </html> 
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>some text</p> 
+	<!-- a theme comment --> 
+	<div class="foo">
+	  <!-- a content comment --> 
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+<!-- a more complicated scripty test --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme="//head" content="//head/script" /> 
+  </rules>
+
+  <theme base="http://nycsr.org"> 
+    <html>
+      <head>
+	<title>test</title>
+	<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = themeFunction() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	</script>
+      </head>
+      <body>
+	<p>some text</p>
+	<!-- a theme comment --> 
+      </body>
+    </html>
+  </theme>
+
+  <content>
+    <html>
+      <head>
+	<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = contentFunction() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	</script> 
+      </head>
+      <body>
+	blah blah blah 
+      </body>
+    </html> 
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>test</title>
+	<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = themeFunction() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	</script> 
+	<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = contentFunction() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	  </script> 
+      </head>
+      <body>
+	<p>some text</p> 
+	<!-- a theme comment --> 
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+
+</deliverance-test-suite>

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests copy command successfully replaces the contents of a div tag with all matched span tags in the content --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme=".//div[@id='foo']" content=".//span[@class='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><div></div><div id="foo"><span class="bar">1</span><span class="bar">3</span></div></body></html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if copy command does not find a target element in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme=".//div[@id='foo']" content=".//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body></body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+ 
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: no element found in theme<br/>rule: &lt;copy theme=".//div[@id='foo']" content=".//div[@id='bar']"/&gt;
+  </div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if copy command finds more than one target element in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme=".//div[@class='foo']" content=".//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+      <html><head><title>Blah</title></head><body><div class="foo">Dummy Content</div><div class="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+ 
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="foo">Dummy Content<div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;copy theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
+  </div></div>
+    <div class="foo">Dummy Content</div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests copy command successfully replaces the contents of a div tag with all content of the body tag; 
+includes trailing and leading unelemented text --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme=".//div[@id='foo']" content="//body/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body>leading text <br /> more <p> a p tag</p> trailing text</body> body tail</html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><div></div><div id="foo">leading text <br /> more <p> a p tag</p> trailing text</div></body></html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests copy command successfully replaces the contents of a div tag with all elements in the body tag; 
+doesn't include trailing and leading unelemented text --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme=".//div[@id='foo']" content="//body/*" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body>leading text <br /> more <p> a p tag</p> trailing text</body> body tail</html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><div></div><div id="foo"><br /><p> a p tag</p></div></body></html>
+  </output> 
+</deliverance-test>
+
+
+</deliverance-test-suite>

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests prepend command successfully prepends the contents of a div tag with all matched 
+span tags in the content --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <prepend theme=".//div[@id='foo']" content=".//span[@class='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></html>
+  </content>
+  
+  <output>
+    <html><head><title>Blah</title></head><body><div></div>
+	<div id="foo"><span class="bar">1</span><span class="bar">3</span>Dummy Content<p>HI!</p></div></body></html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if prepend command does not find a target element in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <prepend theme=".//div[@id='foo']" content=".//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body></body></html>
+  </theme>
+
+  <content> 
+    <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>Blah</title>
+      </head>
+      <body>
+	<div class="deliverance-error">Deliverance error: no element found in theme<br/>
+	  rule: &lt;prepend theme=".//div[@id='foo']" content=".//div[@id='bar']"/&gt;
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if prepend command finds more than one target element in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <prepend theme=".//div[@class='foo']" content=".//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div class="foo">Dummy Content</div><div class="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+    <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>Blah</title>
+      </head>
+      <body>
+	<div class="foo">Dummy Content<div class="deliverance-error">
+	    Deliverance error: multiple elements found in theme<br/>rule: &lt;prepend theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
+	</div></div>
+	<div class="foo">Dummy Content</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests preppend command successfully prepends the contents of a div tag with all contents of body tag, 
+including unelemented text --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <prepend theme=".//div[@id='foo']" content="//body/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+    <html><head><title>Blah</title></head><body><div id="foo">leading text <br/> more <p>inside p </p>trailing textDummy Content<p>HI!</p></div>
+    </body></html>
+  </output> 
+</deliverance-test>
+
+</deliverance-test-suite>

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests replace command successfully replaces a simple div tag --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@id='foo']" content="//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div id="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><div id="bar">Real Content</div></body></html>
+  </output> 
+</deliverance-test>
+
+
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@id='foo']" content="//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><p>first stuff</p><div id="foo">Dummy Content</div>last stuff</body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content</div><div id="bar">More Real Content</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><p>first stuff</p><div id="bar">Real Content</div><div id="bar">More Real Content</div>last stuff</body></html>
+  </output> 
+</deliverance-test>
+
+<!-- tests that an error is raised if replace command does not find an element --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@id='foo']" content="//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body></body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><div class="deliverance-error">Deliverance error: no element found in theme<br /> 
+        rule: &lt;replace theme="//div[@id='foo']" content="//div[@id='bar']"/&gt;</div> 
+     </body></html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests that an error is raised if replace command finds multiple target elements in the theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@class='foo']" content="//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+      <html><head><title>Blah</title></head><body><div class="foo">Dummy Content</div><div class="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+ 
+  <output>
+    <html>
+      <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="foo">Dummy Content<div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;replace theme="//div[@class='foo']" content="//div[@id='bar']"/&gt;
+  </div></div>
+    <div class="foo">Dummy Content</div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests replacing an element with just text -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@id='foo']" content="//div[@id='bar']/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div id="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body>Real Content</body></html>
+  </output> 
+</deliverance-test>
+
+<!-- a more advanced test that replaces an element with a mixture of elements and text -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@id='foo']" content="//div[@id='bar']/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div id="foo">Dummy Content</div>theme tail</body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content<p>a nice p tag</p>mid text<i>some i text</i>end tail</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body>Real Content<p>a nice p tag</p>mid text<i>some i text</i>end tailtheme tail</body></html>
+  </output> 
+</deliverance-test>
+
+
+<!-- a test that replaces an element with a mixture of elements and text -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@id='foo']" content="//div[@id='bar']/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><p>some text</p><div id="foo">Dummy Content</div>theme tail</body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content<p>a nice p tag</p>mid text<i>some i text</i>end tail</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><p>some text</p>Real Content<p>a nice p tag</p>mid text<i>some i text</i>end tailtheme tail</body></html>
+  </output> 
+</deliverance-test>
+
+<!-- tests that when no content element is matched, the theme element is simply deleted without error -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@id='foo']" content="//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body>lead<div id="foo">Dummy Content</div>tail</body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bars">Real Content</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body>leadtail</body></html>
+  </output> 
+</deliverance-test>
+
+</deliverance-test-suite>
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_submatch.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_submatch.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deliverance-test-suite>
+
+<!-- tests matching an element and also a decendant of that element, 
+     desirable behavior here is questionable ...  this is here for consistency 
+     checking at the moment.  --> 
+
+
+
+<!-- replace test --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//body/p" content="//div[@class='foo']" /> 
+  </rules>
+
+  <theme base="http://nycsr.org"> 
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>replaced text</p>
+      </body>
+    </html>
+  </theme>
+
+  <content>
+    <html>
+      <body>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+      </body>
+    </html> 
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+	<div class="foo">
+	    inner div 
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+<!-- copy test --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme="//body" content="//div[@class='foo']" /> 
+  </rules>
+
+  <theme base="http://nycsr.org"> 
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>replaced text</p>
+      </body>
+    </html>
+  </theme>
+
+  <content>
+    <html>
+      <body>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+      </body>
+    </html> 
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+	<div class="foo">
+	    inner div 
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+<!-- append test --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme="//body" content="//div[@class='foo']" /> 
+  </rules>
+
+  <theme base="http://nycsr.org"> 
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>some text</p>
+      </body>
+    </html>
+  </theme>
+
+  <content>
+    <html>
+      <body>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+      </body>
+    </html> 
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>some text</p>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+	<div class="foo">
+	    inner div 
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- append or replace (append) --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme="//body" content="//div[@class='foo']" /> 
+  </rules>
+
+  <theme base="http://nycsr.org"> 
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>replaced text</p>
+      </body>
+    </html>
+  </theme>
+
+  <content>
+    <html>
+      <body>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+      </body>
+    </html> 
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>replaced text</p>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+	<div class="foo">
+	    inner div 
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+<!-- append or replace (replace) --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme="//body" content="//div[@class='foo']" /> 
+  </rules>
+
+  <theme base="http://nycsr.org"> 
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>replaced text</p>
+	<div class="foo" message="replace-me">
+          replace-me 
+	</div>
+      </body>
+    </html>
+  </theme>
+
+  <content>
+    <html>
+      <body>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+      </body>
+    </html> 
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<title>test</title>
+      </head>
+      <body>
+	<p>replaced text</p>
+	<div class="foo">
+	  outer div
+	  <div class="foo">
+	    inner div 
+	  </div>
+	</div>
+	<div class="foo">
+	    inner div 
+	</div>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+
+</deliverance-test-suite>

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests url replacement successfully; replaces the relative urls with absolute urls based on <base> if present --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+  </rules>
+
+  <theme base="http://nycsr.org"> 
+    <html>
+
+      <head>
+	<style type="text/css" media="screen">
+	  @import url(/css/test-style.css);
+	  @import url(http://www.example.com/foo.css);
+	  #effbot-nav {
+	  float: left;
+	  width: 180px;
+	  margin: 0;
+	  padding: 10px;
+	  }
+	</style>
+	<script src="js/gallery.js" type="text/javascript" language="javascript" />
+	<title>Blah</title>
+      </head>
+      <body>
+	<a href="/nyc/photo.php">Photo Gallery</a>
+	<a href="http://nycsr.org/lessons/benefits.php">The Benefits of Great Streets</a>
+      </body>
+    </html>
+  </theme>
+
+  <content> 
+  </content>
+  
+  <output>
+    <html>
+      <head>
+	<style type="text/css" media="screen">
+	  @import url(http://nycsr.org/css/test-style.css);
+	  @import url(http://www.example.com/foo.css);
+	  #effbot-nav {
+	  float: left;
+	  width: 180px;
+	  margin: 0;
+	  padding: 10px;
+	  }
+	</style>
+	<script src="http://nycsr.org/js/gallery.js" type="text/javascript" language="javascript" />
+	<title>Blah</title>
+      </head>
+      <body>
+	<a href="http://nycsr.org/nyc/photo.php">Photo Gallery</a>
+	<a href="http://nycsr.org/lessons/benefits.php">The Benefits of Great Streets</a>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- tests url replacement successfully; replaces the relative urls with absolute urls; inline <base> tag
+overrides the attribute on the <theme> tag --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html>
+      <head><style type="text/css" media="screen">@import url(/css/test2-style.css);</style>
+	<script src="js/gallery.js" type="text/javascript" language="javascript" />
+	<title>Blah</title>
+	<base href="http://nycsr.org" />
+      </head>
+      <body>
+	<a href="/nyc/photo.php">Photo Gallery</a>
+	<a href="http://nycsr.org/lessons/benefits.php">The Benefits of Great Streets</a>
+      </body>
+    </html>
+  </theme>
+
+  <content> 
+  </content>
+  
+  <output>
+    <html>
+      <head><style type="text/css" media="screen">@import url(http://nycsr.org/css/test2-style.css);</style>
+	<script src="http://nycsr.org/js/gallery.js" type="text/javascript" language="javascript" />
+	<title>Blah</title>
+      </head>
+      <body>
+	<a href="http://nycsr.org/nyc/photo.php">Photo Gallery</a>
+	<a href="http://nycsr.org/lessons/benefits.php">The Benefits of Great Streets</a>
+      </body>
+    </html>
+  </output> 
+</deliverance-test>
+
+</deliverance-test-suite>

Added: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,73 @@
+import os
+import sys
+from lxml import etree
+from paste.fixture import TestApp
+from paste.urlparser import StaticURLParser
+from wsgifilter import DeliveranceMiddleware
+from formencode.doctest_xml_compare import xml_compare
+from htmlserialize import tostring
+
+static_data = os.path.join(os.path.dirname(__file__), 'test-data', 'static')
+nycsr_data = os.path.join(os.path.dirname(__file__), 'test-data', 'nycsr')
+
+static_app = StaticURLParser(static_data)
+nycsr_app = StaticURLParser(nycsr_data)
+
+def html_string_compare(astr, bstr):
+    def reporter(x):
+        print x
+
+    a = None
+    b = None
+    try:
+        a = etree.HTML(astr)
+    except:
+        print a
+        raise
+    try:
+        b = etree.HTML(bstr)
+    except:
+        print b
+        raise
+
+    reporter = []
+    result = xml_compare(a, b, reporter.append)
+    if not result:
+        raise ValueError(
+            "Comparison failed between actual:\n==================\n%s\n\nexpected:\n==================\n%s\n\nReport:\n%s"
+            % (astr, bstr, '\n'.join(reporter)))
+
+def test_basic():
+    wsgi_app = DeliveranceMiddleware(static_app, 'theme.html', 'rules.xml')
+    app = TestApp(wsgi_app)
+    res = app.get('/example.html')
+    res2 = app.get('/example_expected.html?notheme')
+    html_string_compare(res.body, res2.body)
+
+def test_text():
+    wsgi_app = DeliveranceMiddleware(static_app, 'theme.html', 'text-rules.xml')
+    app = TestApp(wsgi_app)
+    res = app.get('/example.html')
+    res2 = app.get('/texttest_expected.html?notheme')
+    html_string_compare(res.body, res2.body)
+
+
+def test_xinclude():
+    wsgi_app = DeliveranceMiddleware(static_app, 'xinclude_theme.html', 'xinclude_rules.xml')
+    app = TestApp(wsgi_app)
+    res = app.get('/example.html')
+    res2 = app.get('/xinclude_expected.html?notheme')
+    html_string_compare(res.body, res2.body)
+
+
+def test_nycsr():
+    wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://www.nycsr.org','nycsr.xml')
+    app = TestApp(wsgi_app)
+    res = app.get('/openplans.html')
+    res2 = app.get('/nycsr_expected.html?notheme')
+    html_string_compare(res.body, res2.body)
+
+
+if __name__ == '__main__':
+    pass
+

Added: z3/deliverance/branches/packaged/deliverance/tests.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/tests.py	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,97 @@
+import unittest
+import os
+from lxml import etree
+from formencode.doctest_xml_compare import xml_compare
+#from deliverance.interpreter import Renderer
+from deliverance.xslt import Renderer
+import copy 
+
+class DeliveranceTestCase:
+
+    def __init__(self, rules, theme, theme_uri, content, output):
+        self.rules = rules
+        self.theme = theme
+        self.theme_uri = theme_uri
+        self.content = content
+        self.output = output
+
+    def __call__(self, name):
+        renderer = Renderer(
+            theme=self.theme,
+            theme_uri=self.theme_uri,
+            rules=self.rules)
+        actual = renderer.render(self.content)
+        reporter = []
+        result = xml_compare(actual, self.output, reporter.append)
+        if not result:
+            raise ValueError(
+                "Comparison failed between actual:\n==================\n%s\n\nexpected:\n==================\n%s\n\nReport:\n%s"
+                % (strify(actual), strify(self.output), '\n'.join(reporter)))
+
+def strify(el):
+    return etree.tostring(el, xml_declaration=False, pretty_print=True)
+
+##################################################
+## Test Suite construction
+##################################################
+
+test_dir = os.path.join(os.path.dirname(__file__), 'test-data')
+
+def test_examples():
+    for fn in os.listdir(test_dir):
+        fn = os.path.join(test_dir, fn)
+        for case in cases(fn):
+            yield case
+
+def cases(fn):
+    if not os.path.basename(fn).startswith('test_'):
+        return
+    if fn.endswith('~'):
+        return
+    try:
+        doc = etree.parse(fn)
+    except etree.XMLSyntaxError, e:
+        e.args += (('in file %s' % fn), )
+        raise
+    for index, el in enumerate(doc.findall('deliverance-test')):
+        index += 1
+        rules = el.find('{http://www.plone.org/deliverance}rules')
+        assert rules is not None, (
+            "No rules found in %s:%s" % (fn, index))
+
+
+        theme = el.find('theme')
+        themebody = None
+        if (len(theme)):
+            themebody = copy.deepcopy(theme[0])
+        theme[:] = []
+
+        content = el.find('content')
+        contentbody = None
+        if (len(content)):
+            contentbody = copy.deepcopy(content[0])
+        content[:] = []
+
+
+        output = el.find('output')
+        outputbody = None
+        if (len(output)):
+            outputbody = copy.deepcopy(output[0])
+        output[:] = []
+
+
+        case = DeliveranceTestCase(
+            rules=rules,
+            theme=themebody,
+            theme_uri=el.find('theme').attrib['base'],
+            content=contentbody,
+            output=outputbody)
+        yield case, ('%s:%s' % (fn, index))
+
+
+
+
+
+
+if __name__ == '__main__':
+    import nose; nose.main() 

Deleted: /z3/deliverance/branches/packaged/deliverance/themecompiler.xsl
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/themecompiler.xsl	Mon Oct  9 22:03:44 2006
+++ (empty file)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
-    exclude-result-prefixes="html" version="1.0">
-    <!-- Theme compiler.  Applied to the rule file to generate 
-        an XSLT that gets applied to content. -->
-    <xsl:output indent="yes" method="xml"/>
-    <xsl:template match="/">
-        <!-- The compiled theme gets shoved in here -->
-    </xsl:template>
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-</xsl:stylesheet>

Added: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,168 @@
+from lxml import etree
+import re
+import urlparse
+
+class RuleSyntaxError(Exception):
+    """
+    Raised when an invalid or unknown rule is encountered by a renderer 
+    during rule processing 
+    """
+
+
+class RendererBase(object):
+    """
+    base class for deliverance renderers. 
+    subclasses should implement: 
+
+    render(self,content) 
+
+    which should accept an lxml.etree structure and produce 
+    an lxml.etree structure representing the content having been 'themed' 
+    with this renderer's theme according to its rules. 
+    """
+
+    APPEND_RULE_TAG            = "{http://www.plone.org/deliverance}append"
+    PREPEND_RULE_TAG           = "{http://www.plone.org/deliverance}prepend"
+    REPLACE_RULE_TAG           = "{http://www.plone.org/deliverance}replace"
+    COPY_RULE_TAG              = "{http://www.plone.org/deliverance}copy"
+    APPEND_OR_REPLACE_RULE_TAG = "{http://www.plone.org/deliverance}append-or-replace"
+    SUBRULES_TAG               = "{http://www.plone.org/deliverance}rules"
+
+    RULE_CONTENT_KEY = "content"
+    RULE_THEME_KEY   = "theme" 
+
+    def get_theme_el(self,rule,theme):
+        theme_els = theme.xpath(rule.attrib[self.RULE_THEME_KEY])
+        if len(theme_els)== 0:
+            e = self.format_error("no element found in theme", rule)
+            self.add_to_body_start(theme, e)
+            return None
+        elif len(theme_els)> 1:
+            e = self.format_error("multiple elements found in theme", rule)
+            theme_els[0].append(e)
+            return None
+        return theme_els[0]
+
+
+    def format_error(self, message, rule, elts=None):
+        """
+        Returns a node containing the error message;
+        Checks the onerror attribute of the rule element to see if errors should
+        be ignored in which case returns None
+        """
+
+        if rule.attrib.get('onerror', None) == 'ignore':
+            return None
+
+        d = etree.Element('div')
+        d.attrib['class'] = 'deliverance-error'
+        d.text = 'Deliverance error: %s' % message
+        br = etree.Element('br')
+        br.tail = 'rule: %s' % etree.tostring(rule)
+        d.append(br)
+        if elts:
+            d.extend(elts)
+        return d
+
+
+    TAG_MATCHER = re.compile(r'^\.?/?/?(.*?/)*(?P<tag>[^*^(^)^:^[^.^/]+?)(\[.*\])*$',re.I)
+    def get_tag_from_xpath(self,xpath):
+        match = self.TAG_MATCHER.match(xpath)
+        if match:
+            return match.group('tag')  
+        else:
+            return None
+
+
+    def add_to_body_start(self,theme, el):
+        body = theme.find('body')
+        if body is None:
+            body = theme[0]
+        body[:0] = [el]
+
+    def replace_element(self,replace, new_el):
+        parent = replace.getparent()
+        for i in range(len(parent)):
+            if parent[i] == replace:
+                new_el.tail = replace.tail 
+                parent[i] = new_el
+                break
+
+    def mark_bad_elements(self,els):
+        for el in els:
+            if 'class' in el.attrib:
+                el.attrib['class'] += ' deliverance-bad-element'
+            else:
+                el.attrib['class'] = 'deliverance-bad-element'
+
+
+    def fixup_links(self, doc, uri):
+        """ resolve all links in the ``doc`` element to be absolute; the links
+        should be considered relative to ``uri``
+        """        
+        base_uri = uri 
+        basetags = doc.xpath('//base[@href]')
+        if (len(basetags)):
+            base_uri = basetags[0].attrib['href']
+
+            for b in basetags:
+                b.getparent().remove(b)
+
+        elts = doc.xpath('//*[@href]')
+        self.fixup_link_attrs(elts, base_uri, 'href')
+
+        elts = doc.xpath('//*[@src]')
+        self.fixup_link_attrs(elts, base_uri, 'src')
+
+        elts = doc.xpath('//head/style')
+        self.fixup_css_links(elts, base_uri)
+
+        return doc
+
+
+    def fixup_link_attrs(self, elts, base_uri, attr):
+        """ makes all attr values in elts to be absolute uris based on base_uri """
+        for el in elts:
+            el.attrib[attr] = urlparse.urljoin(base_uri, el.attrib[attr])
+
+
+    CSS_URL_PAT = re.compile(r'url\((.*?)\)',re.I)
+    def fixup_css_links(self, elts, base_uri):
+        """ fixes @import uris in css style elements to be 
+        absolute links based on base_uri
+        """
+
+        def absuri(matchobj): 
+            return 'url(' + urlparse.urljoin(base_uri,matchobj.group(1)) + ')'
+
+        for el in elts:
+            if el.text:
+                el.text = re.sub(self.CSS_URL_PAT,absuri,el.text)
+
+    def remove_http_equiv_metas(self,doc):
+        if not doc:
+            return 
+
+        metas = doc.xpath("//meta[translate(@http-equiv,'contenyp','CONTENYP') = 'CONTENT-TYPE']")
+        for elt in metas:
+            if elt.tail:
+                attach_text_to_previous(self,elt,elt.tail)
+            elt.getparent().remove(elt)
+
+
+    def attach_text_to_previous(self,el,text):
+        if text is None:
+            return 
+
+        el_i = el.getparent().index(el)
+        if el_i > 0:
+            sib_el = el.getparent()[el_i - 1]
+            if sib_el.tail:
+                sib_el.tail += text 
+            else:
+                sib_el.tail = text
+        else: 
+            if el.getparent().text:
+                el.getparent().text += text 
+            else:
+                el.getparent().text = text

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Mon Oct  9 22:03:44 2006
@@ -4,53 +4,132 @@
 Deliverance applies a theme to content.
 """
 
-import time
-from cStringIO import StringIO
-
+import re
+import urlparse
+import urllib
+from lxml import etree
 from paste.wsgilib import intercept_output
+from paste.request import construct_url
 from paste.response import header_value, replace_header
-from deliverance.main import AppMap
+#from interpreter import Renderer
+from xslt import Renderer
+from htmlserialize import tostring
+import sys 
+import datetime
+import threading
+
+DELIVERANCE_BASE_URL = 'deliverance-base-url'
 
 class DeliveranceMiddleware(object):
 
-    def __init__(self, app, appmap):
+    def __init__(self, app, theme_uri, rule_uri):
         self.app = app
-        self.appmap = appmap
+        self.theme_uri = theme_uri
+        self.rule_uri = rule_uri
+        self._theme = None
+        self._rule = None
+        self._renderer = None
+        self._cache_time = datetime.datetime.now()
+        self._timeout = datetime.timedelta(0,10)
+        self._lock = threading.Lock()
+
+    def cache_expired(self):
+        return self._cache_time + self._timeout < datetime.datetime.now()
+
+    def rule(self, environ):
+        if self._rule is None or self.cache_expired():
+            self._cache_time = datetime.datetime.now()
+            self._renderer = None
+            self._rule = self.get_resource(environ, self.rule_uri)
+        return self._rule
+
+    def theme(self, environ):
+        if self._theme is None or self.cache_expired():
+            self._cache_time = datetime.datetime.now()
+            self._renderer = None
+            self._theme = self.get_resource(environ, self.theme_uri)
+        return self._theme
         
     def __call__(self, environ, start_response):
         qs = environ.get('QUERY_STRING', '')
+        environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False)
         notheme = 'notheme' in qs
         if notheme:
             return self.app(environ, start_response)
+
         status, headers, body = intercept_output(
             environ, self.app,
             self.should_intercept,
             start_response)
+
+
         if status is None:
             # should_intercept returned False
             return body
-        body = self.filter_body(body)
+        body = self.filter_body(environ, body)
         replace_header(headers, 'content-length', str(len(body)))
+        replace_header(headers, 'content-type', 'text/html; charset=utf-8')
         start_response(status, headers)
         return [body]
 
     def should_intercept(self, status, headers):
         type = header_value(headers, 'content-type')
-        return type.startswith('text/html')
+        return type.startswith('text/html') or type.startswith('application/xhtml+xml')
 
-    def filter_body(self, body):
-        return self.appmap.publish(body)
+    def filter_body(self, environ, body):
+        try:
+            self._lock.acquire()
+            theme = self.theme(environ)
+            rule = self.rule(environ)
+            full_theme_uri = urlparse.urljoin(
+                construct_url(environ, with_path_info=False),
+                self.theme_uri)
+
+            def reference_resolver(href, parse, encoding=None):
+                text = self.get_resource(environ,href)
+                if parse == "xml":
+                    return etree.XML(text)
+                elif encoding:
+                    return text.decode(encoding)
+
+            if not self._renderer:
+                self._renderer = Renderer(etree.HTML(theme), full_theme_uri, etree.XML(rule), 
+                                          reference_resolver=reference_resolver)
+
+            content = self._renderer.render(etree.HTML(body))
+            return tostring(content)
+        finally:
+                self._lock.release()
 
-def handler(req):
-    """Basic filter applying to all mime types it is registered for"""
 
-    # Get the path, strip off leading slash, and convert to a 
-    # dotted notation for xml:id compatibility
-    path_info = req.path_info[1:]
-    dotted_path = path_info.replace("/", ".")
 
-    response = appmap.publish(dotted_path)
-    req.content_type = "text/html"
-    req.write(response)
 
-    return apache.OK
+    def get_resource(self, environ, uri):
+        internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)
+        
+        if self.relative_uri(uri):
+            return self.get_internal_resource(environ, uri)
+        elif internalBaseURL and uri.startswith(internalBaseURL):
+            return self.get_internal_resource(environ, uri[len(internalBaseURL):])
+        else:
+            return self.get_external_resource(uri)
+
+    def relative_uri(self, uri):
+        if re.search(r'^[a-zA-Z]+:', uri):
+            return False
+        else:
+            return True
+
+    def get_external_resource(self, uri):
+        f = urllib.urlopen(uri)
+        content = f.read()
+        f.close()
+        return content
+
+    def get_internal_resource(self, environ, uri):
+        environ = environ.copy()
+        if not uri.startswith('/'):
+            uri = '/' + uri
+        environ['PATH_INFO'] = uri
+        status, headers, body = intercept_output(environ, self.app)
+        return body

Added: z3/deliverance/branches/packaged/deliverance/xinclude.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/xinclude.py	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,147 @@
+#
+# ElementTree
+# $Id: ElementInclude.py 1862 2004-06-18 07:31:02Z Fredrik $
+#
+# limited xinclude support for element trees
+#
+# history:
+# 2003-08-15 fl   created
+# 2003-11-14 fl   fixed default loader
+# 2006-09-25 cabraham modifications for deliverance, lxml. recursive xinclude 
+# 
+# Copyright (c) 2003-2004 by Fredrik Lundh.  All rights reserved.
+#
+# fredrik at pythonware.com
+# http://www.pythonware.com
+#
+# --------------------------------------------------------------------
+# The ElementTree toolkit is
+#
+# Copyright (c) 1999-2004 by Fredrik Lundh
+#
+# By obtaining, using, and/or copying this software and/or its
+# associated documentation, you agree that you have read, understood,
+# and will comply with the following terms and conditions:
+#
+# Permission to use, copy, modify, and distribute this software and
+# its associated documentation for any purpose and without fee is
+# hereby granted, provided that the above copyright notice appears in
+# all copies, and that both that copyright notice and this permission
+# notice appear in supporting documentation, and that the name of
+# Secret Labs AB or the author not be used in advertising or publicity
+# pertaining to distribution of the software without specific, written
+# prior permission.
+#
+# SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+# TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
+# ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
+# BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+# OF THIS SOFTWARE.
+# --------------------------------------------------------------------
+
+
+import copy
+from lxml import etree 
+
+XINCLUDE = "{http://www.w3.org/2001/XInclude}"
+
+XINCLUDE_INCLUDE = XINCLUDE + "include"
+XINCLUDE_FALLBACK = XINCLUDE + "fallback"
+
+##
+# Fatal include error.
+
+class FatalIncludeError(SyntaxError):
+    pass
+
+##
+# Default loader.  This loader reads an included resource from disk.
+#
+# @param href Resource reference.
+# @param parse Parse mode.  Either "xml" or "text".
+# @param encoding Optional text encoding.
+# @return The expanded resource.  If the parse mode is "xml", this
+#    is an ElementTree instance.  If the parse mode is "text", this
+#    is a Unicode string.  If the loader fails, it can return None
+#    or raise an IOError exception.
+# @throws IOError If the loader fails to load the resource.
+#
+# modified from ElementTree version to use lxml etree 
+def default_loader(href, parse, encoding=None):
+    file = open(href)
+    if parse == "xml":
+        data = etree.XML(file.read())
+    else:
+        data = file.read()
+        if encoding:
+            data = data.decode(encoding)
+    file.close()
+    return data
+
+##
+# Expand XInclude directives.
+#
+# @param elem Root element.
+# @param loader Optional resource loader.  If omitted, it defaults
+#     to {@link default_loader}.  If given, it should be a callable
+#     that implements the same interface as <b>default_loader</b>.
+# @throws FatalIncludeError If the function fails to include a given
+#     resource, or if the tree contains malformed XInclude elements.
+# @throws IOError If the function fails to load a given resource.
+
+# modified from original elementtree version to pick up xincludes in 
+# document portions that are xincluded. (a recursive
+# xinclude) for use in Deliverance
+
+
+def include(elem, loader=None):
+    if loader is None:
+        loader = default_loader
+    # look for xinclude elements
+    i = 0
+    while i < len(elem):
+        e = elem[i]
+        if e.tag == XINCLUDE_INCLUDE:
+            # process xinclude directive
+            href = e.get("href")
+            parse = e.get("parse", "xml")
+            if parse == "xml":
+                node = loader(href, parse)
+                if node is None:
+                    raise FatalIncludeError(
+                        "cannot load %r as %r" % (href, parse)
+                        )
+                node = copy.copy(node)
+                if e.tail:
+                    node.tail = (node.tail or "") + e.tail
+                elem[i] = node
+                # be recursive about including in the included tree
+                include(node,loader)
+            elif parse == "text":
+                text = loader(href, parse, e.get("encoding"))
+                if text is None:
+                    raise FatalIncludeError(
+                        "cannot load %r as %r" % (href, parse)
+                        )
+                if i:
+                    node = elem[i-1]
+                    node.tail = (node.tail or "") + text
+                else:
+                    elem.text = (elem.text or "") + text + (e.tail or "")
+                del elem[i]
+                continue
+            else:
+                raise FatalIncludeError(
+                    "unknown parse type in xi:include tag (%r)" % parse
+                )
+        elif e.tag == XINCLUDE_FALLBACK:
+            raise FatalIncludeError(
+                "xi:fallback tag must be child of xi:include (%r)" % e.tag
+                )
+        else:
+            include(e, loader)
+        i = i + 1
+

Added: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Mon Oct  9 22:03:44 2006
@@ -0,0 +1,151 @@
+from lxml import etree
+import xinclude
+import copy 
+import re
+import utils
+from utils import RuleSyntaxError
+from utils import RendererBase
+
+
+xslt_wrapper_skel = """
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="/">
+    <!-- theme goes here --> 
+  </xsl:template>
+</xsl:transform>"""
+
+
+nsmap = {
+    "dv": "http://www.plone.org/deliverance",
+    "html": "http://www.w3.org/1999/xhtml",
+    "xsl": "http://www.w3.org/1999/XSL/Transform",
+}
+
+class Renderer(RendererBase):
+    """
+    implements a deliverance renderer by preprocessing the rules and theme 
+    into an xslt transform at initialization time and applying it to the 
+    content at render time
+    """
+
+    def __init__(self,theme,theme_uri,rules,reference_resolver=None):
+        theme_copy = copy.deepcopy(theme)
+
+        self.fixup_links(theme_copy,theme_uri)
+        self.remove_http_equiv_metas(theme_copy)
+        self.xsl_escape_comments(theme_copy)
+
+        if reference_resolver:
+            xinclude.include(rules,loader=reference_resolver)
+        self.apply_rules(rules,theme_copy)
+        xslt_wrapper = etree.XML(xslt_wrapper_skel)
+        insertion_point = xslt_wrapper.xpath("//xsl:transform/xsl:template[@match='/']",
+                                             nsmap)[0]
+        insertion_point.append(theme_copy)
+        self.transform = etree.XSLT(xslt_wrapper)
+        
+
+    def render(self,content):
+        if content:
+            return self.transform(content).getroot()
+        else:
+            return self.transform(etree.Element("dummy")).getroot()
+
+
+    def apply_rules(self,rules,theme):
+        for rule in rules:
+            self.apply_rule(rule,theme)
+
+    def apply_rule(self,rule,theme):
+        if rule.tag == self.APPEND_RULE_TAG:
+            self.apply_append(rule,theme)
+        elif rule.tag == self.PREPEND_RULE_TAG:
+            self.apply_prepend(rule,theme)
+        elif rule.tag == self.REPLACE_RULE_TAG:
+            self.apply_replace(rule,theme)
+        elif rule.tag == self.COPY_RULE_TAG:
+            self.apply_copy(rule,theme)
+        elif rule.tag == self.APPEND_OR_REPLACE_RULE_TAG:
+            self.apply_append_or_replace(rule,theme)
+        elif rule.tag == self.SUBRULES_TAG:
+            self.apply_rules(rule,theme)
+        elif rule.tag is etree.Comment:
+            pass
+        else:
+            raise RuleSyntaxError(
+                "Rule %s (%s) not understood" % (
+                    rule.tag, etree.tostring(rule)))
+
+    def apply_append(self,rule,theme):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+
+        copier = etree.SubElement(theme_el,
+                                    "{%s}copy-of" % nsmap["xsl"])
+        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
+
+    def apply_prepend(self,rule,theme):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+
+        copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
+
+        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
+
+        theme_el.insert(0,copier)
+        copier.tail = theme_el.text
+        theme_el.text = None
+
+    def apply_replace(self,rule,theme):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+      
+        copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
+        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
+
+        self.replace_element(theme_el,copier)
+
+
+    def apply_copy(self,rule,theme):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+
+        del(theme_el[:])
+        theme_el.text = None
+        copier = etree.SubElement(theme_el,
+                                    "{%s}copy-of" % nsmap["xsl"])
+        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
+        
+
+   
+    def apply_append_or_replace(self,rule,theme):
+        theme_el = self.get_theme_el(rule,theme)
+        if theme_el is None:
+            return 
+        remove_tag = self.get_tag_from_xpath(rule.attrib[self.RULE_CONTENT_KEY])
+        if remove_tag is None:
+            self.add_to_body_start(theme,self.format_error("invalid xpath for content", rule=rule))
+            return 
+
+        for el in theme_el:
+            if el.tag == remove_tag:
+                theme_el.remove(el)
+        copier = etree.SubElement(theme_el,
+                                    "{%s}copy-of" % nsmap["xsl"])
+        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
+   
+
+    def xsl_escape_comments(self,doc):
+        """
+        replaces comment nodes with xsl:comment nodes 
+        """
+        comment_nodes = doc.xpath('//comment()')
+        for c in comment_nodes:
+            escaped = etree.Element("{%s}comment" % nsmap["xsl"])
+            escaped.text = c.text 
+            self.replace_element(c,escaped)
+    

From ltucker at codespeak.net  Tue Oct 10 17:44:05 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue, 10 Oct 2006 17:44:05 +0200 (CEST)
Subject: [z3-checkins] r33117 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061010154405.3AE0310107@code0.codespeak.net>

Author: ltucker
Date: Tue Oct 10 17:44:03 2006
New Revision: 33117

Modified:
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
refactor simple caching

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Tue Oct 10 17:44:03 2006
@@ -26,30 +26,50 @@
         self.app = app
         self.theme_uri = theme_uri
         self.rule_uri = rule_uri
-        self._theme = None
-        self._rule = None
         self._renderer = None
         self._cache_time = datetime.datetime.now()
         self._timeout = datetime.timedelta(0,10)
         self._lock = threading.Lock()
 
+
+    def get_renderer(self,environ):
+        try:
+            self._lock.acquire()
+            if not self._renderer or self.cache_expired():
+                print "rebuild renderer"
+                self._renderer = self.create_renderer(environ)
+                self._cache_time = datetime.datetime.now()
+            return self._renderer
+        finally:
+            self._lock.release()
+
+    def create_renderer(self,environ):
+        theme = self.theme(environ)
+        rule = self.rule(environ)
+        full_theme_uri = urlparse.urljoin(
+            construct_url(environ, with_path_info=False),
+            self.theme_uri)
+
+        def reference_resolver(href, parse, encoding=None):
+            text = self.get_resource(environ,href)
+            if parse == "xml":
+                return etree.XML(text)
+            elif encoding:
+                return text.decode(encoding)
+
+        return Renderer(etree.HTML(theme), full_theme_uri, etree.XML(rule), 
+                        reference_resolver=reference_resolver)
+
+        
     def cache_expired(self):
         return self._cache_time + self._timeout < datetime.datetime.now()
 
     def rule(self, environ):
-        if self._rule is None or self.cache_expired():
-            self._cache_time = datetime.datetime.now()
-            self._renderer = None
-            self._rule = self.get_resource(environ, self.rule_uri)
-        return self._rule
+        return self.get_resource(environ,self.rule_uri)
 
     def theme(self, environ):
-        if self._theme is None or self.cache_expired():
-            self._cache_time = datetime.datetime.now()
-            self._renderer = None
-            self._theme = self.get_resource(environ, self.theme_uri)
-        return self._theme
-        
+        return self.get_resource(environ,self.theme_uri)
+
     def __call__(self, environ, start_response):
         qs = environ.get('QUERY_STRING', '')
         environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False)
@@ -77,32 +97,8 @@
         return type.startswith('text/html') or type.startswith('application/xhtml+xml')
 
     def filter_body(self, environ, body):
-        try:
-            self._lock.acquire()
-            theme = self.theme(environ)
-            rule = self.rule(environ)
-            full_theme_uri = urlparse.urljoin(
-                construct_url(environ, with_path_info=False),
-                self.theme_uri)
-
-            def reference_resolver(href, parse, encoding=None):
-                text = self.get_resource(environ,href)
-                if parse == "xml":
-                    return etree.XML(text)
-                elif encoding:
-                    return text.decode(encoding)
-
-            if not self._renderer:
-                self._renderer = Renderer(etree.HTML(theme), full_theme_uri, etree.XML(rule), 
-                                          reference_resolver=reference_resolver)
-
-            content = self._renderer.render(etree.HTML(body))
+            content = self.get_renderer(environ).render(etree.HTML(body))
             return tostring(content)
-        finally:
-                self._lock.release()
-
-
-
 
     def get_resource(self, environ, uri):
         internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)

From cabraham at codespeak.net  Tue Oct 10 22:06:08 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Tue, 10 Oct 2006 22:06:08 +0200 (CEST)
Subject: [z3-checkins] r33137 - in
	z3/deliverance/branches/packaged/deliverance: . test-data/nycsr
Message-ID: <20061010200608.B47C110146@code0.codespeak.net>

Author: cabraham
Date: Tue Oct 10 22:06:00 2006
New Revision: 33137

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr_speed.html
   z3/deliverance/branches/packaged/deliverance/test_speed.py
Log:
Added a test to compare the speeds of the two renderers.

Added: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr_speed.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr_speed.html	Tue Oct 10 22:06:00 2006
@@ -0,0 +1,441 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>The New York City Streets Renaissance</title>
+		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<meta name="author" content="New York City Streets Renaissance" />
+	<meta name="description" content="" />
+	<meta name="keywords" content="" />
+	<meta name="generator" content="BBEdit 8.2" />
+	<meta name="MSSmartTagsPreventParsing" content="true" />
+	<meta name="robots" content="all" />
+	
+	<style type="text/css" media="screen">@import url(/css/style.css);</style>
+	<style type="text/css" media="screen">@import url(/css/nav.css);</style>
+	
+	<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = function() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	</script>
+	<script src="js/gallery.js" type="text/javascript" language="javascript"></script>
+	<!-- image fade: http://www.dynamicdrive.com/dynamicindex14/fadeinslideshow.htm -->
+</head>
+<body id="page-home" class="index">
+
+		<!-- Header -->
+	<div id="header">
+		<h1 class="logo">
+			<a href="/">
+				<span>The New York City Streets Renaissance</span>
+			</a>
+		</h1>
+	</div>
+	<!-- / Header -->
+	
+	<hr />
+	
+	
+<script type="text/javascript"><!--//--><![CDATA[//><!--
+startList = function() {
+	if (document.all&&document.getElementById) {
+		navRoot = document.getElementById("menu");
+		for (i=0; i<navRoot.childNodes.length; i++) {
+			node = navRoot.childNodes[i];
+			if (node.nodeName=="LI") {
+				node.onmouseover=function() {
+					this.className+=" over";
+				}
+				node.onmouseout=function() {
+					this.className=this.className.replace(" over", "");
+				}
+			}
+		}
+	}
+}
+window.onload=startList;
+
+//--><!]]></script>
+	
+	<!-- Top Level Links -->
+	<div id="toplevel">
+		<ul class="links">
+			<li id="top-home">
+				<a href="/">
+					<strong>
+						<span>Home Page</span>
+					</strong>
+				</a>
+			</li>
+			<li id="top-join">
+				<a href="/involved/join.php">
+					<strong>
+						<span>Join Us</span>
+					</strong>
+				</a>
+			</li>
+		</ul>
+	</div>
+	<!-- / Top Level Links -->
+	
+	<!-- Navigation Bar -->
+	<div id="nav">
+		<ul id="menu" class="tabs">
+			<li id="nav-who" >
+				<a href="/who/">
+					<strong>
+						<span>Who We Are</span>
+					</strong>
+				</a>
+				<ul class="sub">
+					<li>
+						<a href="/who/supporters.php">
+							<span>Supporters List</span>
+						</a>
+					</li>
+					<li>
+						<a href="/who/contact.php">
+							<span>Contact Us</span>
+						</a>
+					</li>
+									</ul>
+			</li>
+			<li id="nav-nyc" >
+				<a href="/nyc/">
+					<strong>
+						<span>New York Streets</span>
+					</strong>
+				</a>
+				<ul class="sub">
+					<li>
+						<a href="/nyc/truth.php">
+							<span>The Truth About Traffic</span>
+						</a>
+					</li>
+					<li>
+						<a href="/nyc/broken.php">
+							<span>Broken Streets</span>
+						</a>
+					</li>
+					<li>
+						<a href="/nyc/building.php">
+							<span>Building on Progress</span>
+						</a>
+					</li>
+					<li>
+						<a href="/nyc/video.php">
+							<span>Video Gallery</span>
+						</a>
+					</li>
+					<li>
+						<a href="/nyc/photo.php">
+							<span>Photo Gallery</span>
+						</a>
+					</li>
+				</ul>
+			</li>
+			<li id="nav-lessons" >
+				<a href="/lessons/">
+					<strong>
+						<span>Global Lessons</span>
+					</strong>
+				</a>
+				<ul class="sub">
+					<li>
+						<a href="/lessons/chicago.php">
+							<span>Chicago</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/philadelphia.php">
+							<span>Philadelphia</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/london.php">
+							<span>London</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/paris.php">
+							<span>Paris</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/copenhagen.php">
+							<span>Copenhagen</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/great.php">
+							<span>What Makes a Great Street?</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/benefits.php">
+							<span>The Benefits of Great Streets</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/photo.php">
+							<span>Photo Gallery</span>
+						</a>
+					</li>
+				</ul>
+			</li>
+			<li id="nav-involved" >
+				<a href="/involved/">
+					<strong>
+						<span>Get Involved</span>
+					</strong>
+				</a>
+				<ul class="sub">
+					<li>
+						<a href="/involved/join.php">
+							<span>Join Us</span>
+						</a>
+					</li>
+										<li>
+						<a href="/involved/ways.php">
+							<span>Ways to Get Involved</span>
+						</a>
+					</li>
+					<li>
+						<a href="/involved/resources.php">
+							<span>Resources</span>
+						</a>
+					</li>
+				</ul>
+			</li>
+			<li id="nav-events" >
+				<a href="/events/">
+					<strong>
+						<span>Events</span>
+					</strong>
+				</a>
+							</li>
+		</ul>
+		<div class="clear"></div>
+	</div>
+	<!-- / Navigation Bar -->	
+	<hr />
+	
+	<!-- Container -->
+	<div id="container">
+		
+		<!-- Body -->
+		<div id="body">
+		
+			<p class="callout">
+				New York is a city best enjoyed on foot, yet we plan our streets for cars.
+			</p>
+			<p>
+				New York City's streets are the soul of its neighborhoods and the pathways to some of the world's most in-demand destinations. For generations, New Yorkers and visitors have strolled, shopped and socialized on sidewalks and street corners. Pedestrian friendly streets are the city's most fundamental assets.
+			</p>
+			<p>
+				Unfortunately, we aren't making the most of these assets. Instead, our streets are being managed almost entirely for traffic flow, with neighborhoods and business districts buckling under increasing amounts of dangerous car and truck traffic. If we continue planning our streets for cars and traffic, we will get more cars and traffic; conversely, if we start planning our cities for people and places, we will get more people and places.
+			</p>
+			<p>
+				Streets are more than just car corridors; they are valuable civic spaces and resources that need to be wisely allocated. The New York City Streets Renaissance Campaign is building the movement to re-imagine our streets as lively public places.
+			</p>
+			
+			<div class="infoblock">
+				<h4>
+					Goals of the New York City Streets Renaissance
+				</h4>
+				<ul class="breakdown">
+					<li>
+						<strong>Educate</strong> New Yorkers about potential transportation policy changes that will improve quality of life across New York City
+					</li>
+					<li>
+						<strong>Promote</strong> a rebalancing of this public space away from private vehicles and toward community needs
+					</li>
+					<li>
+						<strong>Demonstrate</strong> the widespread public support for reform on these issues
+					</li>
+					<li>
+						<strong>Tap</strong> the potential of New Yorkers to re-imagine their own streets
+					</li>
+				</ul>
+			</div>
+			
+			<p>
+				The choice is clear: either we choose to be defined by worsening traffic and perilous streets or we can define ourselves through great public spaces and lively streets. Through action and dialogue New Yorkers can raise expectations for their public realm. <a href="involved/join.php">Join our city-wide campaign</a> for local improvements that reflect your neighborhood's unique character.
+			</p>
+		
+		</div>
+		<!-- / Body -->
+		
+		<!-- Sidebar -->
+		<div id="sidebar">
+		
+			<div class="barker">
+				<h3 id="home-nyc" class="join">
+					New York Streets: Video Gallery
+				</h3>
+				<ul class="video">
+					<li>
+						<a href="/nyc/video-view.php?id=1">
+							<span class="thumb"><img src="/files/videos/thumbs/introduction.jpg" alt="" /></span>
+							<strong class="title">
+								Introduction
+							</strong>
+							<span class="meta">
+								(1:00 - 2.71 MB)
+							</span>
+							<p class="caption">
+								Mark Gorton introduces the goals of the NYC Streets Renaissance project.
+							</p>
+						</a>
+					</li>
+				</ul>
+				<div class="clear"></div>
+				<p class="more">
+					<a href="/nyc/video.php">
+						More Videos &raquo;
+					</a>
+				</p>		
+			</div>
+			
+						
+			<div class="barker">
+				<h3 id="home-lessons" class="join">
+					Global Lessons: Photo Gallery
+				</h3>
+				<ul class="video">
+					<li>
+						<a href="/lessons/photo-view.php?id=16">
+							<span class="thumb"><img src="/files/photos/thumbs/great-1.jpg" alt="" /></span>
+							<strong class="title">
+								An Engaging Street
+							</strong>
+							<p class="caption">
+								<br />
+								Queen Street in Toronto has engaging sidewalks and destinations that attract both residents and tourists.
+							</p>
+						</a>
+					</li>
+				</ul>
+				<div class="clear"></div>
+				<p class="more">
+					<a href="/lessons/photo.php">
+						More Photos &raquo;
+					</a>
+				</p>
+			</div>
+			
+			<div class="barker">
+				<h3 id="home-involved" class="join">
+					StreetsBlog
+				</h3>
+				<p class="text">
+					Read the official weblog of the New York City Streets Renaissance.
+				</p>
+				<p class="more">
+					<a href="http://streetsblog.org/">
+						Visit StreetsBlog &raquo;
+					</a>
+				</p>
+			</div>
+			
+			<div class="barker">
+				<h3 id="home-involved" class="join">
+					Get Involved
+				</h3>
+				<p class="text">
+					Stay informed and send a strong message that you support a better quality of streets by signing up for our mailing list.
+				</p>
+				<p class="more">
+					<a href="/involved/join.php">
+						Join Us &raquo;
+					</a>
+				</p>
+			</div>
+			
+					
+		</div>
+		<!-- / Sidebar -->
+		
+		<div class="clear"></div>
+		
+	</div>
+	<!-- / Container -->
+	
+	<hr />
+	
+		<!-- Footer -->
+	<div id="footer">
+		<p class="links">
+		[ 
+		<a href="/">
+			<span>Home</span>
+		</a> 
+		| 
+		<a href="/who/">
+			<span>Who We Are</span>
+		</a> 
+		| 
+		<a href="/nyc/">
+			<span>New York Lessons</span>
+		</a> 
+		| 
+		<a href="/lessons/">
+			<span>Global Lessons</span>
+		</a> 
+		| 
+		<a href="/involved/">
+			<span>Get Involved</span>
+		</a> 
+		| 
+		<a href="/events/">
+			<span>Events</span>
+		</a> 
+		| 
+		<a href="/involved/join.php">
+			<span>Join Us</span>
+		</a> 
+		]
+		</p>
+		<p class="cc">
+			<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/">
+				<img alt="Creative Commons License" border="0" src="/img/logos/cc.png" class="logo" /><br />
+				These works are licensed under a Creative Commons License
+			</a>
+		</p>
+		<!--
+		<rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+			<Work rdf:about="">
+				<license rdf:resource="http://creativecommons.org/licenses/by-nc-nd/2.5/" />
+				<dc:type rdf:resource="http://purl.org/dc/dcmitype/Text" />
+			</Work>
+			<License rdf:about="http://creativecommons.org/licenses/by-nc-nd/2.5/">
+				<permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+				<permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+				<requires rdf:resource="http://web.resource.org/cc/Notice"/>
+				<requires rdf:resource="http://web.resource.org/cc/Attribution"/>
+				<prohibits rdf:resource="http://web.resource.org/cc/CommercialUse"/>
+			</License>
+		</rdf:RDF>
+		-->
+	</div>
+	<!-- / Footer -->
+</body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test_speed.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test_speed.py	Tue Oct 10 22:06:00 2006
@@ -0,0 +1,73 @@
+import sys 
+from lxml import etree
+from htmlserialize import tostring
+import urllib
+from interpreter import Renderer as PythonRenderer
+from xslt import Renderer as XSLTRenderer
+from optparse import OptionParser
+import re
+import os
+from time import time
+
+"""
+Tests the relative speed of the Python and XSLT renderers
+
+"""
+
+
+DEFAULT_BASE_URL = "http://www.example.com"
+
+
+def grab_url(url):
+    f = open(url)
+    data = f.read()
+    f.close()
+    return data
+
+def do_transform(renderer_type, theme_url, base_url, rules_url, content_url):
+    rules = etree.XML(grab_url(rules_url))
+    theme = etree.HTML(grab_url(theme_url))
+    content = etree.HTML(grab_url(content_url))
+    
+    def reference_resolver(href, parse, encoding=None):
+        if not href.startswith('/'):
+            href = os.path.join(os.path.dirname(rules_url),href)
+        text = grab_url(href)
+        if parse == "xml":
+            return etree.XML(text)
+        elif encoding:
+            return text.decode(encoding)
+
+    start = time()
+    iters = 1000
+    for i in range(iters):
+        renderer = None
+        if renderer_type == 'xslt':
+            renderer = XSLTRenderer(theme,base_url,rules,reference_resolver)
+        elif renderer_type == 'py':
+            renderer = PythonRenderer(theme,base_url,rules,reference_resolver)
+        else:
+            print "Unknown renderer type '" + renderer_type + "'"
+            return etree.Element("error")
+        renderer.render(content)
+
+    print "Renderer: " + renderer_type
+    print "*** time:", time() - start , " for " , iters, " iterations ***\n"
+
+    return
+        
+
+def parse_blend_file(filename):
+    b = etree.XML(open(filename).read())
+    return b.get('theme'),b.get('baseurl'),b.get('rules')
+
+
+def die(message,parser):
+    print message
+    parser.print_usage()
+    sys.exit(0)    
+    
+if __name__ == '__main__':
+    do_transform('xslt','test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','test-data/nycsr/nycsr.xml','test-data/nycsr/openplans.html')
+    do_transform('py','test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','test-data/nycsr/nycsr.xml','test-data/nycsr/openplans.html')
+    

From cabraham at codespeak.net  Tue Oct 10 22:50:59 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Tue, 10 Oct 2006 22:50:59 +0200 (CEST)
Subject: [z3-checkins] r33142 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061010205059.2113F1011C@code0.codespeak.net>

Author: cabraham
Date: Tue Oct 10 22:50:57 2006
New Revision: 33142

Modified:
   z3/deliverance/branches/packaged/deliverance/test_speed.py
Log:
updated test_speed.py

Modified: z3/deliverance/branches/packaged/deliverance/test_speed.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_speed.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_speed.py	Tue Oct 10 22:50:57 2006
@@ -38,17 +38,18 @@
         elif encoding:
             return text.decode(encoding)
 
+    renderer = None
+    if renderer_type == 'xslt':
+        renderer = XSLTRenderer(theme,base_url,rules,reference_resolver)
+    elif renderer_type == 'py':
+        renderer = PythonRenderer(theme,base_url,rules,reference_resolver)
+    else:
+        print "Unknown renderer type '" + renderer_type + "'"
+        return etree.Element("error")
+
     start = time()
-    iters = 1000
+    iters = 3000
     for i in range(iters):
-        renderer = None
-        if renderer_type == 'xslt':
-            renderer = XSLTRenderer(theme,base_url,rules,reference_resolver)
-        elif renderer_type == 'py':
-            renderer = PythonRenderer(theme,base_url,rules,reference_resolver)
-        else:
-            print "Unknown renderer type '" + renderer_type + "'"
-            return etree.Element("error")
         renderer.render(content)
 
     print "Renderer: " + renderer_type

From ltucker at codespeak.net  Wed Oct 11 21:54:39 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 11 Oct 2006 21:54:39 +0200 (CEST)
Subject: [z3-checkins] r33191 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
	test-data/static
Message-ID: <20061011195439.EE1CE101AA@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 11 21:54:32 2006
New Revision: 33191

Modified:
   z3/deliverance/branches/packaged/deliverance/htmlserialize.py
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/static/rules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/static/text-rules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
   z3/deliverance/branches/packaged/deliverance/utils.py
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
   z3/deliverance/branches/packaged/deliverance/xslt.py
Log:
error handling for missing content, fix for foreign character sets

Modified: z3/deliverance/branches/packaged/deliverance/htmlserialize.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/htmlserialize.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/htmlserialize.py	Wed Oct 11 21:54:32 2006
@@ -1,5 +1,5 @@
 from lxml import etree
-
+import re
 
 html_xsl = """
 <xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -37,3 +37,26 @@
         return str(html_transform(doc))
                   
 
+
+
+HTTP_EQUIV_MATCHER_PAT = re.compile(r"\<\s*meta\s+([^\>])*http-equiv\s*=\s*(\'|\")\s*content-type\s*(\'|\")([^\>])*charset\s*=\s*(?P<charset>[\w-]+)([^\>])*\>",re.I|re.M) 
+OTHER_HTTP_EQUIV_MATCHER_PAT = re.compile(r"\<\s*meta\s+([^\>])*charset\s*=\s*(?P<charset>[\w-]+)([^\>])*http-equiv\s*=\s*(\'|\")\s*content-type\s*(\'|\")([^\>])*\>",re.I|re.M) 
+def decodeAndParseHTML(text):
+    """
+    if an html meta tag specifying a charset can be matched, 
+    decode the text to a python unicode string before parsing
+    """
+    m = HTTP_EQUIV_MATCHER_PAT.search(text)
+    if not m:
+        m = OTHER_HTTP_EQUIV_MATCHER_PAT.search(text)
+
+    if m:
+        charset = m.group('charset')
+        text = text.decode(charset)
+
+    return etree.HTML(text)
+    
+
+        
+
+    

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Wed Oct 11 21:54:32 2006
@@ -62,6 +62,7 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if (len(content_els) == 0):
+            self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
         non_text_els = self.elements_in(content_els)
@@ -96,6 +97,7 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if (len(content_els) == 0):
+            self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
         non_text_els = self.elements_in(content_els)
@@ -141,8 +143,7 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
-            self.attach_text_to_previous(theme_el,theme_el.tail)
-            theme_el.getparent().remove(theme_el)
+            self.add_to_body_start(theme, self.format_error("no content matched", rule))            
             return       
 
         non_text_els = self.elements_in(content_els)
@@ -195,6 +196,7 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
+            self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
         non_text_els = self.elements_in(content_els)
@@ -222,11 +224,16 @@
             self.add_to_body_start(theme,self.format_error("invalid xpath for content", rule=rule))
             return
 
+        content_els = copy.deepcopy(content.xpath(content_xpath))        
+ 
+        if len(content_els) == 0:
+            self.add_to_body_start(theme, self.format_error("no content matched", rule))
+            return 
+
         for el in theme_el:
             if el.tag == remove_tag:
                 theme_el.remove(el)
 
-        content_els = copy.deepcopy(content.xpath(content_xpath))
         self.strip_tails(content_els)
         theme_el.extend(content_els)
 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/static/rules.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/static/rules.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/rules.xml	Wed Oct 11 21:54:32 2006
@@ -2,8 +2,8 @@
   <rules xmlns="http://www.plone.org/deliverance">
     <append-or-replace theme="//head" content="//head/title" />
     <append theme="//head" content="//head/link" />
-    <append theme="//head" content="//head/script" />    
-    <append theme="//head" content="//head/style" />    
-    <append theme="//head" content="//head/meta" />
+    <append theme="//head" content="//head/script" onerror="ignore" />    
+    <append theme="//head" content="//head/style" onerror="ignore" />    
+    <append theme="//head" content="//head/meta" onerror="ignore" />
     <copy theme="//div[@id='content']" content="//body/*" />
   </rules>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/static/text-rules.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/static/text-rules.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/static/text-rules.xml	Wed Oct 11 21:54:32 2006
@@ -2,8 +2,8 @@
   <rules xmlns="http://www.plone.org/deliverance">
     <append-or-replace theme="//head" content="//head/title" />
     <append theme="//head" content="//head/link" />
-    <append theme="//head" content="//head/script" />    
-    <append theme="//head" content="//head/style" />    
-    <append theme="//head" content="//head/meta" />
+    <append theme="//head" content="//head/script" onerror="ignore"/>    
+    <append theme="//head" content="//head/style" onerror="ignore"/>    
+    <append theme="//head" content="//head/meta" onerror="ignore"/>
     <copy theme="//div[@id='content']" content="//body/child::node()" />
   </rules>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	Wed Oct 11 21:54:32 2006
@@ -68,17 +68,51 @@
   </content>
   
   <output>
-    <html>
-      <head>
-	<title>Blah</title>
-      </head>
-      <body>
-	<div class="foo">Dummy Content<div class="deliverance-error">
-	    Deliverance error: multiple elements found in theme<br/>rule: &lt;append theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-	</div></div>
-	<div class="foo">Dummy Content</div>
-      </body>
-    </html>
+  <html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;append theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+</textarea></div>
+    <div class="foo">Dummy Content</div>
+    <div class="foo">Dummy Content</div>
+  </body>
+</html>
+
+  </output> 
+</deliverance-test>
+
+
+<!-- tests append command generates an error when no content is found -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme=".//div[@id='foo']" content="//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: no content matched<br/>rule: &lt;append theme=".//div[@id='foo']" content="//div[@id='bar']"/&gt;
+  </div>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p></div>
+  </body>
+</html>
   </output> 
 </deliverance-test>
 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	Wed Oct 11 21:54:32 2006
@@ -91,18 +91,20 @@
   </content>
   
   <output>
-    <html>
-      <head>
-	<title>Blah</title>
-      </head>
-      <body>
-	<div>Dummy Content<div class="deliverance-error">
-	    Deliverance error: multiple elements found in theme<br/>rule: &lt;append-or-replace theme=".//div" content=".//div"/&gt;
-	</div></div>
-	<div>Dummy Content</div>
-      </body>
-    </html>
-  </output> 
+   <html>
+     <head>
+       <title>Blah</title>
+     </head>
+     <body>
+       <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;append-or-replace theme=".//div" content=".//div"/&gt;
+	 <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div&gt;Dummy Content&lt;/div&gt;
+&lt;div&gt;Dummy Content&lt;/div&gt;
+       </textarea></div>
+       <div>Dummy Content</div>
+       <div>Dummy Content</div>
+     </body>
+   </html>
+  </output>
 </deliverance-test>
 
 
@@ -167,4 +169,38 @@
   </output>
 </deliverance-test>
 
+
+
+
+<!-- tests append-or-replace command generates an error when no content is found -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme=".//div[@id='foo']" content="//span[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo"><span>Dummy Content</span><p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: no content matched<br/>rule: &lt;append-or-replace theme=".//div[@id='foo']" content="//span[@id='bar']"/&gt;
+  </div>
+    <div/>
+    <div id="foo"><span>Dummy Content</span><p>HI!</p></div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
 </deliverance-test-suite>
+

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	Wed Oct 11 21:54:32 2006
@@ -69,11 +69,15 @@
     <title>Blah</title>
   </head>
   <body>
-    <div class="foo">Dummy Content<div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;copy theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-  </div></div>
+    <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;copy theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+</textarea></div>
+    <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>
   </body>
 </html>
+
   </output> 
 </deliverance-test>
 
@@ -120,4 +124,35 @@
 </deliverance-test>
 
 
+<!-- tests copy command generates an error when no content is found -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme=".//div[@id='foo']" content="//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: no content matched<br/>rule: &lt;copy theme=".//div[@id='foo']" content="//div[@id='bar']"/&gt;
+  </div>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p></div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
+
 </deliverance-test-suite>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	Wed Oct 11 21:54:32 2006
@@ -68,22 +68,25 @@
   </content>
   
   <output>
-    <html>
-      <head>
-	<title>Blah</title>
-      </head>
-      <body>
-	<div class="foo">Dummy Content<div class="deliverance-error">
-	    Deliverance error: multiple elements found in theme<br/>rule: &lt;prepend theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-	</div></div>
-	<div class="foo">Dummy Content</div>
-      </body>
-    </html>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;prepend theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+</textarea></div>
+    <div class="foo">Dummy Content</div>
+    <div class="foo">Dummy Content</div>
+  </body>
+</html>
+
   </output> 
 </deliverance-test>
 
 
-<!-- tests preppend command successfully prepends the contents of a div tag with all contents of body tag, 
+<!-- tests prepend command successfully prepends the contents of a div tag with all contents of body tag, 
 including unelemented text --> 
 <deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance">
@@ -105,4 +108,35 @@
   </output> 
 </deliverance-test>
 
+
+<!-- tests prepend command generates an error when no content is found -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <prepend theme=".//div[@id='foo']" content="//div[@id='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: no content matched<br/>rule: &lt;prepend theme=".//div[@id='foo']" content="//div[@id='bar']"/&gt;
+  </div>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p></div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
 </deliverance-test-suite>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	Wed Oct 11 21:54:32 2006
@@ -76,16 +76,20 @@
   </content>
  
   <output>
-    <html>
-      <head>
+<html>
+  <head>
     <title>Blah</title>
   </head>
   <body>
-    <div class="foo">Dummy Content<div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;replace theme="//div[@class='foo']" content="//div[@id='bar']"/&gt;
-  </div></div>
+    <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;replace theme="//div[@class='foo']" content="//div[@id='bar']"/&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+</textarea></div>
+    <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>
   </body>
 </html>
+
   </output> 
 </deliverance-test>
 
@@ -148,22 +152,34 @@
   </output> 
 </deliverance-test>
 
-<!-- tests that when no content element is matched, the theme element is simply deleted without error -->
+
+<!-- tests replace command generates an error when no content is found -->
 <deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance">
-    <replace theme="//div[@id='foo']" content="//div[@id='bar']" />
+    <replace theme=".//div[@id='foo']" content="//div[@id='bar']" />
   </rules>
 
   <theme base="http://example.com"> 
-     <html><head><title>Blah</title></head><body>lead<div id="foo">Dummy Content</div>tail</body></html>
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
   </theme>
 
   <content> 
-     <html><body><div id="bars">Real Content</div></body></html>
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
   </content>
- 
+  
   <output>
-     <html><head><title>Blah</title></head><body>leadtail</body></html>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div class="deliverance-error">Deliverance error: no content matched<br/>rule: &lt;replace theme=".//div[@id='foo']" content="//div[@id='bar']"/&gt;
+  </div>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p></div>
+  </body>
+</html>
   </output> 
 </deliverance-test>
 

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Wed Oct 11 21:54:32 2006
@@ -1,6 +1,7 @@
 from lxml import etree
 import re
 import urlparse
+import htmlserialize
 
 class RuleSyntaxError(Exception):
     """
@@ -38,8 +39,8 @@
             self.add_to_body_start(theme, e)
             return None
         elif len(theme_els)> 1:
-            e = self.format_error("multiple elements found in theme", rule)
-            theme_els[0].append(e)
+            e = self.format_error("multiple elements found in theme", rule, theme_els)
+            self.add_to_body_start(theme, e)
             return None
         return theme_els[0]
 
@@ -61,7 +62,15 @@
         br.tail = 'rule: %s' % etree.tostring(rule)
         d.append(br)
         if elts:
-            d.extend(elts)
+            d.append(etree.Element('br'))
+            textArea = etree.Element('textarea')
+            textArea.attrib['rows'] = '24'
+            textArea.attrib['cols'] = '80'
+            textArea.attrib['readonly'] = 'readonly'
+            textArea.text = ''
+            for el in elts:
+                textArea.text += htmlserialize.tostring(el)
+            d.append(textArea)
         return d
 
 
@@ -75,6 +84,8 @@
 
 
     def add_to_body_start(self,theme, el):
+        if not el:
+            return
         body = theme.find('body')
         if body is None:
             body = theme[0]

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Wed Oct 11 21:54:32 2006
@@ -8,6 +8,8 @@
 import urlparse
 import urllib
 from lxml import etree
+#from lxml.etree import HTML as parseHTML 
+from htmlserialize import decodeAndParseHTML as parseHTML
 from paste.wsgilib import intercept_output
 from paste.request import construct_url
 from paste.response import header_value, replace_header
@@ -36,7 +38,6 @@
         try:
             self._lock.acquire()
             if not self._renderer or self.cache_expired():
-                print "rebuild renderer"
                 self._renderer = self.create_renderer(environ)
                 self._cache_time = datetime.datetime.now()
             return self._renderer
@@ -57,7 +58,7 @@
             elif encoding:
                 return text.decode(encoding)
 
-        return Renderer(etree.HTML(theme), full_theme_uri, etree.XML(rule), 
+        return Renderer(parseHTML(theme), full_theme_uri, etree.XML(rule), 
                         reference_resolver=reference_resolver)
 
         
@@ -86,6 +87,7 @@
         if status is None:
             # should_intercept returned False
             return body
+
         body = self.filter_body(environ, body)
         replace_header(headers, 'content-length', str(len(body)))
         replace_header(headers, 'content-type', 'text/html; charset=utf-8')
@@ -97,8 +99,8 @@
         return type.startswith('text/html') or type.startswith('application/xhtml+xml')
 
     def filter_body(self, environ, body):
-            content = self.get_renderer(environ).render(etree.HTML(body))
-            return tostring(content)
+        content = self.get_renderer(environ).render(parseHTML(body))
+        return tostring(content)
 
     def get_resource(self, environ, uri):
         internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)

Modified: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xslt.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Wed Oct 11 21:54:32 2006
@@ -42,7 +42,9 @@
         insertion_point = xslt_wrapper.xpath("//xsl:transform/xsl:template[@match='/']",
                                              nsmap)[0]
         insertion_point.append(theme_copy)
+
         self.transform = etree.XSLT(xslt_wrapper)
+    
         
 
     def render(self,content):
@@ -81,15 +83,24 @@
         if theme_el is None:
             return 
 
+        # add an element that produces an error in the theme if 
+        # no content is matched 
+        self.add_conditional_missing_content_error(theme,rule)
+
         copier = etree.SubElement(theme_el,
                                     "{%s}copy-of" % nsmap["xsl"])
         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
 
+
     def apply_prepend(self,rule,theme):
         theme_el = self.get_theme_el(rule,theme)
         if theme_el is None:
             return 
 
+        # add an element that produces an error in the theme if 
+        # no content is matched 
+        self.add_conditional_missing_content_error(theme,rule)
+
         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
 
         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
@@ -102,11 +113,21 @@
         theme_el = self.get_theme_el(rule,theme)
         if theme_el is None:
             return 
-      
+
+        self.add_conditional_missing_content_error(theme,rule)      
+
         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
 
-        self.replace_element(theme_el,copier)
+
+        # if content is matched, replace the theme element, otherwise, keep the
+        # theme element 
+        choose = self.make_when_otherwise("count(%s)=0" % 
+                                          rule.attrib[self.RULE_CONTENT_KEY], 
+                                          copy.deepcopy(theme_el), 
+                                          copier)
+
+        self.replace_element(theme_el,choose)
 
 
     def apply_copy(self,rule,theme):
@@ -114,11 +135,30 @@
         if theme_el is None:
             return 
 
-        del(theme_el[:])
-        theme_el.text = None
+        # add an element that produces an error in the theme if 
+        # no content is matched 
+        self.add_conditional_missing_content_error(theme,rule)
+
+        # create an element that is like the target theme element 
+        # with its children replaced by an xsl copy element 
+        copy_theme_el = copy.deepcopy(theme_el)
+        del(copy_theme_el[:])
+        copy_theme_el.text = None
         copier = etree.SubElement(theme_el,
                                     "{%s}copy-of" % nsmap["xsl"])
-        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
+        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])  
+        copy_theme_el.append(copier)
+
+        # create a copy of the current theme element 
+        normal_theme_el = copy.deepcopy(theme_el)
+
+        # create an xsl choose element that picks between them based 
+        # on whether content was matched 
+        choose = self.make_when_otherwise("count(%s)=0" % 
+                                          rule.attrib[self.RULE_CONTENT_KEY], 
+                                          normal_theme_el, 
+                                          copy_theme_el)
+        self.replace_element(theme_el,choose)
         
 
    
@@ -131,12 +171,21 @@
             self.add_to_body_start(theme,self.format_error("invalid xpath for content", rule=rule))
             return 
 
+        # add an element that produces an error in the theme if 
+        # no content is matched 
+        self.add_conditional_missing_content_error(theme,rule)
+
         for el in theme_el:
             if el.tag == remove_tag:
-                theme_el.remove(el)
-        copier = etree.SubElement(theme_el,
-                                    "{%s}copy-of" % nsmap["xsl"])
-        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
+                conditional = etree.Element("{%s}if" % nsmap["xsl"])
+                conditional.set("test","count(%s) = 0" % 
+                                rule.attrib[self.RULE_CONTENT_KEY])
+                conditional.append(copy.deepcopy(el))
+                self.replace_element(el,conditional)
+ 
+        copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
+        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
+        theme_el.append(copier)
    
 
     def xsl_escape_comments(self,doc):
@@ -149,3 +198,24 @@
             escaped.text = c.text 
             self.replace_element(c,escaped)
     
+    def add_conditional_missing_content_error(self,theme,rule):
+        """
+        """
+        err = self.format_error("no content matched", rule)
+        if err:
+            conditional = etree.Element("{%s}if" % nsmap["xsl"])
+            conditional.set("test", "count(%s)=0" % rule.attrib[self.RULE_CONTENT_KEY])
+            conditional.append(err)
+            self.add_to_body_start(theme,conditional)
+        
+
+    def make_when_otherwise(self, test, whenbody, otherwisebody):
+        choose = etree.Element("{%s}choose" % nsmap["xsl"])
+        when = etree.Element("{%s}when" % nsmap["xsl"])
+        when.set("test", test)
+        when.append(copy.deepcopy(whenbody))
+        otherwise = etree.Element("{%s}otherwise" % nsmap["xsl"])
+        otherwise.append(otherwisebody)
+        choose.append(when)
+        choose.append(otherwise)
+        return choose

From ltucker at codespeak.net  Wed Oct 11 23:41:34 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 11 Oct 2006 23:41:34 +0200 (CEST)
Subject: [z3-checkins] r33197 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061011214134.67D30101B8@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 11 23:40:57 2006
New Revision: 33197

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/test_debug.xml
Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/xslt.py
Log:
added preliminary debug support for xslt

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Wed Oct 11 23:40:57 2006
@@ -20,6 +20,12 @@
         if reference_resolver:
             xinclude.include(self.rules, loader=reference_resolver)
 
+        debug = rules.get("debug", None)
+        if debug and debug.lower() == "true":
+            self.debug = True
+        else:
+            self.debug = False
+
 
     def render(self, content):
         result = copy.deepcopy(self.theme)

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_debug.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_debug.xml	Wed Oct 11 23:40:57 2006
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+
+<!-- test debug mode with append --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance" debug="true">
+    <append theme="//body" content="//body/div" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html>
+    <body>
+      before the div<div>in the div</div>after the div
+    </body></html>
+  </theme>
+
+  <content> 
+    <html>
+      <body><div>Real Content</div>
+    </body></html>
+  </content>
+  
+  <output>
+    <html>
+        <body>
+            before the div<div>in the div</div>after the div
+         <!--Deliverance: applying rule <append theme="//body" content="//body/div"/>
+         --><div>Real Content</div><!--Deliverance: done applying rule <append theme="//body" content="//body/div"/>
+         --></body>
+      </html>
+  </output> 
+</deliverance-test>
+
+
+<!-- test debug mode with append-or-replace --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance" debug="true">
+    <append-or-replace theme="//body" content="//body/div" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html>
+    <body>
+      before the div<div>in the div</div>after the div
+    </body></html>
+  </theme>
+
+  <content> 
+    <html>
+      <body><div>Real Content</div>
+    </body></html>
+  </content>
+  
+  <output>
+    <html>
+        <body>
+             before the divafter the div
+         <!--Deliverance: applying rule <append-or-replace theme="//body" content="//body/div"/>
+         --><div>Real Content</div><!--Deliverance: done applying rule <append-or-replace theme="//body" content="//body/div"/>
+         --></body>
+      </html>
+  </output> 
+</deliverance-test>
+
+
+
+<!-- test debug mode with prepend --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance" debug="true">
+    <prepend theme="//body" content="//body/div" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html>
+    <body>
+      before the div<div>in the div</div>after the div
+    </body></html>
+  </theme>
+
+  <content> 
+    <html>
+      <body><div>Real Content</div>
+    </body></html>
+  </content>
+  
+  <output>
+    <html>
+        <body>
+         <!--Deliverance: applying rule <prepend theme="//body" content="//body/div"/>
+         --><div>Real Content</div><!--Deliverance: done applying rule <prepend theme="//body" content="//body/div"/>
+         -->
+            before the div<div>in the div</div>after the div
+     </body>
+      </html>
+  </output> 
+</deliverance-test>
+
+
+
+<!-- test debug mode with replace --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance" debug="true">
+    <replace theme="//body/span" content="//body/div" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html>
+    <body>
+        i'm before the span<span>i'm in a span</span>i'm after the span
+    </body></html>
+  </theme>
+
+  <content> 
+    <html>
+      <body><div>Real Content</div>
+    </body></html>
+  </content>
+  
+  <output>
+    <html>
+        <body>
+         i'm before the span
+         <!--Deliverance: applying rule <replace theme="//body/span" content="//body/div"/>
+         --><div>Real Content</div><!--Deliverance: done applying rule <replace theme="//body/span" content="//body/div"/>
+         -->
+            i'm after the span
+     </body>
+      </html>
+  </output> 
+</deliverance-test>
+
+
+
+<!-- test debug mode with copy --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance" debug="true">
+    <copy theme="//body" content="//body/div" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html>
+    <body>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html>
+      <body><div>Real Content</div>
+    </body></html>
+  </content>
+  
+  <output>
+    <html>
+         <!--Deliverance: applying rule <copy theme="//body" content="//body/div"/>
+         --><body><div>Real Content</div></body><!--Deliverance: done applying rule <copy theme="//body" content="//body/div"/>
+         -->
+      </html>
+  </output> 
+</deliverance-test>
+
+
+</deliverance-test-suite>
+

Modified: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xslt.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Wed Oct 11 23:40:57 2006
@@ -37,6 +37,13 @@
 
         if reference_resolver:
             xinclude.include(rules,loader=reference_resolver)
+
+        debug = rules.get("debug", None)
+        if debug and debug.lower() == "true":
+            self.debug = True
+        else:
+            self.debug = False
+
         self.apply_rules(rules,theme_copy)
         xslt_wrapper = etree.XML(xslt_wrapper_skel)
         insertion_point = xslt_wrapper.xpath("//xsl:transform/xsl:template[@match='/']",
@@ -87,10 +94,12 @@
         # no content is matched 
         self.add_conditional_missing_content_error(theme,rule)
 
-        copier = etree.SubElement(theme_el,
-                                    "{%s}copy-of" % nsmap["xsl"])
+
+        copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
 
+        self.debug_append(theme_el, copier, rule)
+
 
     def apply_prepend(self,rule,theme):
         theme_el = self.get_theme_el(rule,theme)
@@ -105,9 +114,8 @@
 
         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
 
-        theme_el.insert(0,copier)
-        copier.tail = theme_el.text
-        theme_el.text = None
+        self.debug_prepend(theme_el, copier, rule)
+
 
     def apply_replace(self,rule,theme):
         theme_el = self.get_theme_el(rule,theme)
@@ -127,7 +135,7 @@
                                           copy.deepcopy(theme_el), 
                                           copier)
 
-        self.replace_element(theme_el,choose)
+        self.debug_replace(theme_el,choose,rule)
 
 
     def apply_copy(self,rule,theme):
@@ -158,7 +166,7 @@
                                           rule.attrib[self.RULE_CONTENT_KEY], 
                                           normal_theme_el, 
                                           copy_theme_el)
-        self.replace_element(theme_el,choose)
+        self.debug_replace(theme_el,choose,rule)
         
 
    
@@ -185,8 +193,9 @@
  
         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
-        theme_el.append(copier)
    
+        self.debug_append(theme_el, copier, rule)
+
 
     def xsl_escape_comments(self,doc):
         """
@@ -219,3 +228,51 @@
         choose.append(when)
         choose.append(otherwise)
         return choose
+
+
+    def debug_append(self, parent, child, rule):
+        if self.debug:
+            comment_before = etree.Element("{%s}comment" % nsmap["xsl"])
+            comment_before.text = "Deliverance: applying rule %s" % etree.tostring(rule)
+            parent.append(comment_before)
+
+        parent.append(child)
+
+        if self.debug:
+            comment_after = etree.Element("{%s}comment" % nsmap["xsl"])
+            comment_after.text = "Deliverance: done applying rule %s" % etree.tostring(rule)
+            parent.append(comment_after)
+
+
+    def debug_replace(self, old_el, new_el, rule):
+        self.replace_element(old_el, new_el)
+        
+        if self.debug:
+            parent = new_el.getparent()
+            index = parent.index(new_el)
+
+            comment_before = etree.Element("{%s}comment" % nsmap["xsl"])
+            comment_before.text = "Deliverance: applying rule %s" % etree.tostring(rule)
+            comment_after = etree.Element("{%s}comment" % nsmap["xsl"])
+            comment_after.text = "Deliverance: done applying rule %s" % etree.tostring(rule)
+            comment_after.tail = new_el.tail
+            new_el.tail = None
+
+            parent.insert(index, comment_before)
+            parent.insert(index+2, comment_after)
+
+    def debug_prepend(self, parent, child, rule):
+        parent.insert(0,child)
+        child.tail = parent.text
+        parent.text = None
+
+        if self.debug:
+            comment_before = etree.Element("{%s}comment" % nsmap["xsl"])
+            comment_before.text = "Deliverance: applying rule %s" % etree.tostring(rule)
+            comment_after = etree.Element("{%s}comment" % nsmap["xsl"])
+            comment_after.text = "Deliverance: done applying rule %s" % etree.tostring(rule)
+            comment_after.tail = child.tail
+            child.tail = None
+
+            parent.insert(0, comment_before)
+            parent.insert(2, comment_after)

From ltucker at codespeak.net  Wed Oct 11 23:47:19 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 11 Oct 2006 23:47:19 +0200 (CEST)
Subject: [z3-checkins] r33198 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061011214719.708AA101B8@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 11 23:47:17 2006
New Revision: 33198

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
Log:
testing



Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Wed Oct 11 23:47:17 2006
@@ -269,8 +269,3 @@
                 index + 1 < len(els) and 
                 type(els[index+1]) is type(str())):
                 el.tail = els[index+1]   
-
-
-
-                
-

From ltucker at codespeak.net  Thu Oct 12 18:23:22 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu, 12 Oct 2006 18:23:22 +0200 (CEST)
Subject: [z3-checkins] r33234 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061012162322.DF75210060@code0.codespeak.net>

Author: ltucker
Date: Thu Oct 12 18:23:18 2006
New Revision: 33234

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_debug.xml
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
   z3/deliverance/branches/packaged/deliverance/utils.py
   z3/deliverance/branches/packaged/deliverance/xslt.py
Log:
preliminary debugging support for python version, fixes to xslt debugging

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Thu Oct 12 18:23:18 2006
@@ -67,12 +67,16 @@
 
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
-        if (len(content_els) == 0):
+        if len(content_els) == 0:
             self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
+        if self.debug:
+            self.debug_append(theme_el, content_els, rule)
+            return 
+
         non_text_els = self.elements_in(content_els)
-        self.strip_tails(non_text_els)
+        self.strip_tails(non_text_els)        
 
         # the xpath may return a mixture of strings and elements, handle strings 
         # by attaching them to the proper element 
@@ -95,6 +99,20 @@
         self.attach_tails(content_els)
         theme_el.extend(non_text_els)
 
+    def debug_append(self, theme_el, content_els, rule):
+        
+        comment_before,comment_after = self.make_debugging_comments(rule)
+        content_els[:0] = [comment_before]
+        content_els.append(comment_after)
+
+        non_text_els = self.elements_in(content_els)
+        self.strip_tails(non_text_els)        
+            
+        self.attach_tails(content_els)
+        theme_el.extend(non_text_els)
+        
+
+
     def apply_prepend(self,rule,theme,content):
         theme_el = self.get_theme_el(rule,theme)
         if theme_el is None:
@@ -102,10 +120,14 @@
 
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
-        if (len(content_els) == 0):
+        if len(content_els) == 0:
             self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
+        if self.debug:
+            self.debug_prepend(theme_el, content_els, rule)
+            return 
+
         non_text_els = self.elements_in(content_els)
         
         # if we only get some text, just tack it on and return 
@@ -131,8 +153,7 @@
             theme_el.text = None
             
         self.attach_tails(content_els)
-        for index,el in enumerate(non_text_els):
-            theme_el.insert(index,el)
+        theme_el[:0] = non_text_els
 
         # tack on the previous text of the parent element 
         if old_start_text:
@@ -141,6 +162,22 @@
             else:
                 non_text_els[-1].tail = old_start_text
 
+    def debug_prepend(self, theme_el, content_els, rule):        
+        
+        comment_before,comment_after = self.make_debugging_comments(rule)
+        content_els[:0] = [comment_before]
+        content_els.append(comment_after)
+
+        if theme_el.text:
+            content_els.append(theme_el.text)
+            theme_el.text = None
+
+        non_text_els = self.elements_in(content_els)
+        self.strip_tails(non_text_els)                
+        self.attach_tails(content_els)
+
+        theme_el[:0] = non_text_els
+
     def apply_replace(self,rule,theme,content):
         theme_el = self.get_theme_el(rule,theme)
         if theme_el is None:
@@ -152,6 +189,10 @@
             self.add_to_body_start(theme, self.format_error("no content matched", rule))            
             return       
 
+        if self.debug:
+            self.debug_replace(theme_el,content_els,rule)
+            return 
+
         non_text_els = self.elements_in(content_els)
         self.strip_tails(non_text_els)
 
@@ -178,8 +219,7 @@
         non_text_els[0].tail = None
         parent = non_text_els[0].getparent()
         i = parent.index(non_text_els[0])
-        for index,cel in enumerate(non_text_els[1:]):
-            parent.insert(i + index + 1,cel)
+        parent[i+1:i+1] = non_text_els[1:]
 
         if non_text_els[-1].tail:
             non_text_els[-1].tail += temptail
@@ -192,6 +232,24 @@
                 non_text_els[0].tail = preserve_tail + non_text_els[0].tail
             else:
                 non_text_els[0].tail = preserve_tail
+
+    def debug_replace(self,theme_el,content_els,rule):
+        comment_before,comment_after = self.make_debugging_comments(rule)
+        content_els[:0] = [comment_before]
+        content_els.append(comment_after)
+
+        non_text_els = self.elements_in(content_els)
+        self.strip_tails(non_text_els)                    
+        self.attach_tails(content_els)
+
+        parent = theme_el.getparent()
+
+        if theme_el.tail:
+            comment_after.tail = theme_el.tail 
+
+        parent.replace(theme_el, non_text_els[0])
+        i = parent.index(non_text_els[0])
+        parent[i+1:i+1] = non_text_els[1:]
         
 
     def apply_copy(self,rule,theme,content):
@@ -216,8 +274,18 @@
             theme_el.text = None
 
         self.attach_tails(content_els)
-        theme_el[:] = non_text_els        
-    
+        theme_el[:] = non_text_els  
+
+        if self.debug:
+            comment_before,comment_after = self.make_debugging_comments(rule)
+            parent = theme_el.getparent()
+            index = parent.index(theme_el)
+            parent.insert(index-1,comment_before)
+            parent.insert(index+2,comment_after)
+            comment_after.tail = theme_el.tail
+            theme_el.tail = None
+            
+
     def apply_append_or_replace(self,rule,theme,content):
         theme_el = self.get_theme_el(rule,theme)
         if theme_el is None:
@@ -238,12 +306,19 @@
 
         for el in theme_el:
             if el.tag == remove_tag:
+                self.attach_text_to_previous(el,el.tail)
                 theme_el.remove(el)
 
+
+        if self.debug:
+            self.debug_append(theme_el, content_els, rule)
+            return 
+
         self.strip_tails(content_els)
         theme_el.extend(content_els)
 
 
+
     def elements_in(self, els):
         """
         return a list containing elements from els which are not strings 
@@ -269,3 +344,9 @@
                 index + 1 < len(els) and 
                 type(els[index+1]) is type(str())):
                 el.tail = els[index+1]   
+
+
+    def make_debugging_comments(self, rule):
+        comment_before = etree.Comment("Deliverance: applying rule %s" % etree.tostring(rule))
+        comment_after = etree.Comment("Deliverance: done applying rule %s" % etree.tostring(rule))
+        return comment_before, comment_after

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	Thu Oct 12 18:23:18 2006
@@ -44,6 +44,34 @@
   </output> 
 </deliverance-test>
 
+<!-- test append-or-replace preserves surrounding text of replaced elements --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme="//body" content="//body/div" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html>
+    <body>
+      before the div<div>in the div</div>after the div
+    </body></html>
+  </theme>
+
+  <content> 
+    <html>
+      <body><div>Real Content</div>
+    </body></html>
+  </content>
+  
+  <output>
+    <html>
+        <body>
+             before the divafter the div
+	     <div>Real Content</div>
+        </body>
+      </html>
+  </output> 
+</deliverance-test>
 
 <!-- tests that an error is raised if append-or-replace command does not find a target element 
      in the theme --> 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_debug.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_debug.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_debug.xml	Thu Oct 12 18:23:18 2006
@@ -135,26 +135,29 @@
 <!-- test debug mode with copy --> 
 <deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance" debug="true">
-    <copy theme="//body" content="//body/div" />
+    <copy theme="//body/span" content="//body/div" />
   </rules>
 
   <theme base="http://example.com"> 
     <html>
     <body>
+      before span<span>inside span</span>after span
     </body></html>
   </theme>
 
   <content> 
     <html>
-      <body><div>Real Content</div>
+      <body><div>Real Content</div> 
     </body></html>
   </content>
   
   <output>
     <html>
-         <!--Deliverance: applying rule <copy theme="//body" content="//body/div"/>
-         --><body><div>Real Content</div></body><!--Deliverance: done applying rule <copy theme="//body" content="//body/div"/>
-         -->
+      <body>before span
+         <!--Deliverance: applying rule <copy theme="//body/span" content="//body/div"/>
+         --><span><div>Real Content</div></span><!--Deliverance: done applying rule <copy theme="//body/span" content="//body/div"/>
+         -->after span
+	   </body>
       </html>
   </output> 
 </deliverance-test>

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Thu Oct 12 18:23:18 2006
@@ -59,7 +59,7 @@
     res2 = app.get('/xinclude_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
-
+4
 def test_nycsr():
     wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://www.nycsr.org','nycsr.xml')
     app = TestApp(wsgi_app)

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Thu Oct 12 18:23:18 2006
@@ -92,7 +92,7 @@
         body[:0] = [el]
 
     def replace_element(self,replace, new_el):
-        parent = replace.getparent()
+        parent = replace.getparent()        
         for i in range(len(parent)):
             if parent[i] == replace:
                 new_el.tail = replace.tail 
@@ -177,3 +177,5 @@
                 el.getparent().text += text 
             else:
                 el.getparent().text = text
+
+   

Modified: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xslt.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Thu Oct 12 18:23:18 2006
@@ -167,6 +167,8 @@
                                           normal_theme_el, 
                                           copy_theme_el)
         self.debug_replace(theme_el,choose,rule)
+        copy_theme_el.tail = None
+        normal_theme_el.tail = None
         
 
    
@@ -230,18 +232,14 @@
         return choose
 
 
-    def debug_append(self, parent, child, rule):
+    def debug_append(self, parent, child, rule):        
         if self.debug:
-            comment_before = etree.Element("{%s}comment" % nsmap["xsl"])
-            comment_before.text = "Deliverance: applying rule %s" % etree.tostring(rule)
+            comment_before,comment_after = self.make_debugging_comments(rule)
             parent.append(comment_before)
-
-        parent.append(child)
-
-        if self.debug:
-            comment_after = etree.Element("{%s}comment" % nsmap["xsl"])
-            comment_after.text = "Deliverance: done applying rule %s" % etree.tostring(rule)
+            parent.append(child)
             parent.append(comment_after)
+        else:
+            parent.append(child)
 
 
     def debug_replace(self, old_el, new_el, rule):
@@ -250,11 +248,8 @@
         if self.debug:
             parent = new_el.getparent()
             index = parent.index(new_el)
-
-            comment_before = etree.Element("{%s}comment" % nsmap["xsl"])
-            comment_before.text = "Deliverance: applying rule %s" % etree.tostring(rule)
-            comment_after = etree.Element("{%s}comment" % nsmap["xsl"])
-            comment_after.text = "Deliverance: done applying rule %s" % etree.tostring(rule)
+            
+            comment_before,comment_after = self.make_debugging_comments(rule)
             comment_after.tail = new_el.tail
             new_el.tail = None
 
@@ -267,12 +262,17 @@
         parent.text = None
 
         if self.debug:
-            comment_before = etree.Element("{%s}comment" % nsmap["xsl"])
-            comment_before.text = "Deliverance: applying rule %s" % etree.tostring(rule)
-            comment_after = etree.Element("{%s}comment" % nsmap["xsl"])
-            comment_after.text = "Deliverance: done applying rule %s" % etree.tostring(rule)
+            comment_before,comment_after = self.make_debugging_comments(rule)
             comment_after.tail = child.tail
             child.tail = None
 
             parent.insert(0, comment_before)
             parent.insert(2, comment_after)
+
+
+    def make_debugging_comments(self, rule):
+        comment_before = etree.Element("{%s}comment" % nsmap["xsl"])
+        comment_before.text = "Deliverance: applying rule %s" % etree.tostring(rule)
+        comment_after = etree.Element("{%s}comment" % nsmap["xsl"])
+        comment_after.text = "Deliverance: done applying rule %s" % etree.tostring(rule)
+        return comment_before, comment_after

From ltucker at codespeak.net  Thu Oct 12 20:22:03 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu, 12 Oct 2006 20:22:03 +0200 (CEST)
Subject: [z3-checkins] r33237 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061012182203.CFAA610083@code0.codespeak.net>

Author: ltucker
Date: Thu Oct 12 20:22:00 2006
New Revision: 33237

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/tests.py
   z3/deliverance/branches/packaged/deliverance/utils.py
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
   z3/deliverance/branches/packaged/deliverance/xslt.py
Log:
comments, cleanup

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Thu Oct 12 20:22:00 2006
@@ -14,7 +14,6 @@
 
     def __init__(self, theme, theme_uri, rules, reference_resolver=None):  
         self.theme = self.fixup_links(theme, theme_uri)
-        self.remove_http_equiv_metas(self.theme)
         self.rules = rules
         # perform xincludes on the rules
         if reference_resolver:
@@ -30,7 +29,6 @@
     def render(self, content):
         result = copy.deepcopy(self.theme)
         input = copy.deepcopy(content)
-        self.remove_http_equiv_metas(input)
         self.apply_rules(self.rules,result,input)
         return result
 

Modified: z3/deliverance/branches/packaged/deliverance/tests.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/tests.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/tests.py	Thu Oct 12 20:22:00 2006
@@ -2,8 +2,8 @@
 import os
 from lxml import etree
 from formencode.doctest_xml_compare import xml_compare
-#from deliverance.interpreter import Renderer
-from deliverance.xslt import Renderer
+from deliverance.interpreter import Renderer
+#from deliverance.xslt import Renderer
 import copy 
 
 class DeliveranceTestCase:

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Thu Oct 12 20:22:00 2006
@@ -48,8 +48,8 @@
     def format_error(self, message, rule, elts=None):
         """
         Returns a node containing the error message;
-        Checks the onerror attribute of the rule element to see if errors should
-        be ignored in which case returns None
+        If the onerror attribute of the rule element is set to ignore,
+        returns None
         """
 
         if rule.attrib.get('onerror', None) == 'ignore':
@@ -76,6 +76,9 @@
 
     TAG_MATCHER = re.compile(r'^\.?/?/?(.*?/)*(?P<tag>[^*^(^)^:^[^.^/]+?)(\[.*\])*$',re.I)
     def get_tag_from_xpath(self,xpath):
+        """
+        attemtps to extract the tag type that an xpath expression selects (if any)
+        """
         match = self.TAG_MATCHER.match(xpath)
         if match:
             return match.group('tag')  
@@ -83,33 +86,38 @@
             return None
 
 
-    def add_to_body_start(self,theme, el):
+    def add_to_body_start(self,doc,el):
+        """
+        inserts the element el into the beginning of body 
+        element of the document given        
+        """
         if not el:
             return
-        body = theme.find('body')
+        body = doc.find('body')
         if body is None:
-            body = theme[0]
+            body = doc[0]
         body[:0] = [el]
 
-    def replace_element(self,replace, new_el):
-        parent = replace.getparent()        
-        for i in range(len(parent)):
-            if parent[i] == replace:
-                new_el.tail = replace.tail 
-                parent[i] = new_el
-                break
-
-    def mark_bad_elements(self,els):
-        for el in els:
-            if 'class' in el.attrib:
-                el.attrib['class'] += ' deliverance-bad-element'
-            else:
-                el.attrib['class'] = 'deliverance-bad-element'
+    def replace_element(self,old_el, new_el):
+        """
+        replaces old_el with new_el in the parent 
+        element of old_el. The tail of 
+        new_el is replaced by the tail of old_el 
+        """
+        new_el.tail = old_el.tail
+        parent = old_el.getparent()
+        parent[parent.index(old_el)] = new_el
+
 
 
     def fixup_links(self, doc, uri):
-        """ resolve all links in the ``doc`` element to be absolute; the links
-        should be considered relative to ``uri``
+        """ 
+        replaces relative urls found in the document given 
+        with absolute urls by prepending the uri given. 
+        <base href> tags are removed from the document. 
+
+        Affects urls in href attributes, src attributes and 
+        css of the form url(...) in style elements 
         """        
         base_uri = uri 
         basetags = doc.xpath('//base[@href]')
@@ -132,14 +140,18 @@
 
 
     def fixup_link_attrs(self, elts, base_uri, attr):
-        """ makes all attr values in elts to be absolute uris based on base_uri """
+        """
+        prepends base_uri onto the attribute given by attr for 
+        all elements given in elts 
+        """
         for el in elts:
             el.attrib[attr] = urlparse.urljoin(base_uri, el.attrib[attr])
 
 
     CSS_URL_PAT = re.compile(r'url\((.*?)\)',re.I)
     def fixup_css_links(self, elts, base_uri):
-        """ fixes @import uris in css style elements to be 
+        """ 
+        prepends url(...) in css style elements to be 
         absolute links based on base_uri
         """
 
@@ -150,18 +162,12 @@
             if el.text:
                 el.text = re.sub(self.CSS_URL_PAT,absuri,el.text)
 
-    def remove_http_equiv_metas(self,doc):
-        if not doc:
-            return 
-
-        metas = doc.xpath("//meta[translate(@http-equiv,'contenyp','CONTENYP') = 'CONTENT-TYPE']")
-        for elt in metas:
-            if elt.tail:
-                attach_text_to_previous(self,elt,elt.tail)
-            elt.getparent().remove(elt)
-
 
     def attach_text_to_previous(self,el,text):
+        """
+        attaches the text given to the nearest previous node to el, 
+        ie its preceding sibling or parent         
+        """
         if text is None:
             return 
 

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Thu Oct 12 20:22:00 2006
@@ -13,8 +13,8 @@
 from paste.wsgilib import intercept_output
 from paste.request import construct_url
 from paste.response import header_value, replace_header
-#from interpreter import Renderer
-from xslt import Renderer
+from interpreter import Renderer
+#from xslt import Renderer
 from htmlserialize import tostring
 import sys 
 import datetime

Modified: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xslt.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Thu Oct 12 20:22:00 2006
@@ -32,7 +32,6 @@
         theme_copy = copy.deepcopy(theme)
 
         self.fixup_links(theme_copy,theme_uri)
-        self.remove_http_equiv_metas(theme_copy)
         self.xsl_escape_comments(theme_copy)
 
         if reference_resolver:
@@ -201,7 +200,9 @@
 
     def xsl_escape_comments(self,doc):
         """
-        replaces comment nodes with xsl:comment nodes 
+        replaces comment nodes with xsl:comment nodes so they will 
+        appear in the result of a transform rather than being 
+        treated as comments in the transform 
         """
         comment_nodes = doc.xpath('//comment()')
         for c in comment_nodes:
@@ -211,6 +212,9 @@
     
     def add_conditional_missing_content_error(self,theme,rule):
         """
+        adds a node to the body of theme which produces an error 
+        message if no content is matched by a rule given 
+        during the transformation 
         """
         err = self.format_error("no content matched", rule)
         if err:
@@ -221,6 +225,11 @@
         
 
     def make_when_otherwise(self, test, whenbody, otherwisebody):
+        """
+        makes a conditional xlst node. when placed into a document, 
+        if the xslt expression represented by the string test evaluates 
+        to true, whenbody is produced, if false, otherwise body is produced 
+        """
         choose = etree.Element("{%s}choose" % nsmap["xsl"])
         when = etree.Element("{%s}when" % nsmap["xsl"])
         when.set("test", test)
@@ -233,6 +242,11 @@
 
 
     def debug_append(self, parent, child, rule):        
+        """
+        helper method for appending a node, if debugging is enabled, 
+        the appended node is wrapped in comments referring to the 
+        rule that performed the append 
+        """
         if self.debug:
             comment_before,comment_after = self.make_debugging_comments(rule)
             parent.append(comment_before)
@@ -243,6 +257,11 @@
 
 
     def debug_replace(self, old_el, new_el, rule):
+        """
+        helper method for replacing a node, if debugging is enabled, 
+        the new node is wrapped in comments referring to the 
+        rule that performed the replace  
+        """
         self.replace_element(old_el, new_el)
         
         if self.debug:
@@ -257,6 +276,11 @@
             parent.insert(index+2, comment_after)
 
     def debug_prepend(self, parent, child, rule):
+        """
+        helper method for prepending a node, if debugging is enabled, 
+        the prepended node is wrapped in comments referring to the 
+        rule that performed the append 
+        """
         parent.insert(0,child)
         child.tail = parent.text
         parent.text = None
@@ -271,6 +295,10 @@
 
 
     def make_debugging_comments(self, rule):
+        """
+        helper method which prepares two xslt:comment nodes used 
+        for wrapping inserted content nodes during debugging
+        """
         comment_before = etree.Element("{%s}comment" % nsmap["xsl"])
         comment_before.text = "Deliverance: applying rule %s" % etree.tostring(rule)
         comment_after = etree.Element("{%s}comment" % nsmap["xsl"])

From ltucker at codespeak.net  Thu Oct 12 20:47:51 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu, 12 Oct 2006 20:47:51 +0200 (CEST)
Subject: [z3-checkins] r33238 - in z3/deliverance/branches/packaged: .
	content themes
Message-ID: <20061012184751.8C82210092@code0.codespeak.net>

Author: ltucker
Date: Thu Oct 12 20:47:45 2006
New Revision: 33238

Removed:
   z3/deliverance/branches/packaged/content/
   z3/deliverance/branches/packaged/themes/
Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
adding instructions for running tests, removing old test data

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Thu Oct 12 20:47:45 2006
@@ -1,77 +1,45 @@
-=======================================
-Deliverance, high-speed themes for Zope
-=======================================
 
-Quick Start
------------
-
-1) Install lxml.
-
-2) cd to the directory containing this README.
-
-3) python ./deliverance.py
-
-This runs the timeit function, showing average time to apply a simple theme.
-
-
-Quick mod_python Start
-----------------------
-
-1) Edit mpfilter.conf and point it to where you put the SVN checkout.
-
-2) In your Apache httpd.conf file, add a line like this::
-
-  Include /Users/me/sandboxes/namespaced/mpfilter.conf
-
-3) Shut Apache down and restart.
-
-4) Keep an eye on the Apache error log::
-
-  tail -f logs/error_log
-
-5) Open a URL like this (or however you have your HTML files pointed to on 
-whichever port)::
-
-  http://localhost:9000/sandboxes/namespaced/
+Quick Start to run tests 
+-------------------------
 
-6) If that works, click on the on the "content" directory or go to this URL::
+get workingenv.py from
+http://cheeseshop.python.org/pypi/workingenv.py
 
-  http://localhost:9000/sandboxes/namespaced/content/intro.html
+Create a working enviornment for deliverance and its dependencies:  
 
-7) In the site menu on that page, try clicking on the 3 links.
+workingenv.py deliverance_env
+source deliverance_env/bin/activate
 
+Install lxml using the buildout 
+(full instructions at http://faassen.n--tree.net/blog/view/weblog/2006/10/03/0,  
+ alternatively, install a recent cvs version of libxml2,libxstl and svn lxml. 
+ You are likely to encounter segfaults if recent versions are not used.)
 
-Customization Quick Start
--------------------------
+$ svn co https://infrae.com/svn/buildout/lxml-recent/trunk lxml-recent
+$ cd lxml-recent
+$ python bootstrap/bootstrap.py
+$ bin/buildout
 
-1) Edit ``themes/simple/sampletheme.xml`` and add the following snippet 
-**inside** the ``<div id="pageframe">``::
+put the lxml egg into your deliverance environment 
 
-  <div id="pageauthor">Theme section for author</div>
+$ cp -r lxml-recent/develop-eggs/lxml-<whatever>.egg deliverance_env/lib/python_2.4/
 
-2) Edit ``content/index.html`` and add the following in the ``<head>``:
+add a line to deliverance_env/lib/easy-install.pth like:
+./lxml-<whatever>.egg
 
-  <meta name="dc.creator" content="Your Name"/>
+$ easy_install nose 
+$ easy_install FormEncode
+$ easy_install elementtree
+$ easy_install paste 
 
-3) Edit ``etc/themerules.xml`` and add a rule like the following::
+checkout deliverance: 
+$ svn co http://codespeak.net/svn/z3/deliverance/branches/packaged deliverance
 
-  <replace theme="//html:div[@id='pageauthor']" 
-      content="/html:html/html:head/html:meta[@name='dc.creator']/@content"/>
-  
-4) Restart Apache and reload the page.
+$ cd deliverance
+$ nosetests 
 
 
-How Does This Work?
--------------------
 
-There are proposals on zope.org and other places that explain the idea.  Here's 
-the short version:
 
-1) A configuration "map" points at a pile of HTML artifacts that look the 
-way you'd like your site to look.  Let's call this look-and-feel the "theme".
 
-2) A rule file defines boxes in that theme that should get filled by boxes 
-coming from the dynamic side.
 
-3) At startup, a one-time compilation processes turns the theme into a 
-high-speed XSLT transform.

From ltucker at codespeak.net  Thu Oct 12 21:15:49 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu, 12 Oct 2006 21:15:49 +0200 (CEST)
Subject: [z3-checkins] r33239 - z3/deliverance/branches/packaged
Message-ID: <20061012191549.2C1A310087@code0.codespeak.net>

Author: ltucker
Date: Thu Oct 12 21:15:47 2006
New Revision: 33239

Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
notes on tests

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Thu Oct 12 21:15:47 2006
@@ -39,7 +39,63 @@
 $ nosetests 
 
 
+Simple Tests
+------------
 
+There are a number of tests in the test-data directory that follow the form:
+
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+     ... rules as described at http://www.openplans.org/projects/deliverance/specification
+  </rules>
+
+  <theme base="http://example.com"> 
+     ... theme html 
+  </theme>
+
+  <content> 
+     ... content html 
+  </content>
+ 
+  <output>
+     ... expected output of applying rules to theme and content 
+  </output> 
+</deliverance-test>
+
+... 
+
+</deliverance-test-suite>
+
+
+WSGI Tests 
+----------
+
+test_wsgi.py contains tests which take the theme and content from the 
+web and local pages found under test-data. 
+
+
+Hand Transform 
+--------------
+
+a hand test may also be performed using the handtransform.py script 
+run python handtransform.py --help for instructions. The result of the 
+transform is output to standard out. 
+
+To avoid lengthy command lines, the script can accept a file which describes 
+the theme and rules to apply using the -f flag eg: 
+
+python handtransform.py -f test-data/nycsr/nycsr.theme ./test-data/nycsr/openplans.html
+
+where nycsr.theme contains something like: 
+
+<blend 
+   theme="http://www.nycsr.org" 
+   baseurl="http://www.nycsr.org" 
+   rules="./test-data/nycsr/nycsr.xml" /> 
+
+and the second argument points to the content 
 
 
 

From ltucker at codespeak.net  Thu Oct 12 23:46:59 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu, 12 Oct 2006 23:46:59 +0200 (CEST)
Subject: [z3-checkins] r33241 - z3/deliverance/branches/packaged
Message-ID: <20061012214659.C42FC10092@code0.codespeak.net>

Author: ltucker
Date: Thu Oct 12 23:46:57 2006
New Revision: 33241

Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
changed instructions, lxml buildout won't actually do right now

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Thu Oct 12 23:46:57 2006
@@ -1,6 +1,7 @@
 
 Quick Start to run tests 
 -------------------------
+running setup.py is probably going to do the wrong thing currently
 
 get workingenv.py from
 http://cheeseshop.python.org/pypi/workingenv.py
@@ -10,22 +11,8 @@
 workingenv.py deliverance_env
 source deliverance_env/bin/activate
 
-Install lxml using the buildout 
-(full instructions at http://faassen.n--tree.net/blog/view/weblog/2006/10/03/0,  
- alternatively, install a recent cvs version of libxml2,libxstl and svn lxml. 
- You are likely to encounter segfaults if recent versions are not used.)
-
-$ svn co https://infrae.com/svn/buildout/lxml-recent/trunk lxml-recent
-$ cd lxml-recent
-$ python bootstrap/bootstrap.py
-$ bin/buildout
-
-put the lxml egg into your deliverance environment 
-
-$ cp -r lxml-recent/develop-eggs/lxml-<whatever>.egg deliverance_env/lib/python_2.4/
-
-add a line to deliverance_env/lib/easy-install.pth like:
-./lxml-<whatever>.egg
+install a recent cvs version of libxml2,libxstl and svn lxml. 
+You are likely to encounter segfaults and other failures if recent versions are not used.
 
 $ easy_install nose 
 $ easy_install FormEncode

From ianb at codespeak.net  Sat Oct 14 03:19:03 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Sat, 14 Oct 2006 03:19:03 +0200 (CEST)
Subject: [z3-checkins] r33281 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061014011903.BEFD1100F3@code0.codespeak.net>

Author: ianb
Date: Sat Oct 14 03:18:50 2006
New Revision: 33281

Modified:
   z3/deliverance/branches/packaged/deliverance/utils.py
Log:
Added new key, NOCONTENT_KEY; warn if the version of libxml2 isn't new enough to parse <script> in HTML properly

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Sat Oct 14 03:18:50 2006
@@ -3,6 +3,13 @@
 import urlparse
 import htmlserialize
 
+# Test if the libxml2 fix is in place
+html = etree.HTML('<html><head><script>some text</script></head></html>')
+if html[0][0].text != 'some text':
+    import warnings
+    warnings.warn(
+        'Deliverance requires the CVS HEAD version of libxml2')
+
 class RuleSyntaxError(Exception):
     """
     Raised when an invalid or unknown rule is encountered by a renderer 
@@ -32,6 +39,8 @@
     RULE_CONTENT_KEY = "content"
     RULE_THEME_KEY   = "theme" 
 
+    NOCONTENT_KEY = "nocontent"
+
     def get_theme_el(self,rule,theme):
         theme_els = theme.xpath(rule.attrib[self.RULE_THEME_KEY])
         if len(theme_els)== 0:
@@ -118,8 +127,8 @@
 
         Affects urls in href attributes, src attributes and 
         css of the form url(...) in style elements 
-        """        
-        base_uri = uri 
+        """
+        base_uri = uri
         basetags = doc.xpath('//base[@href]')
         if (len(basetags)):
             base_uri = basetags[0].attrib['href']

From ianb at codespeak.net  Sat Oct 14 03:21:49 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Sat, 14 Oct 2006 03:21:49 +0200 (CEST)
Subject: [z3-checkins] r33282 - in z3/deliverance/branches/packaged: .
	Deliverance.egg-info deliverance deliverance/test-data/nycsr doc
Message-ID: <20061014012149.1DB88100F3@code0.codespeak.net>

Author: ianb
Date: Sat Oct 14 03:21:39 2006
New Revision: 33282

Added:
   z3/deliverance/branches/packaged/Deliverance.egg-info/   (props changed)
Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/standardrules.xml
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
   z3/deliverance/branches/packaged/deliverance/xinclude.py
   z3/deliverance/branches/packaged/doc/NewWorld.txt
   z3/deliverance/branches/packaged/setup.py
Log:
Added a new attribute, nocontent='ignore' to rules to suppress error when there's no matching element in the content.  Often this is not an error, such as when there's no <style> elements in the head.
Pass through the original URI to the xinclude code, so it can resolve references relative to that URI; as it was everything was relative to the root.
Change the standardrules.xml in the nycsr test to use nocontent='ignore'.  Change nycsr.xml to use * instead of table for the content element, to more easily support non-Plone sites (like TaskTracker)
Add an entry point to setup.py and the wsgifilter, so that you can configure deliverance from a Paste configuration file.


Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Sat Oct 14 03:21:39 2006
@@ -12,14 +12,17 @@
     render time.
     """
 
-    def __init__(self, theme, theme_uri, rules, reference_resolver=None):  
+    def __init__(self, theme, theme_uri,
+                 rule, rule_uri,
+                 reference_resolver=None):  
         self.theme = self.fixup_links(theme, theme_uri)
-        self.rules = rules
+        self.rules = rule
+        self.rules_uri = rule_uri
         # perform xincludes on the rules
         if reference_resolver:
-            xinclude.include(self.rules, loader=reference_resolver)
+            xinclude.include(self.rules, self.rules_uri, loader=reference_resolver)
 
-        debug = rules.get("debug", None)
+        debug = self.rules.get("debug", None)
         if debug and debug.lower() == "true":
             self.debug = True
         else:
@@ -66,7 +69,8 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
-            self.add_to_body_start(theme, self.format_error("no content matched", rule))
+            if rule.get(self.NOCONTENT_KEY) != 'ignore':
+                self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
         if self.debug:
@@ -119,7 +123,8 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
-            self.add_to_body_start(theme, self.format_error("no content matched", rule))
+            if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
+                self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
         if self.debug:
@@ -184,7 +189,8 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
-            self.add_to_body_start(theme, self.format_error("no content matched", rule))            
+            if rule.attrib.get(self.NOCONTENT_KEY) == 'ignore':
+                self.add_to_body_start(theme, self.format_error("no content matched", rule))            
             return       
 
         if self.debug:
@@ -258,7 +264,8 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
-            self.add_to_body_start(theme, self.format_error("no content matched", rule))
+            if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
+                self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
         non_text_els = self.elements_in(content_els)
@@ -299,7 +306,8 @@
         content_els = copy.deepcopy(content.xpath(content_xpath))        
  
         if len(content_els) == 0:
-            self.add_to_body_start(theme, self.format_error("no content matched", rule))
+            if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
+                self.add_to_body_start(theme, self.format_error("no content matched", rule))
             return 
 
         for el in theme_el:

Modified: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml	Sat Oct 14 03:21:39 2006
@@ -3,5 +3,5 @@
 <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
   <xi:include href="standardrules.xml" />
 
-  <copy theme="//div[@id='container']" content="//table[@id='portal-columns']" />
+  <copy theme="//div[@id='container']" content="//*[@id='portal-columns']" />
 </rules>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/standardrules.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/nycsr/standardrules.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/standardrules.xml	Sat Oct 14 03:21:39 2006
@@ -2,9 +2,10 @@
 
 
 <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
-  <prepend theme="//head" content="//head/link" /> 
-  <prepend theme="//head" content="//head/style" /> 
-  <append theme="//head" content="//head/script" />    
-  <append theme="//head" content="//head/meta" />
-  <append-or-replace theme="//head" content="//head/title" />
+  <prepend theme="//head" content="//head/link" nocontent="ignore" /> 
+  <prepend theme="//head" content="//head/style" nocontent="ignore" /> 
+  <append theme="//head" content="//head/script" nocontent="ignore" />    
+  <append theme="//head" content="//head/meta" nocontent="ignore" />
+  <append-or-replace theme="//head" content="//head/title"
+  nocontent="ignore" />
 </rules>

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Sat Oct 14 03:21:39 2006
@@ -20,7 +20,7 @@
 import datetime
 import threading
 
-DELIVERANCE_BASE_URL = 'deliverance-base-url'
+DELIVERANCE_BASE_URL = 'deliverance.base-url'
 
 class DeliveranceMiddleware(object):
 
@@ -58,8 +58,12 @@
             elif encoding:
                 return text.decode(encoding)
 
-        return Renderer(parseHTML(theme), full_theme_uri, etree.XML(rule), 
-                        reference_resolver=reference_resolver)
+        return Renderer(
+            theme=parseHTML(theme),
+            theme_uri=full_theme_uri,
+            rule=etree.XML(rule), 
+            rule_uri=self.rule_uri,
+            reference_resolver=reference_resolver)
 
         
     def cache_expired(self):
@@ -96,6 +100,8 @@
 
     def should_intercept(self, status, headers):
         type = header_value(headers, 'content-type')
+        if type is None:
+            return False
         return type.startswith('text/html') or type.startswith('application/xhtml+xml')
 
     def filter_body(self, environ, body):
@@ -104,10 +110,9 @@
 
     def get_resource(self, environ, uri):
         internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)
+        uri = urlparse.urljoin(internalBaseURL, uri)
         
-        if self.relative_uri(uri):
-            return self.get_internal_resource(environ, uri)
-        elif internalBaseURL and uri.startswith(internalBaseURL):
+        if internalBaseURL and uri.startswith(internalBaseURL):
             return self.get_internal_resource(environ, uri[len(internalBaseURL):])
         else:
             return self.get_external_resource(uri)
@@ -129,5 +134,32 @@
         if not uri.startswith('/'):
             uri = '/' + uri
         environ['PATH_INFO'] = uri
+        environ['SCRIPT_NAME'] = environ[DELIVERANCE_BASE_URL]
+        if environ['QUERY_STRING']:
+            environ['QUERY_STRING'] += '&notheme'
+        else:
+            environ['QUERY_STRING'] = 'notheme'
+
+        path_info = environ['PATH_INFO']
         status, headers, body = intercept_output(environ, self.app)
+        if not status.startswith('200'):
+            loc = header_value(headers, 'location')
+            if loc:
+                loc = ' location=%r' % loc
+            else:
+                loc = ''
+            raise Exception(
+                "Request for internal resource at %s (%r) failed with status code %r%s"
+                % (construct_url(environ), path_info, status,
+                   loc))
         return body
+
+def make_filter(app, global_conf,
+                theme_uri=None, rule_uri=None):
+    assert theme_uri is not None, (
+        "You must give a theme_uri")
+    assert rule_uri is not None, (
+        "You must give a rule_uri")
+    return DeliveranceMiddleware(
+        app, theme_uri, rule_uri)
+

Modified: z3/deliverance/branches/packaged/deliverance/xinclude.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xinclude.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xinclude.py	Sat Oct 14 03:21:39 2006
@@ -45,6 +45,7 @@
 
 import copy
 from lxml import etree 
+import urlparse
 
 XINCLUDE = "{http://www.w3.org/2001/XInclude}"
 
@@ -97,7 +98,7 @@
 # xinclude) for use in Deliverance
 
 
-def include(elem, loader=None):
+def include(elem, base_href, loader=None):
     if loader is None:
         loader = default_loader
     # look for xinclude elements
@@ -109,6 +110,7 @@
             href = e.get("href")
             parse = e.get("parse", "xml")
             if parse == "xml":
+                href = urlparse.urljoin(base_href, href)
                 node = loader(href, parse)
                 if node is None:
                     raise FatalIncludeError(

Modified: z3/deliverance/branches/packaged/doc/NewWorld.txt
==============================================================================
--- z3/deliverance/branches/packaged/doc/NewWorld.txt	(original)
+++ z3/deliverance/branches/packaged/doc/NewWorld.txt	Sat Oct 14 03:21:39 2006
@@ -207,8 +207,8 @@
 7. Tedious instructions.
 
 In CMF/Plone templates, every `link`, `script`, `a`, `img`, etc.  As
-such, each of these gets a `tal:attributes="src:
-{portal_url}/foo.png"` added to it, even though the image src was
+such, each of these gets a `tal:attributes="src
+${portal_url}/foo.png"` added to it, even though the image src was
 stated on the actual src attribute.
 
 What happens?  First, nobody even bothers putting an actual src

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Sat Oct 14 03:21:39 2006
@@ -21,6 +21,8 @@
         'lxml',
       ],
       entry_points="""
+      [paste.filter_app_factory]
+      main = deliverance.wsgifilter:make_filter
       """,
       )
 

From cabraham at codespeak.net  Mon Oct 16 18:51:30 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon, 16 Oct 2006 18:51:30 +0200 (CEST)
Subject: [z3-checkins] r33347 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061016165130.2768B1008F@code0.codespeak.net>

Author: cabraham
Date: Mon Oct 16 18:51:26 2006
New Revision: 33347

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
   z3/deliverance/branches/packaged/deliverance/tests.py
   z3/deliverance/branches/packaged/deliverance/xslt.py
Log:
Added nocontent='ignore' to xslt version; extended the tests to test for this attribute; fixed a few bugs

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Mon Oct 16 18:51:26 2006
@@ -189,7 +189,7 @@
         content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
-            if rule.attrib.get(self.NOCONTENT_KEY) == 'ignore':
+            if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
                 self.add_to_body_start(theme, self.format_error("no content matched", rule))            
             return       
 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	Mon Oct 16 18:51:26 2006
@@ -116,6 +116,35 @@
   </output> 
 </deliverance-test>
 
+<!-- tests append command ignores an error when no content is found
+and nocontent='ignore' flag is set -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append theme=".//div[@id='foo']" content="//div[@id='bar']" nocontent='ignore' />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p></div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
 
 <!-- tests append command successfully appends the contents of a div tag with all contents of body tag, 
 including unelemented text --> 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	Mon Oct 16 18:51:26 2006
@@ -198,8 +198,6 @@
 </deliverance-test>
 
 
-
-
 <!-- tests append-or-replace command generates an error when no content is found -->
 <deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance">
@@ -230,5 +228,35 @@
   </output> 
 </deliverance-test>
 
+<!-- tests append-or-replace command ignores error when no content is found 
+and nocontent='ignore' flag is set-->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <append-or-replace theme=".//div[@id='foo']" content="//span[@id='bar']" nocontent='ignore' />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo"><span>Dummy Content</span><p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div/>
+    <div id="foo"><span>Dummy Content</span><p>HI!</p></div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
+
 </deliverance-test-suite>
 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	Mon Oct 16 18:51:26 2006
@@ -154,5 +154,34 @@
   </output> 
 </deliverance-test>
 
+<!-- tests copy command ignores error when no content is found 
+and nocontent='ignore' is set-->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme=".//div[@id='foo']" content="//div[@id='bar']" nocontent='ignore'/>
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p></div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
 
 </deliverance-test-suite>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	Mon Oct 16 18:51:26 2006
@@ -139,4 +139,34 @@
   </output> 
 </deliverance-test>
 
+
+<!-- tests prepend command ignores error when no content is found 
+and nocontent='ignore' is set-->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <prepend theme=".//div[@id='foo']" content="//div[@id='bar']" nocontent='ignore' />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p></div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
 </deliverance-test-suite>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	Mon Oct 16 18:51:26 2006
@@ -183,5 +183,35 @@
   </output> 
 </deliverance-test>
 
+<!-- tests replace command ignores error when no content is found 
+and nocontent='ignore' is set-->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme=".//div[@id='foo']" content="//div[@id='bar']" nocontent='ignore' />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body>leading text <br/> more <p>inside p </p>trailing text</body> tail of body</html>
+  </content>
+  
+  <output>
+<html>
+  <head>
+    <title>Blah</title>
+  </head>
+  <body>
+    <div/>
+    <div id="foo">Dummy Content<p>HI!</p></div>
+  </body>
+</html>
+  </output> 
+</deliverance-test>
+
+
 </deliverance-test-suite>
 

Modified: z3/deliverance/branches/packaged/deliverance/tests.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/tests.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/tests.py	Mon Oct 16 18:51:26 2006
@@ -8,8 +8,9 @@
 
 class DeliveranceTestCase:
 
-    def __init__(self, rules, theme, theme_uri, content, output):
+    def __init__(self, rules, rules_uri, theme, theme_uri, content, output):
         self.rules = rules
+        self.rules_uri = rules_uri
         self.theme = theme
         self.theme_uri = theme_uri
         self.content = content
@@ -19,7 +20,7 @@
         renderer = Renderer(
             theme=self.theme,
             theme_uri=self.theme_uri,
-            rules=self.rules)
+            rule=self.rules, rule_uri=self.rules_uri)
         actual = renderer.render(self.content)
         reporter = []
         result = xml_compare(actual, self.output, reporter.append)
@@ -82,6 +83,7 @@
 
         case = DeliveranceTestCase(
             rules=rules,
+            rules_uri = fn, # not sure about this
             theme=themebody,
             theme_uri=el.find('theme').attrib['base'],
             content=contentbody,

Modified: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xslt.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Mon Oct 16 18:51:26 2006
@@ -28,22 +28,24 @@
     content at render time
     """
 
-    def __init__(self,theme,theme_uri,rules,reference_resolver=None):
+    def __init__(self,theme,theme_uri,rule, rule_uri, reference_resolver=None):
         theme_copy = copy.deepcopy(theme)
+        self.rules = rule
+        self.rules_uri = rule_uri
 
         self.fixup_links(theme_copy,theme_uri)
         self.xsl_escape_comments(theme_copy)
 
         if reference_resolver:
-            xinclude.include(rules,loader=reference_resolver)
+            xinclude.include(self.rules, self.rules_uri, loader=reference_resolver)
 
-        debug = rules.get("debug", None)
+        debug = self.rules.get("debug", None)
         if debug and debug.lower() == "true":
             self.debug = True
         else:
             self.debug = False
 
-        self.apply_rules(rules,theme_copy)
+        self.apply_rules(self.rules,theme_copy)
         xslt_wrapper = etree.XML(xslt_wrapper_skel)
         insertion_point = xslt_wrapper.xpath("//xsl:transform/xsl:template[@match='/']",
                                              nsmap)[0]
@@ -214,8 +216,12 @@
         """
         adds a node to the body of theme which produces an error 
         message if no content is matched by a rule given 
-        during the transformation 
+        during the transformation; no message is produced
+        if nocontent='ignore' attribute is set
         """
+        if rule.get(self.NOCONTENT_KEY) == 'ignore':
+            return
+
         err = self.format_error("no content matched", rule)
         if err:
             conditional = etree.Element("{%s}if" % nsmap["xsl"])

From cabraham at codespeak.net  Mon Oct 16 20:03:37 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon, 16 Oct 2006 20:03:37 +0200 (CEST)
Subject: [z3-checkins] r33348 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061016180337.4C07B1007D@code0.codespeak.net>

Author: cabraham
Date: Mon Oct 16 20:03:35 2006
New Revision: 33348

Modified:
   z3/deliverance/branches/packaged/deliverance/xinclude.py
Log:
fixed bug in xincludes

Modified: z3/deliverance/branches/packaged/deliverance/xinclude.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xinclude.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xinclude.py	Mon Oct 16 20:03:35 2006
@@ -121,7 +121,7 @@
                     node.tail = (node.tail or "") + e.tail
                 elem[i] = node
                 # be recursive about including in the included tree
-                include(node,loader)
+                include(node, href, loader)
             elif parse == "text":
                 text = loader(href, parse, e.get("encoding"))
                 if text is None:
@@ -144,6 +144,6 @@
                 "xi:fallback tag must be child of xi:include (%r)" % e.tag
                 )
         else:
-            include(e, loader)
+            include(e, base_href, loader)
         i = i + 1
 

From cabraham at codespeak.net  Tue Oct 17 18:35:43 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Tue, 17 Oct 2006 18:35:43 +0200 (CEST)
Subject: [z3-checkins] r33384 - in
	z3/deliverance/branches/packaged/deliverance: .
	test-data/tasktracker
Message-ID: <20061017163543.7E25110078@code0.codespeak.net>

Author: cabraham
Date: Tue Oct 17 18:35:40 2006
New Revision: 33384

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/
   z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/content.html
   z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/tasktracker.xml
Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
made a workaround for a deepcopy bug in lxml; added a tasktracker static test which currently fails for python interpreter

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Tue Oct 17 18:35:40 2006
@@ -66,7 +66,7 @@
         if theme_el is None:
             return 
 
-        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = self.deepcopy_elementlist(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.get(self.NOCONTENT_KEY) != 'ignore':
@@ -120,7 +120,7 @@
         if theme_el is None:
             return 
 
-        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = self.deepcopy_elementlist(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -186,7 +186,7 @@
         if theme_el is None:
             return 
 
-        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = self.deepcopy_elementlist(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -261,7 +261,7 @@
         if theme_el is None:
             return 
 
-        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = self.deepcopy_elementlist(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -303,7 +303,7 @@
             self.add_to_body_start(theme,self.format_error("invalid xpath for content", rule=rule))
             return
 
-        content_els = copy.deepcopy(content.xpath(content_xpath))        
+        content_els = self.deepcopy_elementlist(content.xpath(content_xpath))        
  
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -356,3 +356,13 @@
         comment_before = etree.Comment("Deliverance: applying rule %s" % etree.tostring(rule))
         comment_after = etree.Comment("Deliverance: done applying rule %s" % etree.tostring(rule))
         return comment_before, comment_after
+
+    def deepcopy_elementlist(self, els):
+        # converts etree._Comment list elements into strings and then performs copy
+        # this is necessary to avoid a  bug in lxml which turns comments into None when
+        # perfoming a deepcopy
+        for index, el in enumerate(els):
+            if type(el) == etree._Comment:
+                els[index] = str(el)
+
+        return copy.deepcopy(els)

Added: z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/content.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/content.html	Tue Oct 17 18:35:40 2006
@@ -0,0 +1,339 @@
+<html>
+<head>
+
+<title>
+Todo list
+</title>
+
+<script src="/javascripts/prototype.js" type="text/javascript"></script>
+<script src="/javascripts/effects.js" type="text/javascript"></script>
+<script src="/javascripts/dragdrop.js" type="text/javascript"></script>
+<script src="/javascripts/task.js" type="text/javascript"></script>
+<script src="/javascripts/builder.js" type="text/javascript"></script>
+<script src="/javascripts/controls.js" type="text/javascript"></script>
+<script src="/javascripts/editable_list.js" type="text/javascript"></script>
+<script src="/javascripts/datebocks_engine.js" type="text/javascript"></script>
+<script src="/javascripts/calendar.js" type="text/javascript"></script>
+<script src="/javascripts/calendar-setup.js" type="text/javascript"></script>
+<script src="/javascripts/calendar-en.js" type="text/javascript"></script>
+<script src="/javascripts/datebocks_window.js" type="text/javascript"></script>
+<link href="/stylesheets/list.css" media="screen" rel="Stylesheet" type="text/css" />
+<link href="/stylesheets/datebocks_engine.css" media="screen" rel="Stylesheet" type="text/css" />
+<link href="/stylesheets/calendar-blue.css" media="screen" rel="Stylesheet" type="text/css" />
+
+</head>
+<body>
+<div style="background-color:#edf">
+Logged in as: admin
+<span style="position:absolute;right:2ex;">Project: theproject</span>
+</div>
+This is list deliverance.<br />
+
+
+  <a id="reorder_button" href="javascript:modeSwitch();">
+    <span id="modeName">Reorder</span>
+  </a><br /><br />
+
+
+<span>
+
+<!-- list headers -->
+
+Task name
+<span class="status-column">Status <a href="#sortbydeadline" class="sortarrow" onclick="sortBy('status'); return false;">&#x2193;</a></span>
+<span class="deadline-column">Deadline <a href="#sortbydeadline" class="sortarrow" onclick="sortBy('deadline'); return false;">&#x2193;</a></span>
+<span class="assigned-column">Assigned to<a href="#sortbyowner" class="sortarrow" onclick="sortBy('owner'); return false;">&#x2193;</a></span>
+<span class="creator-column">Created by</span>
+
+<!-- the actual task list -->
+
+<ul id="tasks" class="task_list">
+  
+    
+    
+
+<li status="not done" style="line-height: 2em;" task_id="1"
+    sort_index="0" deadline="2006-10-14 17:00:00" owner=""
+    id="task_1">
+
+<span class="taskitem" style="padding-left: 0px;" depth="0">
+
+<img src="/images/plus.png" id="collapseButton_1"
+     onclick="toggleCollapse(1)" />
+
+<!-- drag handle -->
+<span>
+<img class="handle" src="/images/folder_open.png"
+     id="handle_1">
+</span>
+
+<!-- title -->
+<a href="/task/view/1" title="">
+<span class="uncompleted-task root-task" id="title_1">nycsr</span></a>
+
+</span>
+
+<!-- the status -->
+
+<span class="status-column" id="status-form_1"><select id="status_1" method="post" name="status" onchange="changeStatus(&quot;/task/change_status/1&quot;,1)" originalvalue="0"><option value="not done" selected="selected">not done</option>
+<option value="done">done</option></select></span>
+
+<span class="status-column" style="display:none;"
+      id="label_1">not done</span>
+
+
+</form>
+
+<!-- end status -->
+
+<!-- deadline -->
+
+<span class="deadline-column">14 October, 2006</span>
+
+<!-- owner -->
+
+<span class="assigned-column">unassigned</span>
+
+<!-- creator -->
+<span class="creator-column">admin</span>
+
+<!-- subtasks -->
+
+<ul id="xtasks" class="task_list">
+
+
+
+
+<li status="not done" style="line-height: 2em;" task_id="3"
+    sort_index="0" owner="admin" id="task_3">
+
+<span class="taskitem" style="padding-left: 15px;" depth="1">
+
+<img src="/images/blank.png" id="collapseButton_3"
+     onclick="toggleCollapse(3)" />
+
+<!-- drag handle -->
+<span>
+<img class="handle" src="/images/file.png" id="handle_3">
+</span>
+
+<!-- title -->
+<a href="/task/view/3" title="">
+<span class="uncompleted-task sub-task" id="title_3">debug</span></a>
+
+</span>
+
+<!-- the status -->
+
+<span class="status-column" id="status-form_3"><select id="status_3" method="post" name="status" onchange="changeStatus(&quot;/task/change_status/3&quot;,3)" originalvalue="0"><option value="not done" selected="selected">not done</option>
+<option value="done">done</option></select></span>
+
+<span class="status-column" style="display:none;"
+      id="label_3">not done</span>
+
+
+</form>
+
+<!-- end status -->
+
+<!-- deadline -->
+
+<span class="deadline-column"></span>
+
+<!-- owner -->
+
+<span class="assigned-column">admin</span>
+
+<!-- creator -->
+<span class="creator-column">admin</span>
+
+<!-- subtasks -->
+
+<ul id="xtasks" class="task_list">
+</ul>
+
+</li>
+
+
+
+
+
+
+
+<li status="not done" style="line-height: 2em;" task_id="2"
+    sort_index="1" owner="" id="task_2">
+
+<span class="taskitem" style="padding-left: 15px;" depth="1">
+
+<img src="/images/blank.png" id="collapseButton_2"
+     onclick="toggleCollapse(2)" />
+
+<!-- drag handle -->
+<span>
+<img class="handle" src="/images/file.png" id="handle_2">
+</span>
+
+<!-- title -->
+<a href="/task/view/2" title="">
+<span class="uncompleted-task sub-task" id="title_2">load test data</span></a>
+
+</span>
+
+<!-- the status -->
+
+<span class="status-column" id="status-form_2"><select id="status_2" method="post" name="status" onchange="changeStatus(&quot;/task/change_status/2&quot;,2)" originalvalue="0"><option value="not done" selected="selected">not done</option>
+<option value="done">done</option></select></span>
+
+<span class="status-column" style="display:none;"
+      id="label_2">not done</span>
+
+
+</form>
+
+<!-- end status -->
+
+<!-- deadline -->
+
+<span class="deadline-column"></span>
+
+<!-- owner -->
+
+<span class="assigned-column">unassigned</span>
+
+<!-- creator -->
+<span class="creator-column">admin</span>
+
+<!-- subtasks -->
+
+<ul id="xtasks" class="task_list">
+</ul>
+
+</li>
+
+
+
+</ul>
+
+</li>
+
+    
+  
+</ul>
+
+</span>
+
+<!-- the create setup -->
+
+
+
+<!-- add a new subtask -->
+<div id="create_section">
+
+<p id="show_create">
+<a onclick="hideCreate();return false;"
+   href="/task/show_create/1?task_listID=1">Add a new task.</a>
+</p>
+
+<a name="create_anchor" id="create_anchor" />
+
+<div id="create" style="display:none;">
+
+
+<form method="post" action="/task/create/1">
+
+<table>
+<tr><td>
+<span class="row-heading">List:</span></td><td>
+<select id="task_listID" name="task_listID"><option value="1" selected="selected">deliverance</option></select>
+<br />
+</td></tr>
+
+<tr><td>
+<span class="row-heading">Parent: </span></td><td>
+<select id="parentID" name="parentID"><option value="0">No parent task</option>
+<option value="1">nycsr</option>
+<option value="3">debug</option>
+<option value="2">load test data</option></select></td></tr>
+
+
+
+<tr><td><label class="row-heading" for="title">Title:</label></td>
+<td><input id="title" name="title" type="text" /></td></tr>
+
+<tr><td><label class="row-heading" for="text">Description:</label></td>
+<td><textarea cols="80" id="text" name="text" rows="10"></textarea>
+</td></tr>
+
+<tr><td><label class="row-heading" for="deadline.date">Deadline:</label></td>
+<td>
+
+    <div id="dateBocks">
+      <script type="text/javascript">
+        var oldtaskDeadlineDateBocksObj = new DateBocks(
+          {dateBocksElementId : 'oldtaskDeadlineDateBocks'}
+        );
+      </script>
+      <ul>
+        <li class="dateBocksInput"><input id="oldtaskDeadlineDateBocks" name="deadline.date" onChange="oldtaskDeadlineDateBocksObj.magicDate();" onClick="this.select();" onKeyPress="oldtaskDeadlineDateBocksObj.keyObserver(event, 'parse'); return oldtaskDeadlineDateBocksObj.keyObserver(event, 'return');" type="text" /></li>
+        <li class="dateBocksIcon"><img alt="Calendar" id="oldtaskDeadlineDateBocksButton" src="/images/icon-calendar.gif" style="cursor: pointer;" /></li>
+        <li class="dateBocksHelp"><img alt="Help" id="oldtaskDeadlineDateBocksHelp" src="/images/icon-help.gif" style="cursor: pointer" /></li>
+      </ul>
+      <div id="dateBocksMessage"><div id="oldtaskDeadlineDateBocksMsg"></div></div>
+      <script type="text/javascript">
+        oldtaskDeadlineDateBocksObj.setDefaultFormatMessage();
+        
+        Calendar.setup({inputField : 'oldtaskDeadlineDateBocks',help : 'oldtaskDeadlineDateBocksHelp',singleClick : true,ifFormat : oldtaskDeadlineDateBocksObj.calendarIfFormat,align : oldtaskDeadlineDateBocksObj.calendarAlign,button : 'oldtaskDeadlineDateBocksButton'});
+        
+      </script>
+    </div>
+
+<input id="deadline.time" name="deadline.time" type="text" value="" /><br />
+<small> hh:mm:ss</small>
+</td></tr>
+
+
+<tr><td><label class="row-heading" for="private">Private:</label></td>
+<td><input id="private" name="private" type="checkbox" value="1" />
+<!--input name="private" id="private" type="checkbox"--></td></tr>
+
+
+
+<tr><td>
+<div class="row-heading">Assign task to:</div></td><td>
+<span class="autocomplete">
+<input autocomplete="off" id="owner" name="owner" size="30" type="text" value="" />
+<div class="auto_complete" id="owner_auto_complete"></div>
+<script type="text/javascript">new Ajax.Autocompleter('owner', 'owner_auto_complete', 
+'/task/auto_complete_for_owner/', {})</script>
+</span></td></tr>
+
+
+
+</table>
+<input type="submit" name="create" value="create">
+</form>
+
+
+<p>
+<a href="#nevermind" onclick="$('create').hide(); $('show_create').show(); return false;">Nevermind</a>
+</p>
+</div>
+</div>
+
+
+
+<!-- ----------------------------- -->
+
+<hr />
+<br />
+
+
+<a href="/tasklist/show_update/1">Edit list settings</a>
+|
+
+
+<a href="/tasklist/index/1">Back to list of lists</a>
+
+
+</body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/expected.html	Tue Oct 17 18:35:40 2006
@@ -0,0 +1,418 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link href="/stylesheets/list.css" media="screen" rel="Stylesheet" type="text/css">
+<link href="/stylesheets/datebocks_engine.css" media="screen" rel="Stylesheet" type="text/css">
+<link href="/stylesheets/calendar-blue.css" media="screen" rel="Stylesheet" type="text/css">
+<meta name="author" content="New York City Streets Renaissance">
+<meta name="description" content="">
+<meta name="keywords" content="">
+<meta name="generator" content="BBEdit 8.2">
+<meta name="MSSmartTagsPreventParsing" content="true">
+<meta name="robots" content="all">
+<style type="text/css" media="screen">@import url(http://www.nycsr.org/css/style.css);</style>
+<style type="text/css" media="screen">@import url(http://www.nycsr.org/css/nav.css);</style>
+<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = function() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	</script><script src="/javascripts/prototype.js" type="text/javascript"></script><script src="/javascripts/effects.js" type="text/javascript"></script><script src="/javascripts/dragdrop.js" type="text/javascript"></script><script src="/javascripts/task.js" type="text/javascript"></script><script src="/javascripts/builder.js" type="text/javascript"></script><script src="/javascripts/controls.js" type="text/javascript"></script><script src="/javascripts/editable_list.js" type="text/javascript"></script><script src="/javascripts/datebocks_engine.js" type="text/javascript"></script><script src="/javascripts/calendar.js" type="text/javascript"></script><script src="/javascripts/calendar-setup.js" type="text/javascript"></script><script src="/javascripts/calendar-en.js" type="text/javascript"></script><script src="/javascripts/datebocks_window.js" type="text/javascript"></script><title>
+Todo list
+</title>
+</head>
+<body id="page-nyc" class="gallery">
+<!-- Header --><div id="header"><h1 class="logo"><a href="http://www.nycsr.org/"><span>The New York City Streets Renaissance</span></a></h1></div>
+<!-- / Header --><hr>
+<script type="text/javascript"><!--//--><![CDATA[//><!--
+startList = function() {
+	if (document.all&&document.getElementById) {
+		navRoot = document.getElementById("menu");
+		for (i=0; i<navRoot.childNodes.length; i++) {
+			node = navRoot.childNodes[i];
+			if (node.nodeName=="LI") {
+				node.onmouseover=function() {
+					this.className+=" over";
+				}
+				node.onmouseout=function() {
+					this.className=this.className.replace(" over", "");
+				}
+			}
+		}
+	}
+}
+window.onload=startList;
+
+//--><!]]></script><!-- Top Level Links --><div id="toplevel"><ul class="links">
+<li id="top-home"><a href="http://www.nycsr.org/"><strong><span>Home Page</span></strong></a></li>
+<li id="top-join"><a href="http://www.nycsr.org/involved/join.php"><strong><span>Join Us</span></strong></a></li>
+</ul></div>
+<!-- / Top Level Links --><!-- Navigation Bar --><div id="nav">
+<ul id="menu" class="tabs">
+<li id="nav-who">
+<a href="http://www.nycsr.org/who/"><strong><span>Who We Are</span></strong></a><ul class="sub">
+<li><a href="http://www.nycsr.org/who/supporters.php"><span>Supporters List</span></a></li>
+<li><a href="http://www.nycsr.org/who/contact.php"><span>Contact Us</span></a></li>
+</ul>
+</li>
+<li id="nav-nyc" class="selected">
+<a href="http://www.nycsr.org/nyc/"><strong><span>New York Streets</span></strong></a><ul class="sub">
+<li><a href="http://www.nycsr.org/nyc/truth.php"><span>The Truth About Traffic</span></a></li>
+<li><a href="http://www.nycsr.org/nyc/broken.php"><span>Broken Streets</span></a></li>
+<li><a href="http://www.nycsr.org/nyc/building.php"><span>Building on Progress</span></a></li>
+<li><a href="http://www.nycsr.org/nyc/video.php"><span>Video Gallery</span></a></li>
+<li><a href="http://www.nycsr.org/nyc/photo.php"><span>Photo Gallery</span></a></li>
+</ul>
+</li>
+<li id="nav-lessons">
+<a href="http://www.nycsr.org/lessons/"><strong><span>Global Lessons</span></strong></a><ul class="sub">
+<li><a href="http://www.nycsr.org/lessons/chicago.php"><span>Chicago</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/philadelphia.php"><span>Philadelphia</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/london.php"><span>London</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/paris.php"><span>Paris</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/copenhagen.php"><span>Copenhagen</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/great.php"><span>What Makes a Great Street?</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/benefits.php"><span>The Benefits of Great Streets</span></a></li>
+<li><a href="http://www.nycsr.org/lessons/photo.php"><span>Photo Gallery</span></a></li>
+</ul>
+</li>
+<li id="nav-involved">
+<a href="http://www.nycsr.org/involved/"><strong><span>Get Involved</span></strong></a><ul class="sub">
+<li><a href="http://www.nycsr.org/involved/join.php"><span>Join Us</span></a></li>
+<li><a href="http://www.nycsr.org/involved/ways.php"><span>Ways to Get Involved</span></a></li>
+<li><a href="http://www.nycsr.org/involved/resources.php"><span>Resources</span></a></li>
+</ul>
+</li>
+<li id="nav-events"><a href="http://www.nycsr.org/events/"><strong><span>Events</span></strong></a></li>
+</ul>
+<div class="clear"></div>
+</div>
+<!-- / Navigation Bar --><hr>
+<!-- Container --><div id="container">
+<!-- Body --><div id="body">
+<div style="background-color:#edf">
+Logged in as: admin
+<span style="position:absolute;right:2ex;">Project: theproject</span>
+</div>
+This is list deliverance.<br><a id="reorder_button" href="javascript:modeSwitch();">
+    <span id="modeName">Reorder</span>
+  </a><br><br><span>
+
+<!-- list headers -->
+
+Task name
+<span class="status-column">Status <a href="#sortbydeadline" class="sortarrow" onclick="sortBy('status'); return false;">?</a></span>
+<span class="deadline-column">Deadline <a href="#sortbydeadline" class="sortarrow" onclick="sortBy('deadline'); return false;">?</a></span>
+<span class="assigned-column">Assigned to<a href="#sortbyowner" class="sortarrow" onclick="sortBy('owner'); return false;">?</a></span>
+<span class="creator-column">Created by</span>
+
+<!-- the actual task list -->
+
+<ul id="tasks" class="task_list">
+<li status="not done" style="line-height: 2em;" task_id="1" sort_index="0" deadline="2006-10-14 17:00:00" owner="" id="task_1">
+
+<span class="taskitem" style="padding-left: 0px;" depth="0">
+
+<img src="/images/plus.png" id="collapseButton_1" onclick="toggleCollapse(1)"><!-- drag handle --><span>
+<img class="handle" src="/images/folder_open.png" id="handle_1"></span>
+
+<!-- title -->
+<a href="/task/view/1" title="">
+<span class="uncompleted-task root-task" id="title_1">nycsr</span></a>
+
+</span>
+
+<!-- the status -->
+
+<span class="status-column" id="status-form_1"><select id="status_1" method="post" name="status" onchange='changeStatus("/task/change_status/1",1)' originalvalue="0"><option value="not done" selected>not done</option>
+<option value="done">done</option></select></span>
+
+<span class="status-column" style="display:none;" id="label_1">not done</span>
+
+
+
+
+<!-- end status -->
+
+<!-- deadline -->
+
+<span class="deadline-column">14 October, 2006</span>
+
+<!-- owner -->
+
+<span class="assigned-column">unassigned</span>
+
+<!-- creator -->
+<span class="creator-column">admin</span>
+
+<!-- subtasks -->
+
+<ul id="xtasks" class="task_list">
+<li status="not done" style="line-height: 2em;" task_id="3" sort_index="0" owner="admin" id="task_3">
+
+<span class="taskitem" style="padding-left: 15px;" depth="1">
+
+<img src="/images/blank.png" id="collapseButton_3" onclick="toggleCollapse(3)"><!-- drag handle --><span>
+<img class="handle" src="/images/file.png" id="handle_3"></span>
+
+<!-- title -->
+<a href="/task/view/3" title="">
+<span class="uncompleted-task sub-task" id="title_3">debug</span></a>
+
+</span>
+
+<!-- the status -->
+
+<span class="status-column" id="status-form_3"><select id="status_3" method="post" name="status" onchange='changeStatus("/task/change_status/3",3)' originalvalue="0"><option value="not done" selected>not done</option>
+<option value="done">done</option></select></span>
+
+<span class="status-column" style="display:none;" id="label_3">not done</span>
+
+
+
+
+<!-- end status -->
+
+<!-- deadline -->
+
+<span class="deadline-column"></span>
+
+<!-- owner -->
+
+<span class="assigned-column">admin</span>
+
+<!-- creator -->
+<span class="creator-column">admin</span>
+
+<!-- subtasks -->
+
+<ul id="xtasks" class="task_list"></ul>
+</li>
+
+
+
+
+
+
+
+<li status="not done" style="line-height: 2em;" task_id="2" sort_index="1" owner="" id="task_2">
+
+<span class="taskitem" style="padding-left: 15px;" depth="1">
+
+<img src="/images/blank.png" id="collapseButton_2" onclick="toggleCollapse(2)"><!-- drag handle --><span>
+<img class="handle" src="/images/file.png" id="handle_2"></span>
+
+<!-- title -->
+<a href="/task/view/2" title="">
+<span class="uncompleted-task sub-task" id="title_2">load test data</span></a>
+
+</span>
+
+<!-- the status -->
+
+<span class="status-column" id="status-form_2"><select id="status_2" method="post" name="status" onchange='changeStatus("/task/change_status/2",2)' originalvalue="0"><option value="not done" selected>not done</option>
+<option value="done">done</option></select></span>
+
+<span class="status-column" style="display:none;" id="label_2">not done</span>
+
+
+
+
+<!-- end status -->
+
+<!-- deadline -->
+
+<span class="deadline-column"></span>
+
+<!-- owner -->
+
+<span class="assigned-column">unassigned</span>
+
+<!-- creator -->
+<span class="creator-column">admin</span>
+
+<!-- subtasks -->
+
+<ul id="xtasks" class="task_list"></ul>
+</li>
+
+
+
+</ul>
+</li>
+
+    
+  
+</ul></span>
+
+<!-- the create setup -->
+
+
+
+<!-- add a new subtask -->
+<div id="create_section">
+
+<p id="show_create">
+<a onclick="hideCreate();return false;" href="/task/show_create/1?task_listID=1">Add a new task.</a>
+</p>
+
+<a name="create_anchor" id="create_anchor"></a>
+
+<div id="create" style="display:none;">
+
+
+<form method="post" action="/task/create/1">
+
+<table>
+<tr>
+<td>
+<span class="row-heading">List:</span>
+</td>
+<td>
+<select id="task_listID" name="task_listID"><option value="1" selected>deliverance</option></select><br>
+</td>
+</tr>
+<tr>
+<td>
+<span class="row-heading">Parent: </span>
+</td>
+<td>
+<select id="parentID" name="parentID"><option value="0">No parent task</option>
+<option value="1">nycsr</option>
+<option value="3">debug</option>
+<option value="2">load test data</option></select>
+</td>
+</tr>
+<tr>
+<td><label class="row-heading" for="title">Title:</label></td>
+<td><input id="title" name="title" type="text"></td>
+</tr>
+<tr>
+<td><label class="row-heading" for="text">Description:</label></td>
+<td><textarea cols="80" id="text" name="text" rows="10"></textarea></td>
+</tr>
+<tr>
+<td><label class="row-heading" for="deadline.date">Deadline:</label></td>
+<td>
+
+    <div id="dateBocks">
+      <script type="text/javascript">
+        var oldtaskDeadlineDateBocksObj = new DateBocks(
+          {dateBocksElementId : 'oldtaskDeadlineDateBocks'}
+        );
+      </script><ul>
+<li class="dateBocksInput"><input id="oldtaskDeadlineDateBocks" name="deadline.date" onchange="oldtaskDeadlineDateBocksObj.magicDate();" onclick="this.select();" onkeypress="oldtaskDeadlineDateBocksObj.keyObserver(event, 'parse'); return oldtaskDeadlineDateBocksObj.keyObserver(event, 'return');" type="text"></li>
+        <li class="dateBocksIcon"><img alt="Calendar" id="oldtaskDeadlineDateBocksButton" src="/images/icon-calendar.gif" style="cursor: pointer;"></li>
+        <li class="dateBocksHelp"><img alt="Help" id="oldtaskDeadlineDateBocksHelp" src="/images/icon-help.gif" style="cursor: pointer"></li>
+      </ul>
+<div id="dateBocksMessage"><div id="oldtaskDeadlineDateBocksMsg"></div></div>
+      <script type="text/javascript">
+        oldtaskDeadlineDateBocksObj.setDefaultFormatMessage();
+        
+        Calendar.setup({inputField : 'oldtaskDeadlineDateBocks',help : 'oldtaskDeadlineDateBocksHelp',singleClick : true,ifFormat : oldtaskDeadlineDateBocksObj.calendarIfFormat,align : oldtaskDeadlineDateBocksObj.calendarAlign,button : 'oldtaskDeadlineDateBocksButton'});
+        
+      </script>
+</div>
+
+<input id="deadline.time" name="deadline.time" type="text" value=""><br><small> hh:mm:ss</small>
+</td>
+</tr>
+<tr>
+<td><label class="row-heading" for="private">Private:</label></td>
+<td>
+<input id="private" name="private" type="checkbox" value="1"><!--input name="private" id="private" type="checkbox"-->
+</td>
+</tr>
+<tr>
+<td>
+<div class="row-heading">Assign task to:</div>
+</td>
+<td>
+<span class="autocomplete">
+<input autocomplete="off" id="owner" name="owner" size="30" type="text" value=""><div class="auto_complete" id="owner_auto_complete"></div>
+<script type="text/javascript">new Ajax.Autocompleter('owner', 'owner_auto_complete', 
+'/task/auto_complete_for_owner/', {})</script></span>
+</td>
+</tr>
+</table>
+<input type="submit" name="create" value="create">
+</form>
+
+
+<p>
+<a href="#nevermind" onclick="$('create').hide(); $('show_create').show(); return false;">Nevermind</a>
+</p>
+</div>
+</div>
+
+
+
+<!-- ----------------------------- -->
+
+<hr>
+<br><a href="/tasklist/show_update/1">Edit list settings</a>
+|
+
+
+<a href="/tasklist/index/1">Back to list of lists</a>
+
+
+</div>
+<!-- / Body --><div class="clear"></div>
+</div>
+<!-- / Container --><hr>
+<!-- Footer --><div id="footer">
+<p class="links">
+		[ 
+		<a href="http://www.nycsr.org/"><span>Home</span></a> 
+		| 
+		<a href="http://www.nycsr.org/who/"><span>Who We Are</span></a> 
+		| 
+		<a href="http://www.nycsr.org/nyc/"><span>New York Lessons</span></a> 
+		| 
+		<a href="http://www.nycsr.org/lessons/"><span>Global Lessons</span></a> 
+		| 
+		<a href="http://www.nycsr.org/involved/"><span>Get Involved</span></a> 
+		| 
+		<a href="http://www.nycsr.org/events/"><span>Events</span></a> 
+		| 
+		<a href="http://www.nycsr.org/involved/join.php"><span>Join Us</span></a> 
+		]
+		</p>
+<p class="cc"><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="http://www.nycsr.org/img/logos/cc.png" class="logo"><br>
+				These works are licensed under a Creative Commons License
+			</a></p>
+<!--
+		<rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+			<Work rdf:about="">
+				<license rdf:resource="http://creativecommons.org/licenses/by-nc-nd/2.5/" />
+				<dc:type rdf:resource="http://purl.org/dc/dcmitype/Text" />
+			</Work>
+			<License rdf:about="http://creativecommons.org/licenses/by-nc-nd/2.5/">
+				<permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+				<permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+				<requires rdf:resource="http://web.resource.org/cc/Notice"/>
+				<requires rdf:resource="http://web.resource.org/cc/Attribution"/>
+				<prohibits rdf:resource="http://web.resource.org/cc/CommercialUse"/>
+			</License>
+		</rdf:RDF>
+		-->
+</div>
+<!-- / Footer -->
+</body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/tasktracker.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/tasktracker.xml	Tue Oct 17 18:35:40 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+  <prepend theme="//head" content="//head/link" onerror="ignore" /> 
+  <prepend theme="//head" content="//head/style" onerror="ignore" /> 
+  <append theme="//head" content="//head/script" onerror="ignore" />    
+  <append theme="//head" content="//head/meta" onerror="ignore"/>
+  <append-or-replace theme="//head" content="//head/title" onerror="ignore" />
+  <copy theme="//div[@id='body']" content="//body/child::node()" />
+</rules>

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Tue Oct 17 18:35:40 2006
@@ -8,9 +8,11 @@
 from htmlserialize import tostring
 
 static_data = os.path.join(os.path.dirname(__file__), 'test-data', 'static')
+tasktracker_data = os.path.join(os.path.dirname(__file__), 'test-data', 'tasktracker')
 nycsr_data = os.path.join(os.path.dirname(__file__), 'test-data', 'nycsr')
 
 static_app = StaticURLParser(static_data)
+tasktracker_app = StaticURLParser(tasktracker_data)
 nycsr_app = StaticURLParser(nycsr_data)
 
 def html_string_compare(astr, bstr):
@@ -51,6 +53,13 @@
     res2 = app.get('/texttest_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
+def test_tasktracker():
+    wsgi_app = DeliveranceMiddleware(tasktracker_app, 'http://www.nycsr.org/nyc/video.php', 'tasktracker.xml')
+    app = TestApp(wsgi_app)
+    res = app.get('/content.html')
+    res2 = app.get('/expected.html?notheme')
+    html_string_compare(res.body, res2.body)
+
 
 def test_xinclude():
     wsgi_app = DeliveranceMiddleware(static_app, 'xinclude_theme.html', 'xinclude_rules.xml')
@@ -59,7 +68,7 @@
     res2 = app.get('/xinclude_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
-4
+
 def test_nycsr():
     wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://www.nycsr.org','nycsr.xml')
     app = TestApp(wsgi_app)

From cabraham at codespeak.net  Tue Oct 17 20:38:52 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Tue, 17 Oct 2006 20:38:52 +0200 (CEST)
Subject: [z3-checkins] r33388 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061017183852.54E9D1006F@code0.codespeak.net>

Author: cabraham
Date: Tue Oct 17 20:38:48 2006
New Revision: 33388

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
Log:
Undoing change committed in r33384 because the lxml guys fixed their deepcopy bug so my workaround isn't needed anymore.

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Tue Oct 17 20:38:48 2006
@@ -66,7 +66,7 @@
         if theme_el is None:
             return 
 
-        content_els = self.deepcopy_elementlist(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.get(self.NOCONTENT_KEY) != 'ignore':
@@ -120,7 +120,7 @@
         if theme_el is None:
             return 
 
-        content_els = self.deepcopy_elementlist(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -186,7 +186,7 @@
         if theme_el is None:
             return 
 
-        content_els = self.deepcopy_elementlist(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -261,7 +261,7 @@
         if theme_el is None:
             return 
 
-        content_els = self.deepcopy_elementlist(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -303,7 +303,7 @@
             self.add_to_body_start(theme,self.format_error("invalid xpath for content", rule=rule))
             return
 
-        content_els = self.deepcopy_elementlist(content.xpath(content_xpath))        
+        content_els = copy.deepcopy(content.xpath(content_xpath))        
  
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -356,13 +356,3 @@
         comment_before = etree.Comment("Deliverance: applying rule %s" % etree.tostring(rule))
         comment_after = etree.Comment("Deliverance: done applying rule %s" % etree.tostring(rule))
         return comment_before, comment_after
-
-    def deepcopy_elementlist(self, els):
-        # converts etree._Comment list elements into strings and then performs copy
-        # this is necessary to avoid a  bug in lxml which turns comments into None when
-        # perfoming a deepcopy
-        for index, el in enumerate(els):
-            if type(el) == etree._Comment:
-                els[index] = str(el)
-
-        return copy.deepcopy(els)

From cabraham at codespeak.net  Tue Oct 17 22:49:24 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Tue, 17 Oct 2006 22:49:24 +0200 (CEST)
Subject: [z3-checkins] r33393 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061017204924.1429010071@code0.codespeak.net>

Author: cabraham
Date: Tue Oct 17 22:49:22 2006
New Revision: 33393

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/test_xinclude.xml
   z3/deliverance/branches/packaged/deliverance/test-data/xincluderules.xml
Modified:
   z3/deliverance/branches/packaged/deliverance/tests.py
Log:
added test for rules xinclude that doesn't use wsgi; modified tests.py to accomodate this functionality

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_xinclude.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_xinclude.xml	Tue Oct 17 22:49:22 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests xinclude in the rules --> 
+<deliverance-test>
+  <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
+    <xi:include href="xincluderules.xml" />
+  </rules>
+
+  <theme base="http://example.com"> 
+    <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content<p>HI!</p></div>
+    </body></html>
+  </theme>
+
+  <content> 
+    <html><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></html>
+  </content>
+  
+  <output>
+    <html><head><title>Blah</title></head><body><div></div>
+	<div id="foo">Dummy Content<p>HI!</p><span class="bar">1</span><span class="bar">3</span></div></body></html>
+  </output> 
+</deliverance-test>
+
+
+
+</deliverance-test-suite>

Added: z3/deliverance/branches/packaged/deliverance/test-data/xincluderules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/xincluderules.xml	Tue Oct 17 22:49:22 2006
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
+  <append theme=".//div[@id='foo']" content=".//span[@class='bar']" />
+</rules>

Modified: z3/deliverance/branches/packaged/deliverance/tests.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/tests.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/tests.py	Tue Oct 17 22:49:22 2006
@@ -5,6 +5,7 @@
 from deliverance.interpreter import Renderer
 #from deliverance.xslt import Renderer
 import copy 
+import urllib
 
 class DeliveranceTestCase:
 
@@ -17,10 +18,20 @@
         self.output = output
 
     def __call__(self, name):
+        def reference_resolver(href, parse, encoding=None):
+            f = urllib.urlopen(href)
+            content = f.read()
+            f.close()
+            if parse == "xml":
+                return etree.XML(content)
+            elif encoding:
+                return content.decode(encoding)
+
         renderer = Renderer(
             theme=self.theme,
             theme_uri=self.theme_uri,
-            rule=self.rules, rule_uri=self.rules_uri)
+            rule=self.rules, rule_uri=self.rules_uri,
+            reference_resolver=reference_resolver)
         actual = renderer.render(self.content)
         reporter = []
         result = xml_compare(actual, self.output, reporter.append)
@@ -80,10 +91,9 @@
             outputbody = copy.deepcopy(output[0])
         output[:] = []
 
-
         case = DeliveranceTestCase(
             rules=rules,
-            rules_uri = fn, # not sure about this
+            rules_uri = fn,
             theme=themebody,
             theme_uri=el.find('theme').attrib['base'],
             content=contentbody,

From ltucker at codespeak.net  Wed Oct 18 21:38:34 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 18 Oct 2006 21:38:34 +0200 (CEST)
Subject: [z3-checkins] r33417 -
	z3/deliverance/branches/packaged/deliverance/etc
Message-ID: <20061018193834.2622610063@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 18 21:38:32 2006
New Revision: 33417

Removed:
   z3/deliverance/branches/packaged/deliverance/etc/
Log:
removing some old style xml files

From ltucker at codespeak.net  Wed Oct 18 21:57:43 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 18 Oct 2006 21:57:43 +0200 (CEST)
Subject: [z3-checkins] r33419 - in
	z3/deliverance/branches/packaged/deliverance/test-data: .
	nabuur nycsr static tasktracker
Message-ID: <20061018195743.64FCE10071@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 18 21:57:39 2006
New Revision: 33419

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/nabuur/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/static/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/__init__.py
Log:
roll these into the egg?

Added: z3/deliverance/branches/packaged/deliverance/test-data/__init__.py
==============================================================================

Added: z3/deliverance/branches/packaged/deliverance/test-data/nabuur/__init__.py
==============================================================================

Added: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/__init__.py
==============================================================================

Added: z3/deliverance/branches/packaged/deliverance/test-data/static/__init__.py
==============================================================================

Added: z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/__init__.py
==============================================================================

From ltucker at codespeak.net  Wed Oct 18 22:03:44 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 18 Oct 2006 22:03:44 +0200 (CEST)
Subject: [z3-checkins] r33420 - in
	z3/deliverance/branches/packaged/deliverance/test-data: .
	nabuur nycsr static tasktracker
Message-ID: <20061018200344.70DB610074@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 18 22:03:40 2006
New Revision: 33420

Removed:
   z3/deliverance/branches/packaged/deliverance/test-data/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/nabuur/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/static/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/__init__.py
Log:
nope

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/__init__.py
==============================================================================

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/nabuur/__init__.py
==============================================================================

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/nycsr/__init__.py
==============================================================================

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/static/__init__.py
==============================================================================

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/tasktracker/__init__.py
==============================================================================

From ltucker at codespeak.net  Wed Oct 18 22:08:09 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 18 Oct 2006 22:08:09 +0200 (CEST)
Subject: [z3-checkins] r33421 - z3/deliverance/branches/packaged
Message-ID: <20061018200809.C917610076@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 18 22:08:07 2006
New Revision: 33421

Modified:
   z3/deliverance/branches/packaged/setup.py
Log:
include tests in egg

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Wed Oct 18 22:08:07 2006
@@ -19,7 +19,9 @@
       zip_safe=False,
       install_requires=[
         'lxml',
+        'paste'
       ],
+      include_package_data=True,
       entry_points="""
       [paste.filter_app_factory]
       main = deliverance.wsgifilter:make_filter

From ltucker at codespeak.net  Wed Oct 18 22:25:15 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 18 Oct 2006 22:25:15 +0200 (CEST)
Subject: [z3-checkins] r33424 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061018202515.E590210078@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 18 22:25:14 2006
New Revision: 33424

Modified:
   z3/deliverance/branches/packaged/deliverance/test_speed.py
Log:
fix test_speed to match new Renderer signature

Modified: z3/deliverance/branches/packaged/deliverance/test_speed.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_speed.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_speed.py	Wed Oct 18 22:25:14 2006
@@ -38,15 +38,16 @@
         elif encoding:
             return text.decode(encoding)
 
-    renderer = None
     if renderer_type == 'xslt':
-        renderer = XSLTRenderer(theme,base_url,rules,reference_resolver)
+        renderer_class = XSLTRenderer
     elif renderer_type == 'py':
-        renderer = PythonRenderer(theme,base_url,rules,reference_resolver)
+        renderer_class = PythonRenderer
     else:
         print "Unknown renderer type '" + renderer_type + "'"
         return etree.Element("error")
 
+    renderer = renderer_class(theme,base_url,rules,'.',reference_resolver)
+
     start = time()
     iters = 3000
     for i in range(iters):

From ltucker at codespeak.net  Wed Oct 18 22:30:46 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 18 Oct 2006 22:30:46 +0200 (CEST)
Subject: [z3-checkins] r33427 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061018203046.8B43910074@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 18 22:30:45 2006
New Revision: 33427

Modified:
   z3/deliverance/branches/packaged/deliverance/tests.py
Log:
change import to local import

Modified: z3/deliverance/branches/packaged/deliverance/tests.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/tests.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/tests.py	Wed Oct 18 22:30:45 2006
@@ -2,8 +2,8 @@
 import os
 from lxml import etree
 from formencode.doctest_xml_compare import xml_compare
-from deliverance.interpreter import Renderer
-#from deliverance.xslt import Renderer
+from interpreter import Renderer
+#from xslt import Renderer
 import copy 
 import urllib
 

From ltucker at codespeak.net  Wed Oct 18 22:49:41 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 18 Oct 2006 22:49:41 +0200 (CEST)
Subject: [z3-checkins] r33428 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061018204941.2000D10078@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 18 22:49:39 2006
New Revision: 33428

Modified:
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
fix internal routing decisions

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Wed Oct 18 22:49:39 2006
@@ -112,7 +112,7 @@
         internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)
         uri = urlparse.urljoin(internalBaseURL, uri)
         
-        if internalBaseURL and uri.startswith(internalBaseURL):
+        if relative_url(uri) or (internalBaseURL and uri.startswith(internalBaseURL)):
             return self.get_internal_resource(environ, uri[len(internalBaseURL):])
         else:
             return self.get_external_resource(uri)

From ltucker at codespeak.net  Wed Oct 18 22:59:33 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 18 Oct 2006 22:59:33 +0200 (CEST)
Subject: [z3-checkins] r33430 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061018205933.C136B1007C@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 18 22:59:31 2006
New Revision: 33430

Modified:
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
whoops

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Wed Oct 18 22:59:31 2006
@@ -112,7 +112,7 @@
         internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)
         uri = urlparse.urljoin(internalBaseURL, uri)
         
-        if relative_url(uri) or (internalBaseURL and uri.startswith(internalBaseURL)):
+        if self.relative_uri(uri) or (internalBaseURL and uri.startswith(internalBaseURL)):
             return self.get_internal_resource(environ, uri[len(internalBaseURL):])
         else:
             return self.get_external_resource(uri)

From ltucker at codespeak.net  Thu Oct 19 00:47:52 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu, 19 Oct 2006 00:47:52 +0200 (CEST)
Subject: [z3-checkins] r33435 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061018224752.8C19F10078@code0.codespeak.net>

Author: ltucker
Date: Thu Oct 19 00:47:50 2006
New Revision: 33435

Modified:
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
remove query string from base url to avoid redirecting externally by accident

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Thu Oct 19 00:47:50 2006
@@ -77,7 +77,7 @@
 
     def __call__(self, environ, start_response):
         qs = environ.get('QUERY_STRING', '')
-        environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False)
+        environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False, with_query_string=False)
         notheme = 'notheme' in qs
         if notheme:
             return self.app(environ, start_response)
@@ -112,7 +112,7 @@
         internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)
         uri = urlparse.urljoin(internalBaseURL, uri)
         
-        if self.relative_uri(uri) or (internalBaseURL and uri.startswith(internalBaseURL)):
+        if  internalBaseURL and uri.startswith(internalBaseURL):
             return self.get_internal_resource(environ, uri[len(internalBaseURL):])
         else:
             return self.get_external_resource(uri)

From ianb at codespeak.net  Thu Oct 19 03:03:56 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 19 Oct 2006 03:03:56 +0200 (CEST)
Subject: [z3-checkins] r33436 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061019010356.55D2810053@code0.codespeak.net>

Author: ianb
Date: Thu Oct 19 03:03:53 2006
New Revision: 33436

Modified:
   z3/deliverance/branches/packaged/deliverance/htmlserialize.py
Log:
Make sure HTML() returns something, or else fail early.  (With really bad content it can just return None, which causes problems later)

Modified: z3/deliverance/branches/packaged/deliverance/htmlserialize.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/htmlserialize.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/htmlserialize.py	Thu Oct 19 03:03:53 2006
@@ -54,7 +54,9 @@
         charset = m.group('charset')
         text = text.decode(charset)
 
-    return etree.HTML(text)
+    content = etree.HTML(text)
+    assert content is not None
+    return content
     
 
         

From ianb at codespeak.net  Thu Oct 19 03:09:02 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 19 Oct 2006 03:09:02 +0200 (CEST)
Subject: [z3-checkins] r33437 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061019010902.05B8E10053@code0.codespeak.net>

Author: ianb
Date: Thu Oct 19 03:09:00 2006
New Revision: 33437

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
Log:
Purely whitespace/aesthetic changes

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Thu Oct 19 03:09:00 2006
@@ -32,28 +32,28 @@
     def render(self, content):
         result = copy.deepcopy(self.theme)
         input = copy.deepcopy(content)
-        self.apply_rules(self.rules,result,input)
+        self.apply_rules(self.rules, result, input)
         return result
 
 
-    def apply_rules(self,rules,theme,content):
+    def apply_rules(self, rules, theme, content):
         for rule in rules:
-            self.apply_rule(rule,theme,content)
+            self.apply_rule(rule, theme, content)
 
 
-    def apply_rule(self,rule,theme,content):
+    def apply_rule(self, rule, theme, content):
         if rule.tag == self.APPEND_RULE_TAG:
-            self.apply_append(rule,theme,content)
+            self.apply_append(rule, theme, content)
         elif rule.tag == self.PREPEND_RULE_TAG:
-            self.apply_prepend(rule,theme,content)
+            self.apply_prepend(rule, theme, content)
         elif rule.tag == self.REPLACE_RULE_TAG:
-            self.apply_replace(rule,theme,content)
+            self.apply_replace(rule, theme, content)
         elif rule.tag == self.COPY_RULE_TAG:
-            self.apply_copy(rule,theme,content)
+            self.apply_copy(rule, theme, content)
         elif rule.tag == self.APPEND_OR_REPLACE_RULE_TAG:
-            self.apply_append_or_replace(rule,theme,content)
+            self.apply_append_or_replace(rule, theme, content)
         elif rule.tag == self.SUBRULES_TAG:
-            self.apply_rules(rule,theme,content)
+            self.apply_rules(rule, theme, content)
         elif rule.tag is etree.Comment:
             pass
         else:
@@ -62,15 +62,17 @@
                     rule.tag, etree.tostring(rule)))
 
     def apply_append(self,rule,theme,content):
-        theme_el = self.get_theme_el(rule,theme)
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
 
-        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = copy.deepcopy(
+            content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.get(self.NOCONTENT_KEY) != 'ignore':
-                self.add_to_body_start(theme, self.format_error("no content matched", rule))
+                self.add_to_body_start(
+                    theme, self.format_error("no content matched", rule))
             return 
 
         if self.debug:
@@ -115,16 +117,18 @@
         
 
 
-    def apply_prepend(self,rule,theme,content):
-        theme_el = self.get_theme_el(rule,theme)
+    def apply_prepend(self, rule, theme, content):
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
 
-        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        xpath = rule.attrib[self.RULE_CONTENT_KEY]
+        content_els = copy.deepcopy(content.xpath(xpath))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
-                self.add_to_body_start(theme, self.format_error("no content matched", rule))
+                self.add_to_body_start(
+                    theme, self.format_error("no content matched", rule))
             return 
 
         if self.debug:
@@ -167,7 +171,7 @@
 
     def debug_prepend(self, theme_el, content_els, rule):        
         
-        comment_before,comment_after = self.make_debugging_comments(rule)
+        comment_before, comment_after = self.make_debugging_comments(rule)
         content_els[:0] = [comment_before]
         content_els.append(comment_after)
 
@@ -181,20 +185,22 @@
 
         theme_el[:0] = non_text_els
 
-    def apply_replace(self,rule,theme,content):
-        theme_el = self.get_theme_el(rule,theme)
+    def apply_replace(self, rule, theme, content):
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
 
-        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = copy.deepcopy(
+            content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
-                self.add_to_body_start(theme, self.format_error("no content matched", rule))            
+                self.add_to_body_start(
+                    theme, self.format_error("no content matched", rule))            
             return       
 
         if self.debug:
-            self.debug_replace(theme_el,content_els,rule)
+            self.debug_replace(theme_el, content_els, rule)
             return 
 
         non_text_els = self.elements_in(content_els)
@@ -206,13 +212,13 @@
         if (type(content_els[0]) is type(str())):
             # text must be appended to the tail of the most recent sibling or appended 
             # to the text of the parent of the replaced element
-            self.attach_text_to_previous(theme_el,content_els[0])
+            self.attach_text_to_previous(theme_el, content_els[0])
 
         if len(non_text_els) == 0:
-            self.attach_text_to_previous(theme_el,theme_el.tail)
+            self.attach_text_to_previous(theme_el, theme_el.tail)
             theme_el.getparent().remove(theme_el)
             return
-            
+        
         self.attach_tails(content_els)
 
         # this tail, if there is one, should stick around 
@@ -238,7 +244,7 @@
                 non_text_els[0].tail = preserve_tail
 
     def debug_replace(self,theme_el,content_els,rule):
-        comment_before,comment_after = self.make_debugging_comments(rule)
+        comment_before, comment_after = self.make_debugging_comments(rule)
         content_els[:0] = [comment_before]
         content_els.append(comment_after)
 
@@ -256,16 +262,18 @@
         parent[i+1:i+1] = non_text_els[1:]
         
 
-    def apply_copy(self,rule,theme,content):
+    def apply_copy(self, rule, theme, content):
         theme_el = self.get_theme_el(rule,theme)
         if theme_el is None:
-            return 
+            return
 
-        content_els = copy.deepcopy(content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = copy.deepcopy(
+            content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
-                self.add_to_body_start(theme, self.format_error("no content matched", rule))
+                self.add_to_body_start(
+                    theme, self.format_error("no content matched", rule))
             return 
 
         non_text_els = self.elements_in(content_els)
@@ -285,14 +293,14 @@
             comment_before,comment_after = self.make_debugging_comments(rule)
             parent = theme_el.getparent()
             index = parent.index(theme_el)
-            parent.insert(index-1,comment_before)
-            parent.insert(index+2,comment_after)
+            parent.insert(index-1, comment_before)
+            parent.insert(index+2, comment_after)
             comment_after.tail = theme_el.tail
             theme_el.tail = None
             
 
-    def apply_append_or_replace(self,rule,theme,content):
-        theme_el = self.get_theme_el(rule,theme)
+    def apply_append_or_replace(self, rule, theme, content):
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
 
@@ -300,19 +308,21 @@
         remove_tag = self.get_tag_from_xpath(content_xpath)
 
         if remove_tag is None:
-            self.add_to_body_start(theme,self.format_error("invalid xpath for content", rule=rule))
+            self.add_to_body_start(
+                theme, self.format_error("invalid xpath for content", rule=rule))
             return
 
         content_els = copy.deepcopy(content.xpath(content_xpath))        
  
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
-                self.add_to_body_start(theme, self.format_error("no content matched", rule))
+                self.add_to_body_start(
+                    theme, self.format_error("no content matched", rule))
             return 
 
         for el in theme_el:
             if el.tag == remove_tag:
-                self.attach_text_to_previous(el,el.tail)
+                self.attach_text_to_previous(el, el.tail)
                 theme_el.remove(el)
 
 

From ianb at codespeak.net  Thu Oct 19 03:11:11 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 19 Oct 2006 03:11:11 +0200 (CEST)
Subject: [z3-checkins] r33438 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061019011111.83E6810068@code0.codespeak.net>

Author: ianb
Date: Thu Oct 19 03:11:00 2006
New Revision: 33438

Modified:
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
Make sure the response won't be encoded, by removing the Accept-Encoding header.  Technically we could de-gzip the response, but it's just busy work in this case

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Thu Oct 19 03:11:00 2006
@@ -81,6 +81,8 @@
         notheme = 'notheme' in qs
         if notheme:
             return self.app(environ, start_response)
+        if 'HTTP_ACCEPT_ENCODING' in environ:
+            del environ['HTTP_ACCEPT_ENCODING']
 
         status, headers, body = intercept_output(
             environ, self.app,

From ianb at codespeak.net  Thu Oct 19 03:13:49 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 19 Oct 2006 03:13:49 +0200 (CEST)
Subject: [z3-checkins] r33439 -
	z3/deliverance/branches/packaged/deliverance/test-data/nycsr
Message-ID: <20061019011349.26B5F10068@code0.codespeak.net>

Author: ianb
Date: Thu Oct 19 03:13:38 2006
New Revision: 33439

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr-live.xml
      - copied, changed from r33437, z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml
Log:
Added another version of the nycsr rules that works for me right now against the live site

Copied: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr-live.xml (from r33437, z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml)
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr-live.xml	Thu Oct 19 03:13:38 2006
@@ -3,5 +3,14 @@
 <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
   <xi:include href="standardrules.xml" />
 
-  <copy theme="//div[@id='container']" content="//*[@id='portal-columns']" />
+  <!-- This rule isn't working for me; the div that contains
+       everything on nycsr.org seems to have an id of 'body'
+       not 'container'...?  -- ianb  -->
+
+  <!-- <copy theme="//div[@id='container']"
+        content="//*[@id='portal-columns']" /> -->
+
+  <copy theme="//div[@id='body']"
+        content="//*[@id='portal-columns']" />
+
 </rules>

From ianb at codespeak.net  Thu Oct 19 03:14:29 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 19 Oct 2006 03:14:29 +0200 (CEST)
Subject: [z3-checkins] r33440 - in z3/deliverance/branches/packaged: .
	deliverance
Message-ID: <20061019011429.34A4210068@code0.codespeak.net>

Author: ianb
Date: Thu Oct 19 03:14:21 2006
New Revision: 33440

Added:
   z3/deliverance/branches/packaged/deliverance/proxyapp.py   (contents, props changed)
   z3/deliverance/branches/packaged/deliverance/proxycommand.py   (contents, props changed)
Modified:
   z3/deliverance/branches/packaged/setup.py
Log:
Added a command-line script for setting up a proxy

Added: z3/deliverance/branches/packaged/deliverance/proxyapp.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/proxyapp.py	Thu Oct 19 03:14:21 2006
@@ -0,0 +1,34 @@
+"""
+WSGI proxy application that applies a deliverance theme while
+passing the request to another HTTP server
+"""
+
+from paste.proxy import TransparentProxy
+from deliverance import wsgifilter
+
+class ProxyDeliveranceApp(object):
+
+    def __init__(self, theme_uri, rule_uri, proxy,
+                 transparent=False):
+        self.theme_uri = theme_uri,
+        self.rule_uri = rule_uri,
+        self.proxy = proxy
+        self.transparent = transparent
+        self.subapp = self.make_app()
+        self.deliverance_app = wsgifilter.DeliveranceMiddleware(
+            self.subapp, theme_uri, rule_uri)
+
+    def make_app(self):
+        if self.transparent:
+            force_host = self.proxy
+        else:
+            force_host = None
+        return TransparentProxy(force_host=force_host)
+
+    def __call__(self, environ, start_response):
+        if not self.transparent:
+            # @@: Set forwarded header
+            environ['HTTP_HOST'] = self.proxy
+        return self.deliverance_app(
+            environ, start_response)
+    

Added: z3/deliverance/branches/packaged/deliverance/proxycommand.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/proxycommand.py	Thu Oct 19 03:14:21 2006
@@ -0,0 +1,83 @@
+import optparse
+import pkg_resources
+import sys
+from deliverance import proxyapp
+
+my_package = pkg_resources.get_distribution('Deliverance')
+
+pkg_resources.require('Paste')
+
+from paste import httpserver
+
+help = """\
+"""
+
+parser = optparse.OptionParser(
+    version=str(my_package),
+    usage="%%prog [OPTIONS]\n\n%s" % help)
+parser.add_option('-s', '--serve',
+                  help="The interface to serve on (default 0.0.0.0:80)",
+                  dest="serve",
+                  default="0.0.0.0:80")
+parser.add_option('-p', '--proxy',
+                  help="The host and port to proxy to (default localhost:8080)",
+                  dest="proxy",
+                  default='localhost:8080')
+parser.add_option('--theme',
+                  help="The URI of the theme to use",
+                  dest="theme")
+parser.add_option('--rule',
+                  help="The URI of the ruleset to use",
+                  dest="rule")
+parser.add_option('--transparent',
+                  help="Do not rewrite the Host header when passing the request on",
+                  action='store_true',
+                  dest='transparent')
+parser.add_option('--debug',
+                  help="Show tracebacks when an error occurs (use twice for fancy/dangerous traceback)",
+                  action="count",
+                  dest="debug")
+
+def strip(prefix, string):
+    if string.startswith(prefix):
+        return string[len(prefix):]
+    else:
+        return string
+
+def main(args=None):
+    if args is None:
+        args = sys.argv[1:]
+    options, args = parser.parse_args(args)
+    serve = strip('http://', options.serve)
+    if ':' not in serve:
+        serve += ':80'
+    proxy = strip('http://', options.proxy)
+    if ':' not in proxy:
+        proxy += ':80'
+    if not options.rule or not options.theme:
+        if not options.rule:
+            op = '--rule'
+        else:
+            op = '--theme'
+        print 'You must provide the %s option' % op
+        sys.exit(2)
+    app = proxyapp.ProxyDeliveranceApp(
+        theme_uri=options.theme,
+        rule_uri=options.rule,
+        proxy=proxy,
+        transparent=options.transparent)
+    if options.debug:
+        if options.debug > 1:
+            from paste.evalexception.middleware import EvalException
+            app = EvalException(app)
+        else:
+            from paste.exceptions.errormiddleware import ErrorMiddleware
+            app = ErrorMiddleware(app, debug=True)
+    print 'Serving on http://%s' % serve
+    print 'Proxying from http://%s' % proxy
+    try:
+        httpserver.serve(app, host=serve)
+    except KeyboardInterrupt:
+        print 'Exiting.'
+        sys.exit()
+    

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Thu Oct 19 03:14:21 2006
@@ -19,12 +19,15 @@
       zip_safe=False,
       install_requires=[
         'lxml',
-        'paste'
+        'paste==dev,>=0.9.9a'
       ],
       include_package_data=True,
       entry_points="""
       [paste.filter_app_factory]
       main = deliverance.wsgifilter:make_filter
+
+      [console_scripts]
+      deliverance-proxy = deliverance.proxycommand:main
       """,
       )
 

From ianb at codespeak.net  Thu Oct 19 03:16:47 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 19 Oct 2006 03:16:47 +0200 (CEST)
Subject: [z3-checkins] r33441 -
	z3/deliverance/branches/packaged/deliverance/test-data/nycsr
Message-ID: <20061019011647.F34F810068@code0.codespeak.net>

Author: ianb
Date: Thu Oct 19 03:16:39 2006
New Revision: 33441

Modified:
   z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr-live.xml
Log:
Oops, libxml doesn't like -- inside a comment

Modified: z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr-live.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr-live.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/nycsr/nycsr-live.xml	Thu Oct 19 03:16:39 2006
@@ -5,7 +5,7 @@
 
   <!-- This rule isn't working for me; the div that contains
        everything on nycsr.org seems to have an id of 'body'
-       not 'container'...?  -- ianb  -->
+       not 'container'...? - ianb  -->
 
   <!-- <copy theme="//div[@id='container']"
         content="//*[@id='portal-columns']" /> -->

From ltucker at codespeak.net  Fri Oct 20 19:19:50 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri, 20 Oct 2006 19:19:50 +0200 (CEST)
Subject: [z3-checkins] r33509 - z3/deliverance/branches/packaged
Message-ID: <20061020171950.0D31C10075@code0.codespeak.net>

Author: ltucker
Date: Fri Oct 20 19:19:48 2006
New Revision: 33509

Modified:
   z3/deliverance/branches/packaged/setup.py
Log:
add setuptools as a dependency, sort of wierd, but nice for the buildout

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Fri Oct 20 19:19:48 2006
@@ -20,6 +20,7 @@
       install_requires=[
         'lxml',
         'paste==dev,>=0.9.9a'
+	'setuptools'
       ],
       include_package_data=True,
       entry_points="""

From ltucker at codespeak.net  Fri Oct 20 19:34:15 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri, 20 Oct 2006 19:34:15 +0200 (CEST)
Subject: [z3-checkins] r33510 - z3/deliverance/branches/packaged
Message-ID: <20061020173415.4740C10072@code0.codespeak.net>

Author: ltucker
Date: Fri Oct 20 19:34:13 2006
New Revision: 33510

Modified:
   z3/deliverance/branches/packaged/setup.py
Log:
removing setuptools dependency, no good anyway

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Fri Oct 20 19:34:13 2006
@@ -20,7 +20,6 @@
       install_requires=[
         'lxml',
         'paste==dev,>=0.9.9a'
-	'setuptools'
       ],
       include_package_data=True,
       entry_points="""

From ltucker at codespeak.net  Fri Oct 20 19:56:34 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri, 20 Oct 2006 19:56:34 +0200 (CEST)
Subject: [z3-checkins] r33511 - z3/deliverance/branches/packaged
Message-ID: <20061020175634.392E61006F@code0.codespeak.net>

Author: ltucker
Date: Fri Oct 20 19:56:31 2006
New Revision: 33511

Modified:
   z3/deliverance/branches/packaged/setup.py
Log:
try again with setuptools dependency

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Fri Oct 20 19:56:31 2006
@@ -20,6 +20,7 @@
       install_requires=[
         'lxml',
         'paste==dev,>=0.9.9a'
+	'setuptools'
       ],
       include_package_data=True,
       entry_points="""

From ltucker at codespeak.net  Fri Oct 20 20:25:41 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri, 20 Oct 2006 20:25:41 +0200 (CEST)
Subject: [z3-checkins] r33512 - z3/deliverance/branches/packaged
Message-ID: <20061020182541.3697D10053@code0.codespeak.net>

Author: ltucker
Date: Fri Oct 20 20:25:38 2006
New Revision: 33512

Modified:
   z3/deliverance/branches/packaged/setup.py
Log:
missing comma

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Fri Oct 20 20:25:38 2006
@@ -19,7 +19,7 @@
       zip_safe=False,
       install_requires=[
         'lxml',
-        'paste==dev,>=0.9.9a'
+        'paste==dev,>=0.9.9a',
 	'setuptools'
       ],
       include_package_data=True,

From ltucker at codespeak.net  Fri Oct 20 21:18:51 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri, 20 Oct 2006 21:18:51 +0200 (CEST)
Subject: [z3-checkins] r33513 - z3/deliverance/branches/packaged
Message-ID: <20061020191851.3D2D710060@code0.codespeak.net>

Author: ltucker
Date: Fri Oct 20 21:18:49 2006
New Revision: 33513

Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
adding link to the buildout to the readme

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Fri Oct 20 21:18:49 2006
@@ -1,7 +1,17 @@
 
 Quick Start to run tests 
 -------------------------
-running setup.py is probably going to do the wrong thing currently
+
+The easiest way to get started is to check out the buildout: 
+
+svn co https://svn.openplans.org/svn/deliverance.buildout deliverance.buildout
+
+If you follow the instructions there and install nose and it's dependencies, 
+you should be able to run tests by running nosetests from 
+this directory. 
+
+
+Otherwise to install manually: 
 
 get workingenv.py from
 http://cheeseshop.python.org/pypi/workingenv.py

From ltucker at codespeak.net  Fri Oct 20 21:44:32 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri, 20 Oct 2006 21:44:32 +0200 (CEST)
Subject: [z3-checkins] r33514 - in z3/deliverance/branches/packaged: .
	deliverance
Message-ID: <20061020194432.CBF1A10060@code0.codespeak.net>

Author: ltucker
Date: Fri Oct 20 21:44:28 2006
New Revision: 33514

Modified:
   z3/deliverance/branches/packaged/deliverance/test_speed.py
   z3/deliverance/branches/packaged/deliverance/tests.py
   z3/deliverance/branches/packaged/setup.py
Log:
adjusted speed test to run from deliverance folder, added main functions to testing scripts, added testing tools to dependencies.  Should adjust these all to be independent of where they are run from at some point

Modified: z3/deliverance/branches/packaged/deliverance/test_speed.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_speed.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_speed.py	Fri Oct 20 21:44:28 2006
@@ -69,7 +69,9 @@
     parser.print_usage()
     sys.exit(0)    
     
-if __name__ == '__main__':
-    do_transform('xslt','test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','test-data/nycsr/nycsr.xml','test-data/nycsr/openplans.html')
-    do_transform('py','test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','test-data/nycsr/nycsr.xml','test-data/nycsr/openplans.html')
+def main(args=None):
+    do_transform('xslt','deliverance/test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','deliverance/test-data/nycsr/nycsr.xml','deliverance/test-data/nycsr/openplans.html')
+    do_transform('py','deliverance/test-data/nycsr/nycsr_speed.html','http://www.nycsr.org','deliverance/test-data/nycsr/nycsr.xml','deliverance/test-data/nycsr/openplans.html')
     
+if __name__ == '__main__':
+    main()

Modified: z3/deliverance/branches/packaged/deliverance/tests.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/tests.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/tests.py	Fri Oct 20 21:44:28 2006
@@ -104,6 +104,8 @@
 
 
 
+def main(args=None):
+    import nose; nose.main() 
 
 if __name__ == '__main__':
-    import nose; nose.main() 
+    main()

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Fri Oct 20 21:44:28 2006
@@ -20,6 +20,9 @@
       install_requires=[
         'lxml',
         'paste==dev,>=0.9.9a',
+	'nose',
+	'formencode',
+	'elementtree',
 	'setuptools'
       ],
       include_package_data=True,
@@ -29,6 +32,8 @@
 
       [console_scripts]
       deliverance-proxy = deliverance.proxycommand:main
+      deliverance-tests = deliverance.tests:main
+      deliverance-speed = deliverance.test_speed:main
       """,
       )
 

From ltucker at codespeak.net  Fri Oct 20 21:52:53 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri, 20 Oct 2006 21:52:53 +0200 (CEST)
Subject: [z3-checkins] r33515 - z3/deliverance/branches/packaged
Message-ID: <20061020195253.7152410060@code0.codespeak.net>

Author: ltucker
Date: Fri Oct 20 21:52:51 2006
New Revision: 33515

Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
updating install instructions, removing steps covered by buildout and setup

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Fri Oct 20 21:52:51 2006
@@ -6,9 +6,7 @@
 
 svn co https://svn.openplans.org/svn/deliverance.buildout deliverance.buildout
 
-If you follow the instructions there and install nose and it's dependencies, 
-you should be able to run tests by running nosetests from 
-this directory. 
+If you follow the instructions there. 
 
 
 Otherwise to install manually: 
@@ -24,17 +22,18 @@
 install a recent cvs version of libxml2,libxstl and svn lxml. 
 You are likely to encounter segfaults and other failures if recent versions are not used.
 
-$ easy_install nose 
-$ easy_install FormEncode
-$ easy_install elementtree
-$ easy_install paste 
-
 checkout deliverance: 
 $ svn co http://codespeak.net/svn/z3/deliverance/branches/packaged deliverance
 
 $ cd deliverance
-$ nosetests 
+$ python setup.py develop 
+$ nosetests
+
+you can also run: 
+deliverance_env/bin/deliverance-tests 
+deliverance_env/bin/deliverance-speed 
 
+from the top level checkout directory
 
 Simple Tests
 ------------

From ltucker at codespeak.net  Fri Oct 20 22:20:06 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri, 20 Oct 2006 22:20:06 +0200 (CEST)
Subject: [z3-checkins] r33516 - z3/deliverance/branches/packaged
Message-ID: <20061020202006.0FC5110060@code0.codespeak.net>

Author: ltucker
Date: Fri Oct 20 22:20:04 2006
New Revision: 33516

Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
add prominent reference to specification page

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Fri Oct 20 22:20:04 2006
@@ -1,4 +1,7 @@
 
+See: http://www.openplans.org/projects/deliverance/specification 
+for more information
+
 Quick Start to run tests 
 -------------------------
 

From faassen at codespeak.net  Mon Oct 23 18:01:33 2006
From: faassen at codespeak.net (faassen at codespeak.net)
Date: Mon, 23 Oct 2006 18:01:33 +0200 (CEST)
Subject: [z3-checkins] r33610 - in z3/hurry.file/trunk: .
	src/hurry/file/browser
Message-ID: <20061023160133.8E84A10070@code0.codespeak.net>

Author: faassen
Date: Mon Oct 23 18:01:32 2006
New Revision: 33610

Modified:
   z3/hurry.file/trunk/CHANGES.txt
   z3/hurry.file/trunk/setup.py
   z3/hurry.file/trunk/src/hurry/file/browser/widget.py
Log:
Prepare for version 0.9.3.


Modified: z3/hurry.file/trunk/CHANGES.txt
==============================================================================
--- z3/hurry.file/trunk/CHANGES.txt	(original)
+++ z3/hurry.file/trunk/CHANGES.txt	Mon Oct 23 18:01:32 2006
@@ -1,6 +1,12 @@
 hurry.file changes
 ==================
 
+0.9.3 (2006-10-23)
+------------------
+
+* Send tramline_ok header back when redisplaying widget, in case we're
+  working with tramline.
+
 0.9.2 (2006-09-28)
 ------------------
 

Modified: z3/hurry.file/trunk/setup.py
==============================================================================
--- z3/hurry.file/trunk/setup.py	(original)
+++ z3/hurry.file/trunk/setup.py	Mon Oct 23 18:01:32 2006
@@ -2,7 +2,7 @@
 
 setup(
     name="hurry.file",
-    version="0.9.2",
+    version="0.9.3",
     packages=find_packages('src'),
     
     package_dir= {'':'src'},

Modified: z3/hurry.file/trunk/src/hurry/file/browser/widget.py
==============================================================================
--- z3/hurry.file/trunk/src/hurry/file/browser/widget.py	(original)
+++ z3/hurry.file/trunk/src/hurry/file/browser/widget.py	Mon Oct 23 18:01:32 2006
@@ -76,6 +76,8 @@
             
         # if there was data in the input, pass along the data id
         if file_id is not None:
+            # tell tramline to store this file (if tramline is in use)
+            self.request.response.addHeader('tramline_ok', 'OK')
             if value:
                 result += ' (%s)' % value.filename 
             result += renderElement(

From faassen at codespeak.net  Mon Oct 23 18:02:09 2006
From: faassen at codespeak.net (faassen at codespeak.net)
Date: Mon, 23 Oct 2006 18:02:09 +0200 (CEST)
Subject: [z3-checkins] r33611 - z3/hurry.file/tag/0.9.3
Message-ID: <20061023160209.3656810070@code0.codespeak.net>

Author: faassen
Date: Mon Oct 23 18:02:08 2006
New Revision: 33611

Added:
   z3/hurry.file/tag/0.9.3/
      - copied from r33610, z3/hurry.file/trunk/
Log:
0.9.3 release tag.


From ltucker at codespeak.net  Mon Oct 23 20:56:28 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 23 Oct 2006 20:56:28 +0200 (CEST)
Subject: [z3-checkins] r33616 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061023185628.BA7B210063@code0.codespeak.net>

Author: ltucker
Date: Mon Oct 23 20:56:26 2006
New Revision: 33616

Modified:
   z3/deliverance/branches/packaged/deliverance/utils.py
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
added rudimentary error page and exception handling for certain errors like bad / missing rules or theme

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Mon Oct 23 20:56:26 2006
@@ -10,12 +10,36 @@
     warnings.warn(
         'Deliverance requires the CVS HEAD version of libxml2')
 
-class RuleSyntaxError(Exception):
+class DeliveranceError(Exception):
+    """
+    General Deliverance Error.
+    """    
+
+class RuleSyntaxError(DeliveranceError):
     """
     Raised when an invalid or unknown rule is encountered by a renderer 
     during rule processing 
     """
 
+DELIVERANCE_ERROR_PAGE = """
+<html>
+<head>
+  <title>Deliverance Error</title>
+</head>
+<body>
+  <H3>Deliverance Error</H3>
+  <p>An error occurred processing the request<BR>
+  <pre>
+    %s
+  </pre>
+  <p>Stack Trace:
+  <pre>
+    %s
+  </pre>
+</body>
+</html>
+"""
+
 
 class RendererBase(object):
     """

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Mon Oct 23 20:56:26 2006
@@ -16,12 +16,17 @@
 from interpreter import Renderer
 #from xslt import Renderer
 from htmlserialize import tostring
+from utils import DeliveranceError
+from utils import DELIVERANCE_ERROR_PAGE
 import sys 
 import datetime
 import threading
+import traceback
+from StringIO import StringIO
 
 DELIVERANCE_BASE_URL = 'deliverance.base-url'
 
+
 class DeliveranceMiddleware(object):
 
     def __init__(self, app, theme_uri, rule_uri):
@@ -58,10 +63,26 @@
             elif encoding:
                 return text.decode(encoding)
 
+        try:
+            parsedTheme = parseHTML(theme)
+        except Exception, message:
+            newmessage = "Unable to parse theme page (" + self.theme_uri + ")"
+            if message:
+                newmessage += ":" + str(message)
+            raise DeliveranceError(newmessage)
+
+        try:
+            parsedRule = etree.XML(rule)
+        except Exception, message:
+            newmessage = "Unable to parse rules (" + self.rule_uri + ")"
+            if message:
+                newmessage += ":" + str(message)
+            raise DeliveranceError(newmessage)
+
         return Renderer(
-            theme=parseHTML(theme),
+            theme=parsedTheme,
             theme_uri=full_theme_uri,
-            rule=etree.XML(rule), 
+            rule=parsedRule, 
             rule_uri=self.rule_uri,
             reference_resolver=reference_resolver)
 
@@ -70,35 +91,62 @@
         return self._cache_time + self._timeout < datetime.datetime.now()
 
     def rule(self, environ):
-        return self.get_resource(environ,self.rule_uri)
+        try:
+            return self.get_resource(environ,self.rule_uri)
+        except Exception, message:
+            newmessage = "Unable to retrieve rules from " + self.rule_uri 
+            if message:
+                newmessage += ": " + str(message)
+
+            raise DeliveranceError(newmessage)
 
     def theme(self, environ):
-        return self.get_resource(environ,self.theme_uri)
+        try:
+            return self.get_resource(environ,self.theme_uri)
+        except Exception, message:
+            newmessage = "Unable to retrieve theme page from " + self.theme_uri 
+            if message:
+                newmessage += ": " + str(message)
+            raise DeliveranceError(newmessage)
+
 
     def __call__(self, environ, start_response):
-        qs = environ.get('QUERY_STRING', '')
-        environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False, with_query_string=False)
-        notheme = 'notheme' in qs
-        if notheme:
-            return self.app(environ, start_response)
-        if 'HTTP_ACCEPT_ENCODING' in environ:
-            del environ['HTTP_ACCEPT_ENCODING']
-
-        status, headers, body = intercept_output(
-            environ, self.app,
-            self.should_intercept,
-            start_response)
-
-
-        if status is None:
-            # should_intercept returned False
-            return body
-
-        body = self.filter_body(environ, body)
-        replace_header(headers, 'content-length', str(len(body)))
-        replace_header(headers, 'content-type', 'text/html; charset=utf-8')
-        start_response(status, headers)
-        return [body]
+        try:
+            qs = environ.get('QUERY_STRING', '')
+            environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False, with_query_string=False)
+            notheme = 'notheme' in qs
+            if notheme:
+                return self.app(environ, start_response)
+            if 'HTTP_ACCEPT_ENCODING' in environ:
+                del environ['HTTP_ACCEPT_ENCODING']
+
+            status, headers, body = intercept_output(
+                environ, self.app,
+                self.should_intercept,
+                start_response)
+
+
+            if status is None:
+                # should_intercept returned False
+                return body
+
+            body = self.filter_body(environ, body)
+            replace_header(headers, 'content-length', str(len(body)))
+            replace_header(headers, 'content-type', 'text/html; charset=utf-8')
+            start_response(status, headers)
+            return [body]
+        
+        except DeliveranceError, message:            
+            stack = StringIO()
+            traceback.print_exception(sys.exc_info()[0],
+                                      sys.exc_info()[1],
+                                      sys.exc_info()[2],
+                                      file=stack)
+            status = "500 Internal Server Error"
+            headers = [('Content-type','text/html')]
+            start_response(status,headers)
+            errpage = DELIVERANCE_ERROR_PAGE % (message,stack.getvalue())
+            return [ errpage ]
 
     def should_intercept(self, status, headers):
         type = header_value(headers, 'content-type')
@@ -150,7 +198,7 @@
                 loc = ' location=%r' % loc
             else:
                 loc = ''
-            raise Exception(
+            raise DeliveranceError(
                 "Request for internal resource at %s (%r) failed with status code %r%s"
                 % (construct_url(environ), path_info, status,
                    loc))

From ltucker at codespeak.net  Mon Oct 23 23:25:47 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 23 Oct 2006 23:25:47 +0200 (CEST)
Subject: [z3-checkins] r33620 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061023212547.6ED071006E@code0.codespeak.net>

Author: ltucker
Date: Mon Oct 23 23:25:45 2006
New Revision: 33620

Modified:
   z3/deliverance/branches/packaged/deliverance/utils.py
Log:
fix error when displaying errors on non ascii pages

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Mon Oct 23 23:25:45 2006
@@ -102,7 +102,7 @@
             textArea.attrib['readonly'] = 'readonly'
             textArea.text = ''
             for el in elts:
-                textArea.text += htmlserialize.tostring(el)
+                textArea.append(el)
             d.append(textArea)
         return d
 

From ltucker at codespeak.net  Tue Oct 24 00:37:18 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue, 24 Oct 2006 00:37:18 +0200 (CEST)
Subject: [z3-checkins] r33621 - z3/deliverance/branches/packaged
Message-ID: <20061023223718.4FC2E10076@code0.codespeak.net>

Author: ltucker
Date: Tue Oct 24 00:37:16 2006
New Revision: 33621

Modified:
   z3/deliverance/branches/packaged/setup.py
Log:
use paste 1.0

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Tue Oct 24 00:37:16 2006
@@ -19,10 +19,10 @@
       zip_safe=False,
       install_requires=[
         'lxml',
-        'paste==dev,>=0.9.9a',
-	'nose',
+        'paste',
 	'formencode',
 	'elementtree',
+	'nose',
 	'setuptools'
       ],
       include_package_data=True,

From ianb at codespeak.net  Tue Oct 24 19:25:13 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Tue, 24 Oct 2006 19:25:13 +0200 (CEST)
Subject: [z3-checkins] r33675 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061024172513.781C810063@code0.codespeak.net>

Author: ianb
Date: Tue Oct 24 19:25:11 2006
New Revision: 33675

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/utils.py
Log:
Style issue using len(); added new <drop> command for dropping elements from the theme or content.  Note: no tests yet.  Added better error message when xpath statements are bad (hasn't been applied everywhere it should be yet)

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Tue Oct 24 19:25:11 2006
@@ -52,6 +52,8 @@
             self.apply_copy(rule, theme, content)
         elif rule.tag == self.APPEND_OR_REPLACE_RULE_TAG:
             self.apply_append_or_replace(rule, theme, content)
+        elif rule.tag == self.DROP_RULE_TAG:
+            self.apply_drop(rule, theme, content)
         elif rule.tag == self.SUBRULES_TAG:
             self.apply_rules(rule, theme, content)
         elif rule.tag is etree.Comment:
@@ -261,14 +263,19 @@
         i = parent.index(non_text_els[0])
         parent[i+1:i+1] = non_text_els[1:]
         
+    def _xpath_copy(self, source, xpath):
+        try:
+            found_element = source.xpath(xpath)
+        except etree.XPathSyntaxError, e:
+            raise etree.XPathSyntaxError('%s (in expression %r)' % (e, xpath))
+        return copy.deepcopy(found_element)
 
     def apply_copy(self, rule, theme, content):
         theme_el = self.get_theme_el(rule,theme)
         if theme_el is None:
             return
 
-        content_els = copy.deepcopy(
-            content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+        content_els = self._xpath_copy(content, rule.attrib[self.RULE_CONTENT_KEY])
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -334,6 +341,13 @@
         theme_el.extend(content_els)
 
 
+    def apply_drop(self, rule, theme, content):
+        if 'theme' in rule.attrib:
+            for el in theme.xpath(rule.attrib['theme']):
+                el.getparent().remove(el)
+        if 'content' in rule.attrib:
+            for el in content.xpath(rule.attrib['content']):
+                el.getparent().remove(el)
 
     def elements_in(self, els):
         """

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Tue Oct 24 19:25:11 2006
@@ -59,6 +59,7 @@
     COPY_RULE_TAG              = "{http://www.plone.org/deliverance}copy"
     APPEND_OR_REPLACE_RULE_TAG = "{http://www.plone.org/deliverance}append-or-replace"
     SUBRULES_TAG               = "{http://www.plone.org/deliverance}rules"
+    DROP_RULE_TAG              = "{http://www.plone.org/deliverance}drop"
 
     RULE_CONTENT_KEY = "content"
     RULE_THEME_KEY   = "theme" 
@@ -154,7 +155,7 @@
         """
         base_uri = uri
         basetags = doc.xpath('//base[@href]')
-        if (len(basetags)):
+        if basetags:
             base_uri = basetags[0].attrib['href']
 
             for b in basetags:

From ianb at codespeak.net  Tue Oct 24 19:25:52 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Tue, 24 Oct 2006 19:25:52 +0200 (CEST)
Subject: [z3-checkins] r33676 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061024172552.5DA0710063@code0.codespeak.net>

Author: ianb
Date: Tue Oct 24 19:25:49 2006
New Revision: 33676

Added:
   z3/deliverance/branches/packaged/deliverance/fixuplinks.py   (contents, props changed)
   z3/deliverance/branches/packaged/deliverance/relocateresponse.py   (contents, props changed)
Modified:
   z3/deliverance/branches/packaged/deliverance/proxyapp.py
   z3/deliverance/branches/packaged/deliverance/proxycommand.py
Log:
Added code to log requests more verbosely in the proxy app/command.  Added some routines to fix up/translate links in a response, to help us proxy sites that don't want to be proxied

Added: z3/deliverance/branches/packaged/deliverance/fixuplinks.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/fixuplinks.py	Tue Oct 24 19:25:49 2006
@@ -0,0 +1,46 @@
+from htmlserialize import decodeAndParseHTML, tostring
+import re
+
+def fixup_text_links(doc, link_repl_func, remove_base_tags=True):
+    """
+    fixup_links(), but work on text and returns text
+    """
+    doc = decodeAndParseHTML(doc)
+    fixup_links(doc, link_repl_func, remove_base_tags=remove_base_tags)
+    return tostring(doc)
+
+def fixup_links(doc, link_repl_func,
+                remove_base_tags=True):
+    """
+    Takes a given document (already parsed by lxml) and modifies it
+    in-place.  Every link is passed through link_repl_func, and the
+    output of that function replaces the link.
+    """
+    if remove_base_tags:
+        remove_base_tags_from_document(doc)
+
+    for attrib in 'href', 'src':
+        els = doc.xpath('//*[@%s]' % attrib)
+        for el in els:
+            el.attrib[attrib] = link_repl_func(el.attrib[attrib])
+
+    fixup_css_links(doc, link_repl_func)
+
+def remove_base_tags_from_document(doc):
+    basetags = doc.xpath('//base[@href]')
+    for b in basetags:
+        b.getparent().remove(b)
+    
+CSS_URL_PAT = re.compile(r'url\((.*?)\)',re.I)
+def fixup_css_links(doc, link_repl_func):
+    """ 
+    prepends url(...) in css style elements to be 
+    absolute links based on base_uri
+    """
+    def absuri(matchobj):
+        return 'url(%s)' % link_repl_func(matchobj.group(1))
+    els = doc.xpath('//head/style')
+    for el in els:
+        if el.text:
+            el.text = re.sub(self.CSS_URL_PAT,absuri,el.text)
+

Modified: z3/deliverance/branches/packaged/deliverance/proxyapp.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/proxyapp.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/proxyapp.py	Tue Oct 24 19:25:49 2006
@@ -5,30 +5,71 @@
 
 from paste.proxy import TransparentProxy
 from deliverance import wsgifilter
+from deliverance.relocateresponse import RelocateMiddleware
 
 class ProxyDeliveranceApp(object):
 
     def __init__(self, theme_uri, rule_uri, proxy,
-                 transparent=False):
+                 transparent=False, debug_headers=False,
+                 relocate_content=False):
         self.theme_uri = theme_uri,
         self.rule_uri = rule_uri,
         self.proxy = proxy
         self.transparent = transparent
+        self.debug_headers = debug_headers
         self.subapp = self.make_app()
         self.deliverance_app = wsgifilter.DeliveranceMiddleware(
             self.subapp, theme_uri, rule_uri)
+        self.relocate_content = relocate_content
 
     def make_app(self):
         if self.transparent:
             force_host = self.proxy
         else:
             force_host = None
-        return TransparentProxy(force_host=force_host)
+        app = TransparentProxy(force_host=force_host)
+        if self.debug_headers:
+            app = DebugHeaders(app)
+        return app
 
     def __call__(self, environ, start_response):
+        if self.relocate_content:
+            reloc_app = RelocateMiddleware(self.run_subapp, old_href='http://'+self.proxy)
+            return reloc_app(environ, start_response)
+        else:
+            return self.run_subapp(environ, start_response)
+
+    def run_subapp(self, environ, start_response):
         if not self.transparent:
             # @@: Set forwarded header
             environ['HTTP_HOST'] = self.proxy
+            if ':' in self.proxy:
+                server, port = self.proxy.split(':', 1)
+            else:
+                server, port = self.proxy, '80'
+            environ['SERVER_NAME'] = server
+            environ['SERVER_PORT'] = port
         return self.deliverance_app(
             environ, start_response)
     
+
+class DebugHeaders(object):
+
+    def __init__(self, app):
+        self.app = app
+
+    def __call__(self, environ, start_response):
+        from paste.request import construct_url
+        print 'Incoming headers: (%s %s)' % (
+            environ['REQUEST_METHOD'], construct_url(environ))
+        for name, value in sorted(environ.items()):
+            if not name.startswith('HTTP_'):
+                continue
+            name = name[5:].replace('_', '-').title()
+            print '  %s: %s' % (name, value)
+        def repl_start_response(status, headers, exc_info=None):
+            print 'Outgoing headers: (%s)' % status
+            for name, value in headers:
+                print '  %s: %s' % (name.title(), value)
+            start_response(status, headers, exc_info)
+        return self.app(environ, repl_start_response)

Modified: z3/deliverance/branches/packaged/deliverance/proxycommand.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/proxycommand.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/proxycommand.py	Tue Oct 24 19:25:49 2006
@@ -18,10 +18,12 @@
 parser.add_option('-s', '--serve',
                   help="The interface to serve on (default 0.0.0.0:80)",
                   dest="serve",
+                  metavar="HOST",
                   default="0.0.0.0:80")
 parser.add_option('-p', '--proxy',
                   help="The host and port to proxy to (default localhost:8080)",
                   dest="proxy",
+                  metavar="PROXY_TO",
                   default='localhost:8080')
 parser.add_option('--theme',
                   help="The URI of the theme to use",
@@ -37,6 +39,15 @@
                   help="Show tracebacks when an error occurs (use twice for fancy/dangerous traceback)",
                   action="count",
                   dest="debug")
+parser.add_option('--request-log',
+                  help="Show an apache-style log of requests (use twice for more logging)",
+                  action="count",
+                  dest="request_log",
+                  default=0)
+parser.add_option('--rewrite',
+                  help="Rewrite all headers and links",
+                  action="store_true",
+                  dest="rewrite")
 
 def strip(prefix, string):
     if string.startswith(prefix):
@@ -61,11 +72,17 @@
             op = '--theme'
         print 'You must provide the %s option' % op
         sys.exit(2)
+    debug_headers = options.request_log > 1
     app = proxyapp.ProxyDeliveranceApp(
         theme_uri=options.theme,
         rule_uri=options.rule,
         proxy=proxy,
-        transparent=options.transparent)
+        transparent=options.transparent,
+        debug_headers=debug_headers,
+        relocate_content=options.rewrite)
+    if options.request_log:
+        from paste.translogger import TransLogger
+        app = TransLogger(app)
     if options.debug:
         if options.debug > 1:
             from paste.evalexception.middleware import EvalException

Added: z3/deliverance/branches/packaged/deliverance/relocateresponse.py
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/relocateresponse.py	Tue Oct 24 19:25:49 2006
@@ -0,0 +1,72 @@
+"""
+Takes a response (headers + content) and relocates it, changing domain
+names and paths.
+"""
+import fixuplinks
+import urlparse
+from paste.request import construct_url
+from paste.response import header_value
+
+def relocate_response(headers, content, base_href, old_href, new_href):
+    """
+    Takes headers and content, and replaces all instances of old_href
+    with new_href.  Returns (new_headers, new_content)
+    """
+    new_headers = relocate_headers(headers, base_href, old_href, new_href)
+    new_content = relocate_content(content, base_href, old_href, new_href)
+    return new_headers, new_content
+
+def relocate_headers(headers, base_href, old_href, new_href):
+    new_headers = []
+    for name, value in headers:
+        if name.lower() == 'location':
+            value = relocate_href(value, base_href, old_href, new_href)
+        new_headers.append((name, value))
+    return new_headers
+
+def relocate_content(content, base_href, old_href, new_href):
+    def sub_link(href):
+        return relocate_href(href, base_href, old_href, new_href)
+    return fixuplinks.fixup_text_links(content, sub_link)
+
+def relocate_href(href, base_href, old_href, new_href):
+    real_href = urlparse.urljoin(base_href, href)
+    if not real_href.startswith(old_href):
+        return href
+    return new_href + real_href[len(old_href):]
+
+class RelocateMiddleware(object):
+
+    def __init__(self, app, old_href):
+        self.app = app
+        if old_href.endswith(':80'):
+            old_href = old_href[:-3]
+        self.old_href = old_href
+
+    def __call__(self, environ, start_response):
+        new_href = construct_url(environ, path_info='')
+        base_href = construct_url(environ)
+        skipped = []
+        written = []
+        stat_headers = []
+        def repl_start_response(status, headers, exc_info=None):
+            headers = relocate_headers(headers, base_href, self.old_href, new_href)
+            content_type = header_value(headers, 'content-type')
+            if not content_type or not content_type.startswith('text/html'):
+                skipped.append(True)
+                return start_response(status, headers, exc_info)
+            stat_headers[:] = [status, headers]
+            return written.append
+        app_iter = self.app(environ, repl_start_response)
+        if skipped:
+            return app_iter
+        start_response(*stat_headers)
+        try:
+            for chunk in app_iter:
+                written.append(chunk)
+        finally:
+            if hasattr(app_iter, 'close'):
+                app_iter.close()
+        content = ''.join(written)
+        content = relocate_content(content, base_href, self.old_href, new_href)
+        return [content]

From jinty at codespeak.net  Tue Oct 24 19:25:58 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 19:25:58 +0200 (CEST)
Subject: [z3-checkins] r33677 - z3/sqlos/trunk
Message-ID: <20061024172558.1BA5810071@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 19:25:45 2006
New Revision: 33677

Modified:
   z3/sqlos/trunk/makefile
Log:
make sure a pythonpath is set.

Modified: z3/sqlos/trunk/makefile
==============================================================================
--- z3/sqlos/trunk/makefile	(original)
+++ z3/sqlos/trunk/makefile	Tue Oct 24 19:25:45 2006
@@ -64,4 +64,4 @@
 
 .PHONY: run-sampleapp
 run-sampleapp: develop Zope3/principals.zcml $(z3includes)/sqlos.ftesting-configure.zcml
-	cd Zope3; ./z3.py
+	cd Zope3; PYTHONPATH=src ./z3.py

From jinty at codespeak.net  Tue Oct 24 20:27:24 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 20:27:24 +0200 (CEST)
Subject: [z3-checkins] r33682 - z3/sqlos/trunk/src/sqlos/ftests
Message-ID: <20061024182724.8E64F10053@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 20:27:22 2006
New Revision: 33682

Modified:
   z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
Log:
merge from kobold-sqlos branch:

    ------------------------------------------------------------------------
    r31668 | kobold | 2006-08-26 09:19:00 +0200 (Sat, 26 Aug 2006) | 2 lines

    Small changes to ftests/localutilities.txt: without them, the functional test fails.



Modified: z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	Tue Oct 24 20:27:22 2006
@@ -63,19 +63,19 @@
 there is currently no support for local sites in testcode.
 
     >>> cursor = localUtility().cursor()
-    >>> cursor.execute(
+    >>> c = cursor.execute(
     ...         '''create table dog (
     ...                   id integer primary key,
     ...                   fullname varchar(50) not null,
     ...                   owner varchar(20) not null)''')
-    >>> cursor.execute(
+    >>> c = cursor.execute(
     ...         '''create table sample_isolated_person (
     ...                   id integer primary key,
     ...                   domains text,
     ...                   fullname varchar(50) not null,
     ...                   username varchar(20) not null,
     ...                   password varchar(20) not null)''')
-    >>> cursor.execute(
+    >>> c = cursor.execute(
     ...         '''create table sample_person (
     ...                       id integer primary key,
     ...                   fullname varchar(50),
@@ -114,6 +114,6 @@
 And now try to see if the person has been actually created in the localUtility:
 
     >>> cursor = localUtility().cursor()
-    >>> cursor.execute("""select * from sample_person""")
+    >>> c = cursor.execute("""select * from sample_person""")
     >>> cursor.fetchone()
     [1, u'Bob', u'bob', u'obo']

From jinty at codespeak.net  Tue Oct 24 20:39:12 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 20:39:12 +0200 (CEST)
Subject: [z3-checkins] r33683 - in z3/sqlos/trunk: Zope2/FiveSQLOS src/sqlos
	src/sqlos/ftests src/sqlos/testing
Message-ID: <20061024183912.4F53210053@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 20:39:07 2006
New Revision: 33683

Modified:
   z3/sqlos/trunk/Zope2/FiveSQLOS/README.txt
   z3/sqlos/trunk/Zope2/FiveSQLOS/dependencies-meta.zcml
   z3/sqlos/trunk/src/sqlos/adapter.py
   z3/sqlos/trunk/src/sqlos/connection.py
   z3/sqlos/trunk/src/sqlos/ftesting.zcml
   z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
   z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py
   z3/sqlos/trunk/src/sqlos/testing/testdb.py
Log:
zope.app.rdb -> zope.rdb

Modified: z3/sqlos/trunk/Zope2/FiveSQLOS/README.txt
==============================================================================
--- z3/sqlos/trunk/Zope2/FiveSQLOS/README.txt	(original)
+++ z3/sqlos/trunk/Zope2/FiveSQLOS/README.txt	Tue Oct 24 20:39:07 2006
@@ -34,10 +34,10 @@
     >>> from Products.Five import zcml
     >>> import sqlos
     >>> import Products.FiveSQLOS
-    >>> import zope.app.rdb
+    >>> import zope.rdb
     >>> zcml.load_config('configure.zcml', package=Products.Five)
     >>> zcml.load_config('meta.zcml', package=Products.FiveSQLOS)
-    >>> zcml.load_config('meta.zcml', package=zope.app.rdb)
+    >>> zcml.load_config('meta.zcml', package=zope.rdb)
     >>> zcml.load_config('meta.zcml', package=sqlos)
     >>> zcml.load_config('configure.zcml', package=Products.FiveSQLOS)
     >>> zcml.load_config('configure.zcml', package=sqlos)

Modified: z3/sqlos/trunk/Zope2/FiveSQLOS/dependencies-meta.zcml
==============================================================================
--- z3/sqlos/trunk/Zope2/FiveSQLOS/dependencies-meta.zcml	(original)
+++ z3/sqlos/trunk/Zope2/FiveSQLOS/dependencies-meta.zcml	Tue Oct 24 20:39:07 2006
@@ -12,7 +12,7 @@
   <include package="zope.app.component" file="meta.zcml"/>
   <include package="zope.app.security" file="meta.zcml"/>
   <include package="zope.app" file="menus.zcml"/>
-  <include package="zope.app.rdb" file="meta.zcml"/>
+  <include package="zope.rdb" file="meta.zcml"/>
   <include package="sqlos" file="meta.zcml"/>
 
   <!-- XXX - remove when we break compatibility with Five 1.3-->

Modified: z3/sqlos/trunk/src/sqlos/adapter.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/adapter.py	(original)
+++ z3/sqlos/trunk/src/sqlos/adapter.py	Tue Oct 24 20:39:07 2006
@@ -21,7 +21,7 @@
 from sqlobject import _mysql, _postgres, _sqlite
 from sqlobject.converters import registerConverter
 from sqlobject.mysql import mysqlconnection
-from zope.app.rdb.interfaces import DatabaseException
+from zope.rdb.interfaces import DatabaseException
 from zope.app.container.interfaces import INameChooser
 from zope.interface import implements
 
@@ -54,12 +54,12 @@
 
     def getConnection(self):
         # we override this because we really don't care about sqlobjects idea
-        # of threadsafe pool of db connections. zope.app.rdb takes care of
+        # of threadsafe pool of db connections. zope.rdb takes care of
         # that for us
         return self.makeConnection()
 
     def releaseConnection(self, conn, explicit=False):
-        # we simply lobotomize this method because zope.app.rdb
+        # we simply lobotomize this method because zope.rdb
         # takes care of all commits/rollbacks as well as all threading issues
         # with connections
         pass

Modified: z3/sqlos/trunk/src/sqlos/connection.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/connection.py	(original)
+++ z3/sqlos/trunk/src/sqlos/connection.py	Tue Oct 24 20:39:07 2006
@@ -25,7 +25,7 @@
 
 from zope.component import ComponentLookupError
 import zope.component
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
 from zope.thread import local
 
 from sqlos.interfaces import IZopeSQLConnection, IConnectionName
@@ -52,7 +52,7 @@
 
     This subscriber serves a dual purpose. Firstly it makes sure that local
     sites will work with the cache. Secondly it ensures that the cached
-    connections are not kept around forever, allowing zope.app.rdb to
+    connections are not kept around forever, allowing zope.rdb to
     recover from problems such as [1].
 
     Subscribed to BeforeTraverseEvent and EndTraverseEvent.

Modified: z3/sqlos/trunk/src/sqlos/ftesting.zcml
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftesting.zcml	(original)
+++ z3/sqlos/trunk/src/sqlos/ftesting.zcml	Tue Oct 24 20:39:07 2006
@@ -15,7 +15,7 @@
 
   <adapter
       provides=".interfaces.IZopeSQLConnection"
-      for="zope.app.rdb.interfaces.IZopeConnection"
+      for="zope.rdb.interfaces.IZopeConnection"
       permission="zope.Public"
       factory=".adapter.SQLiteAdapter"
       />

Modified: z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	Tue Oct 24 20:39:07 2006
@@ -30,7 +30,7 @@
 
 Now we set up a local database utility
 
-    >>> from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+    >>> from zope.rdb.interfaces import IZopeDatabaseAdapter
     >>> from zope.app.component.interfaces.registration import ActiveStatus
     >>> from sqlos.testing.testdb import SQLiteda
     >>> from zope.app.utility import UtilityRegistration

Modified: z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py	(original)
+++ z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py	Tue Oct 24 20:39:07 2006
@@ -17,7 +17,7 @@
 from transaction import get, begin
 from zope.app.testing.functional import BrowserTestCase
 import zope.component
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
 
 from sqlos.interfaces import IConnectionName
 from sqlos.testing.sampleperson import SamplePerson

Modified: z3/sqlos/trunk/src/sqlos/testing/testdb.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/testing/testdb.py	(original)
+++ z3/sqlos/trunk/src/sqlos/testing/testdb.py	Tue Oct 24 20:39:07 2006
@@ -18,7 +18,7 @@
 import urlparse
 
 import transaction
-from zope.app.rdb import ZopeDatabaseAdapter
+from zope.rdb import ZopeDatabaseAdapter
 
 from sqlos.adapter import SQLiteAdapter
 

From jinty at codespeak.net  Tue Oct 24 20:59:03 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 20:59:03 +0200 (CEST)
Subject: [z3-checkins] r33684 - z3/sqlos/trunk/src/sqlos/ftests
Message-ID: <20061024185903.E1CBC10053@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 20:59:00 2006
New Revision: 33684

Modified:
   z3/sqlos/trunk/src/sqlos/ftests/adding.txt
   z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
Log:
testbrowser warnings

Modified: z3/sqlos/trunk/src/sqlos/ftests/adding.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftests/adding.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/ftests/adding.txt	Tue Oct 24 20:59:00 2006
@@ -11,7 +11,7 @@
 
 Then get a browser:
 
-    >>> from zope.testbrowser import Browser
+    >>> from zope.testbrowser.testing import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
     >>> browser.handleErrors = False

Modified: z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	Tue Oct 24 20:59:00 2006
@@ -90,7 +90,7 @@
 
 So, get a testbrowser:
 
-    >>> from zope.testbrowser import Browser
+    >>> from zope.testbrowser.testing import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
     >>> browser.handleErrors = False

From jinty at codespeak.net  Tue Oct 24 21:00:53 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 21:00:53 +0200 (CEST)
Subject: [z3-checkins] r33685 - z3/sqlos/trunk/src/sqlos/interfaces
Message-ID: <20061024190053.EBC651005A@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 21:00:52 2006
New Revision: 33685

Modified:
   z3/sqlos/trunk/src/sqlos/interfaces/__init__.py
Log:
unused import

Modified: z3/sqlos/trunk/src/sqlos/interfaces/__init__.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/interfaces/__init__.py	(original)
+++ z3/sqlos/trunk/src/sqlos/interfaces/__init__.py	Tue Oct 24 21:00:52 2006
@@ -11,7 +11,6 @@
 """
 from zope.schema import TextLine
 from zope.interface import Interface, Attribute
-from zope.component import getService, ComponentLookupError
 from zope.interface import classImplements
 from zope.security.checker import NamesChecker, NoProxy, defineChecker
 from zope.schema.vocabulary import SimpleVocabulary

From jinty at codespeak.net  Tue Oct 24 21:05:07 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 21:05:07 +0200 (CEST)
Subject: [z3-checkins] r33686 - z3/sqlos/trunk/src/sqlos
Message-ID: <20061024190507.0C62D10034@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 21:05:04 2006
New Revision: 33686

Modified:
   z3/sqlos/trunk/src/sqlos/configure.zcml
   z3/sqlos/trunk/src/sqlos/ftesting.zcml
Log:
content -> class

Modified: z3/sqlos/trunk/src/sqlos/configure.zcml
==============================================================================
--- z3/sqlos/trunk/src/sqlos/configure.zcml	(original)
+++ z3/sqlos/trunk/src/sqlos/configure.zcml	Tue Oct 24 21:05:04 2006
@@ -5,7 +5,7 @@
 
   <!-- ISQLObjectContainer Views -->
 
-  <content class=".container.SQLObjectContainer">
+  <class class=".container.SQLObjectContainer">
 
     <implements interface="zope.app.container.interfaces.IContentContainer" />
 
@@ -29,7 +29,7 @@
         attributes="select"
         />
 
-  </content>
+  </class>
 
   <adapter
       provides="zope.app.container.interfaces.INameChooser"

Modified: z3/sqlos/trunk/src/sqlos/ftesting.zcml
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftesting.zcml	(original)
+++ z3/sqlos/trunk/src/sqlos/ftesting.zcml	Tue Oct 24 21:05:04 2006
@@ -67,7 +67,7 @@
       description="A Sample Person"
       />
 
-  <content class=".testing.sampleperson.SamplePerson">
+  <class class=".testing.sampleperson.SamplePerson">
     <!-- The followinf factory directive is actually uneccessary and
          probably a bad idea as sqlos:factory with register the factory.
          It is included here as a decoy to be sure that sqlos still functions
@@ -87,7 +87,7 @@
         permission="zope.View"
         interface="sqlos.interfaces.ISQLObject"
         />
-  </content>
+  </class>
 
   <browser:addform
       schema="sqlos.testing.sampleperson.IPerson"
@@ -133,7 +133,7 @@
     <browser:page name="action.html" attribute="action"/>
   </browser:view>
 
-  <content class="sqlos.testing.sampleperson.MultiContainer">
+  <class class="sqlos.testing.sampleperson.MultiContainer">
     <factory
         id="sqlos.testing.sampleperson.MultiContainer"
         title="SQLObject Multi Container (Dogs and people)"
@@ -151,7 +151,7 @@
         permission="zope.View"
         attributes="select"
         />
-  </content>
+  </class>
 
   <browser:addMenuItem
       class="sqlos.testing.sampleperson.MultiContainer"

From jinty at codespeak.net  Tue Oct 24 21:14:04 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 21:14:04 +0200 (CEST)
Subject: [z3-checkins] r33687 - in z3/sqlos/trunk/src/sqlos: . interfaces
Message-ID: <20061024191404.6940B10034@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 21:14:00 2006
New Revision: 33687

Modified:
   z3/sqlos/trunk/src/sqlos/README.txt
   z3/sqlos/trunk/src/sqlos/container.py
   z3/sqlos/trunk/src/sqlos/interfaces/__init__.py
   z3/sqlos/trunk/src/sqlos/interfaces/container.py
Log:
more zope.app deprecation and a stray content directive.

Modified: z3/sqlos/trunk/src/sqlos/README.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/README.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/README.txt	Tue Oct 24 21:14:00 2006
@@ -361,7 +361,7 @@
 
 Finally, write the ZCML configuration to put all the pieces together::
 
-  <content class="myproject.PersonContainer">
+  <class class="myproject.PersonContainer">
 
     <implements interface="zope.app.container.interfaces.IContentContainer" />
 
@@ -422,7 +422,7 @@
 
 The code is as follows::
 
-    >>> from zope.app.dublincore.interfaces import IZopeDublinCore
+    >>> from zope.dublincore.interfaces import IZopeDublinCore
 
     >>> class PersonDublinCore(object):
     ...     """An adapter providing DublinCore metadata for IPerson objects"""
@@ -441,7 +441,7 @@
 
 
       <adapter
-          provides="zope.app.dublincore.interfaces.IZopeDublinCore"
+          provides="zope.dublincore.interfaces.IZopeDublinCore"
           for="myproject.interfaces.IPerson"
           factory="myproject.PersonDublinCore"
           trusted="true"

Modified: z3/sqlos/trunk/src/sqlos/container.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/container.py	(original)
+++ z3/sqlos/trunk/src/sqlos/container.py	Tue Oct 24 21:14:00 2006
@@ -23,9 +23,9 @@
 from zope.app.container.contained import Contained
 from zope.app.container.contained import NameChooser
 from zope.app.container.constraints import checkFactory
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
 from zope.proxy import sameProxiedObjects
-from zope.app.exception.interfaces import UserError
+from zope.exceptions.interfaces import UserError
 
 from sqlos.interfaces import ISQLObject, ISQLObjectIsolated, IISQLObject
 from sqlos.interfaces.container import ISQLObjectContainer

Modified: z3/sqlos/trunk/src/sqlos/interfaces/__init__.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/interfaces/__init__.py	(original)
+++ z3/sqlos/trunk/src/sqlos/interfaces/__init__.py	Tue Oct 24 21:14:00 2006
@@ -15,7 +15,7 @@
 from zope.security.checker import NamesChecker, NoProxy, defineChecker
 from zope.schema.vocabulary import SimpleVocabulary
 from zope.schema import Choice, List
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from sqlobject import NoDefault
 from sqlobject.dbconnection import DBConnection, DBAPI
 from sqlobject import _mysql, _postgres, _sybase

Modified: z3/sqlos/trunk/src/sqlos/interfaces/container.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/interfaces/container.py	(original)
+++ z3/sqlos/trunk/src/sqlos/interfaces/container.py	Tue Oct 24 21:14:00 2006
@@ -11,7 +11,7 @@
 """
 from zope.interface import Attribute
 from zope.app.container.constraints import ItemTypePrecondition
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.interfaces import IContainerNamesContainer
 from zope.app.container.interfaces import IReadContainer, IContainer
 

From jinty at codespeak.net  Tue Oct 24 21:44:14 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 21:44:14 +0200 (CEST)
Subject: [z3-checkins] r33695 - z3/sqlos/trunk/src/sqlos/ftests
Message-ID: <20061024194414.0FEEA10070@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 21:44:10 2006
New Revision: 33695

Modified:
   z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
Log:
update to new component API

Modified: z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	Tue Oct 24 21:44:10 2006
@@ -7,7 +7,8 @@
 
 First we need to set up some folder structure to set up a site.
 
-    >>> from zope.app import zapi
+    >>> import zope.component
+    >>> import zope.traversing.api
     >>> from zope.app.folder import Folder
     >>> from zope.app.component import interfaces as componentInterfaces
     >>> from zope.app.component.site import LocalSiteManager
@@ -26,26 +27,19 @@
 Let's get the connection name:
 
     >>> from sqlos.interfaces import IConnectionName
-    >>> connection_name = zapi.getUtility(IConnectionName).name
+    >>> connection_name = zope.component.getUtility(IConnectionName).name
 
 Now we set up a local database utility
 
     >>> from zope.rdb.interfaces import IZopeDatabaseAdapter
-    >>> from zope.app.component.interfaces.registration import ActiveStatus
     >>> from sqlos.testing.testdb import SQLiteda
-    >>> from zope.app.utility import UtilityRegistration
 
     >>> dbAdapter = SQLiteda(u'dbi://:memory:')
-    >>> reg = UtilityRegistration(connection_name,
-    ...                           IZopeDatabaseAdapter,
-    ...                           dbAdapter)
-    >>> default = sm['default']
-    >>> key = default.registrationManager.addRegistration(reg)
-    >>> zapi.traverse(default.registrationManager, key).status = ActiveStatus
+    >>> sm.registerUtility(dbAdapter, provided=IZopeDatabaseAdapter, name=connection_name)
 
     >>> localUtility = sm.queryUtility(IZopeDatabaseAdapter, connection_name)
-    >>> localUtility
-    <sqlos.testing.testdb.SQLiteda object at ...>
+    >>> localUtility is dbAdapter
+    True
 
     >>> localUtility is dbAdapter
     True
@@ -54,7 +48,7 @@
 make sure that our localUtility is not identical to the global sqlite utility
 that has been registered through ftesting.zcml.
 
-    >>> gsm = zapi.getGlobalSiteManager()
+    >>> gsm = zope.component.getGlobalSiteManager()
     >>> globalUtility = gsm.queryUtility(IZopeDatabaseAdapter, connection_name)
     >>> globalUtility is not localUtility
     True

From jinty at codespeak.net  Tue Oct 24 21:50:00 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 21:50:00 +0200 (CEST)
Subject: [z3-checkins] r33696 - in z3/sqlos/trunk: doc src/sqlos
Message-ID: <20061024195000.B0D6710076@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 21:49:58 2006
New Revision: 33696

Modified:
   z3/sqlos/trunk/doc/HowToMakeARealease.rst
   z3/sqlos/trunk/src/sqlos/README.txt
Log:
Update docs for release.

Modified: z3/sqlos/trunk/doc/HowToMakeARealease.rst
==============================================================================
--- z3/sqlos/trunk/doc/HowToMakeARealease.rst	(original)
+++ z3/sqlos/trunk/doc/HowToMakeARealease.rst	Tue Oct 24 21:49:58 2006
@@ -11,7 +11,7 @@
 -----------------------------
 
 Update the documents in the source:
-    1. trunk/src/sqlos/README.txt - Th compatibility matrix.
+    1. trunk/src/sqlos/README.txt - The compatibility matrix.
 
 
 Step 2 - Make a maintenance branch for the release

Modified: z3/sqlos/trunk/src/sqlos/README.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/README.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/README.txt	Tue Oct 24 21:49:58 2006
@@ -45,13 +45,18 @@
 The following table shows which sqlos version can and should be used
 with which Zope 2 and Zope 3 versions.
 
-============ ========
-.            Zope 2.9
------------- --------
-.            Zope 3.2
-============ ========
-sqlos 0.2.x     X
-============ ========
+============ ======== =========
+.            Zope 2.9 Zope 2.10
+------------ -------- ---------
+.            Zope 3.2 Zope 3.3
+============ ======== =========
+sqlos 0.2.x     X        D
+------------ -------- ---------
+sqlos 0.3.x              X
+============ ======== =========
+
+* X = Runs, all tests pass, no deprecation warnings.
+* D = Runs, trivial tests fail, deprecation warnings.
 
 .. _FiveSQLOS: http://codespeak.net/svn/z3/sqlos/trunk/Zope2/FiveSQLOS/
 

From jinty at codespeak.net  Tue Oct 24 21:50:45 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 21:50:45 +0200 (CEST)
Subject: [z3-checkins] r33697 - z3/sqlos/branch/0.3.x
Message-ID: <20061024195045.7258F10077@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 21:50:42 2006
New Revision: 33697

Added:
   z3/sqlos/branch/0.3.x/
      - copied from r33696, z3/sqlos/trunk/
Log:
Make a release branch

From jinty at codespeak.net  Tue Oct 24 21:53:38 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 21:53:38 +0200 (CEST)
Subject: [z3-checkins] r33698 - z3/sqlos/branch/0.3.x
Message-ID: <20061024195338.05AE410077@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 21:53:33 2006
New Revision: 33698

Removed:
   z3/sqlos/branch/0.3.x/setup.cfg
Modified:
   z3/sqlos/branch/0.3.x/makefile
   z3/sqlos/branch/0.3.x/setup.py
Log:
Update version info

Modified: z3/sqlos/branch/0.3.x/makefile
==============================================================================
--- z3/sqlos/branch/0.3.x/makefile	(original)
+++ z3/sqlos/branch/0.3.x/makefile	Tue Oct 24 21:53:33 2006
@@ -4,7 +4,7 @@
 ZH=${HERE}/../../
 PYTHON=python2.4
 z3includes=Zope3/zopeskel/etc/package-includes
-Z3BRANCH=trunk
+Z3BRANCH=branches/3.3
 
 all : test clean
 

Deleted: /z3/sqlos/branch/0.3.x/setup.cfg
==============================================================================
--- /z3/sqlos/branch/0.3.x/setup.cfg	Tue Oct 24 21:53:33 2006
+++ (empty file)
@@ -1,3 +0,0 @@
-[egg_info]
-tag_build = .svn
-tag_svn_revision = 1

Modified: z3/sqlos/branch/0.3.x/setup.py
==============================================================================
--- z3/sqlos/branch/0.3.x/setup.py	(original)
+++ z3/sqlos/branch/0.3.x/setup.py	Tue Oct 24 21:53:33 2006
@@ -9,7 +9,7 @@
 fiddly details that always seem to take a lot of time. 
 """,
     url='http://codespeak.net/z3/sqlos/',
-    version="0.3",
+    version="0.3.0",
     license="ZPL",
     maintainer="SQLOS development team",
     maintainer_email="z3-sqlos at codespeak.net",

From jinty at codespeak.net  Tue Oct 24 21:54:27 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 21:54:27 +0200 (CEST)
Subject: [z3-checkins] r33699 - z3/sqlos/tag/0.3.0
Message-ID: <20061024195427.ED8D810078@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 21:54:25 2006
New Revision: 33699

Added:
   z3/sqlos/tag/0.3.0/
      - copied from r33698, z3/sqlos/branch/0.3.x/
Log:
Tag release

From jinty at codespeak.net  Tue Oct 24 22:06:29 2006
From: jinty at codespeak.net (jinty at codespeak.net)
Date: Tue, 24 Oct 2006 22:06:29 +0200 (CEST)
Subject: [z3-checkins] r33700 - z3/www/trunk
Message-ID: <20061024200629.845B71006C@code0.codespeak.net>

Author: jinty
Date: Tue Oct 24 22:06:27 2006
New Revision: 33700

Modified:
   z3/www/trunk/mkwebsite.py
Log:
Clean up a little.

Modified: z3/www/trunk/mkwebsite.py
==============================================================================
--- z3/www/trunk/mkwebsite.py	(original)
+++ z3/www/trunk/mkwebsite.py	Tue Oct 24 22:06:27 2006
@@ -233,16 +233,11 @@
     quick_links = [
         ('Mailing List', '/mailman/listinfo/z3-sqlos'),
         ('Latest Releases', 'http://cheeseshop.python.org/pypi/sqlos/'),
-        ('sqlos 0.1 release (compatible with SQLObject 0.6)',
-         'release/sqlos-0.1.tgz'),
         ('svn (the code)',
          'http://codespeak.net/svn/z3/sqlos'),
 	('sip (example application)',
 	 'http://sampleinventory.sf.net'),
         ]
-    site.registerReleases([
-            Z3ReleaseResource('sqlos', 'http://codespeak.net/svn/z3/sqlos/tag/sqlos-0.1'),
-	], project.getName())
     site.registerPages(
         [
         Z3Page('sqlos/trunk/src/sqlos', 'README.txt', 'index'),

From faassen at codespeak.net  Wed Oct 25 11:11:31 2006
From: faassen at codespeak.net (faassen at codespeak.net)
Date: Wed, 25 Oct 2006 11:11:31 +0200 (CEST)
Subject: [z3-checkins] r33710 - in z3/hurry.file/trunk: . src/hurry/file
	src/hurry/file/browser
Message-ID: <20061025091131.1460F10053@code0.codespeak.net>

Author: faassen
Date: Wed Oct 25 11:11:28 2006
New Revision: 33710

Added:
   z3/hurry.file/trunk/src/hurry/file/tests.py
Modified:
   z3/hurry.file/trunk/CHANGES.txt
   z3/hurry.file/trunk/setup.py
   z3/hurry.file/trunk/src/hurry/file/README.txt
   z3/hurry.file/trunk/src/hurry/file/__init__.py
   z3/hurry.file/trunk/src/hurry/file/browser/tests.py
   z3/hurry.file/trunk/src/hurry/file/configure.zcml
   z3/hurry.file/trunk/src/hurry/file/file.py
   z3/hurry.file/trunk/src/hurry/file/interfaces.py
Log:
Add tramline support through the IFileRetrieval interface.


Modified: z3/hurry.file/trunk/CHANGES.txt
==============================================================================
--- z3/hurry.file/trunk/CHANGES.txt	(original)
+++ z3/hurry.file/trunk/CHANGES.txt	Wed Oct 25 11:11:28 2006
@@ -1,6 +1,21 @@
 hurry.file changes
 ==================
 
+1.0 (2006-10-25)
+----------------
+
+* Support for Tramline (fast file uploads/downloads) through
+  IFileRetrieval. By default, nothing changes.
+
+  If a subclass of TramlineFileRetrievalBase is registered as a
+  IFileRetrieval utility, hurry.file becomes Tramline aware. If files
+  are created manually, they can be created through the
+  createHurryFile function, or the 'createFile' method of the
+  IFileRetrieval service. This will take care of storing the file in
+  the right place.
+
+  Tramline can be found here: http://codespeak.net/svn/rr/tramline/trunk
+
 0.9.3 (2006-10-23)
 ------------------
 

Modified: z3/hurry.file/trunk/setup.py
==============================================================================
--- z3/hurry.file/trunk/setup.py	(original)
+++ z3/hurry.file/trunk/setup.py	Wed Oct 25 11:11:28 2006
@@ -2,7 +2,7 @@
 
 setup(
     name="hurry.file",
-    version="0.9.3",
+    version="1.0",
     packages=find_packages('src'),
     
     package_dir= {'':'src'},
@@ -18,7 +18,8 @@
     description="""\
 hurry.file is an advanced Zope 3 file widget which tries its best to behave
 like other widgets, even when the form is redisplayed due to a validation
-error.
+error. It also has built-in support for fast Apache-based file uploads
+and downloads through Tramline.
 """,
     license='BSD',
     keywords="zope zope3",

Modified: z3/hurry.file/trunk/src/hurry/file/README.txt
==============================================================================
--- z3/hurry.file/trunk/src/hurry/file/README.txt	(original)
+++ z3/hurry.file/trunk/src/hurry/file/README.txt	Wed Oct 25 11:11:28 2006
@@ -1,3 +1,124 @@
-File widgets that behave like text widgets.
+This document is about file storage. For information about the actual
+widgets, see also browser/file.txt
 
-For more information, see browser/file.txt
+The file widget is built on top of the HurryFile object::
+
+  >>> from hurry.file import HurryFile
+  >>> file = HurryFile('foo.txt', 'mydata')
+  >>> file.filename
+  'foo.txt'
+  >>> file.data
+  'mydata'
+  >>> f = file.file
+  >>> f.read()
+  'mydata'
+
+We can also create HurryFile objects from file-like objects::
+
+  >>> from StringIO import StringIO
+  >>> from zope import component
+  >>> from hurry.file.interfaces import IFileRetrieval
+  >>> fileretrieval = component.getUtility(IFileRetrieval)
+  >>> file = fileretrieval.createFile('bar.txt', StringIO('test data'))
+  >>> file.filename
+  'bar.txt'
+  >>> file.data
+  'test data'
+  >>> f = file.file
+  >>> f.read()
+  'test data'
+
+This does exactly the same, but may be easier to use::
+
+  >>> from hurry.file import createHurryFile
+  >>> file = createHurryFile('test2.txt', StringIO('another test file'))
+  >>> file.filename
+  'test2.txt'
+ 
+The HurryFile object normally stores the file data using ZODB
+persistence. Files can however also be stored by tramline.  If
+tramline is installed in Apache, the Tramline takes care of generating
+ids for files and storing the file on the filesystem directly. The ids
+are then passed as file data to be stored in the ZODB.
+
+Let's first enable tramline.
+
+The tramline directory structure is a directory with two subdirectories,
+one called 'repository' and the other called 'upload'::
+
+  >>> import tempfile, os
+  >>> dirpath = tempfile.mkdtemp()
+  >>> repositorypath = os.path.join(dirpath, 'repository')
+  >>> uploadpath = os.path.join(dirpath, 'upload')
+  >>> os.mkdir(repositorypath)
+  >>> os.mkdir(uploadpath)
+
+We create a TramlineFileRetrieval object knowing about this directory,
+and register it as a utility::
+
+  >>> from hurry.file.file import TramlineFileRetrievalBase
+  >>> class TramlineFileRetrieval(TramlineFileRetrievalBase):
+  ...    def getTramlinePath(self):
+  ...        return dirpath
+  >>> retrieval = TramlineFileRetrieval()
+  >>> component.provideUtility(retrieval, IFileRetrieval)
+
+Now let's store a file the way tramline would during upload::
+
+  >>> f = open(os.path.join(repositorypath, '1'), 'wb')
+  >>> f.write('test data')
+  >>> f.close()
+
+The file with the data '1' will now be created::
+
+  >>> file = HurryFile('foo.txt', '1')
+
+The data is now '1'::
+
+  >>> file.data
+  '1'
+
+Retrieving the file results in the real file::
+  
+  >>> f = file.file
+  >>> f.read()
+  'test data'
+
+It should be possible to create Hurry File objects that are stored in
+the directory structure directly::
+
+  >>> file = retrieval.createFile('test.txt', StringIO('my test data'))
+  >>> file.filename
+  'test.txt'
+
+We get an id for the data now::
+
+  >>> file.data != 'my test data'
+  True
+
+And we can retrieve the file itself::
+
+  >>> f = file.file
+  >>> f.read()
+  'my test data'
+
+Now let's disable tramline in our utility::
+
+  >>> class TramlineFileRetrieval(TramlineFileRetrievalBase):
+  ...     def getTramlinePath(self):
+  ...        return dirpath
+  ...     def isTramlineEnabled(self):
+  ...        return False
+  >>> component.provideUtility(TramlineFileRetrieval(), IFileRetrieval)
+
+We expect the same behavior as when tramline is not installed::
+
+  >>> file = HurryFile('foo.txt', 'data')
+  >>> f = file.file
+  >>> f.read()
+  'data'
+
+Clean up::
+
+  >>> import shutil
+  >>> shutil.rmtree(dirpath)

Modified: z3/hurry.file/trunk/src/hurry/file/__init__.py
==============================================================================
--- z3/hurry.file/trunk/src/hurry/file/__init__.py	(original)
+++ z3/hurry.file/trunk/src/hurry/file/__init__.py	Wed Oct 25 11:11:28 2006
@@ -1,2 +1,2 @@
 # this is a package
-from file import HurryFile
+from file import HurryFile, createHurryFile

Modified: z3/hurry.file/trunk/src/hurry/file/browser/tests.py
==============================================================================
--- z3/hurry.file/trunk/src/hurry/file/browser/tests.py	(original)
+++ z3/hurry.file/trunk/src/hurry/file/browser/tests.py	Wed Oct 25 11:11:28 2006
@@ -1,16 +1,22 @@
 import unittest
 
+from zope import component
 from zope.testing import doctest
 from zope.app.testing import placelesssetup
-        
-def workflowSetUp(doctest):
+from zope import component
+
+from hurry.file.file import IdFileRetrieval
+from hurry.file.interfaces import IFileRetrieval
+
+def fileSetUp(doctest):
     placelesssetup.setUp()
+    component.provideUtility(IdFileRetrieval(), IFileRetrieval)
     
 def test_suite():
     return unittest.TestSuite((
         doctest.DocFileSuite(
             'file.txt',
-            setUp=workflowSetUp, tearDown=placelesssetup.tearDown,
+            setUp=fileSetUp, tearDown=placelesssetup.tearDown,
             ),
         ))
 

Modified: z3/hurry.file/trunk/src/hurry/file/configure.zcml
==============================================================================
--- z3/hurry.file/trunk/src/hurry/file/configure.zcml	(original)
+++ z3/hurry.file/trunk/src/hurry/file/configure.zcml	Wed Oct 25 11:11:28 2006
@@ -2,6 +2,9 @@
   xmlns="http://namespaces.zope.org/zope"
   >
 
+  <utility provides=".interfaces.IFileRetrieval"
+           factory=".file.IdFileRetrieval" />
+
 <!-- the widget is not yet the default widget for FileUpload; use
    formlib's custom_widget system to use it. This may change -->
  

Modified: z3/hurry.file/trunk/src/hurry/file/file.py
==============================================================================
--- z3/hurry.file/trunk/src/hurry/file/file.py	(original)
+++ z3/hurry.file/trunk/src/hurry/file/file.py	Wed Oct 25 11:11:28 2006
@@ -1,7 +1,10 @@
+import sys, os, random, threading
 from StringIO import StringIO
 from persistent import Persistent
 from zope.interface import implements
 from hurry.file import interfaces
+from zope import component
+from zope.app.container.contained import Contained
 
 class HurryFile(Persistent):
     implements(interfaces.IHurryFile)
@@ -12,10 +15,11 @@
         self.headers = {}
         
     def _get_file(self):
-        return StringIO(self.data)
+        storage = component.getUtility(interfaces.IFileRetrieval)
+        return storage.getFile(self.data)
 
     file = property(_get_file)
-
+    
     def __eq__(self, other):
         try:
             return (self.filename == other.filename and
@@ -30,3 +34,74 @@
         except AttributeError:
             return True
 
+def createHurryFile(filename, f):
+    retrieval = component.getUtility(interfaces.IFileRetrieval)
+    return retrieval.createFile(filename, f)
+    
+class IdFileRetrieval(Persistent, Contained):
+    """Very basic implementation of FileRetrieval.
+
+    This implementation just returns a File object for the data.
+    """
+    implements(interfaces.IFileRetrieval)
+    
+    def getFile(self, data):
+        return StringIO(data)
+
+    def createFile(self, filename, f):
+        return HurryFile(filename, f.read())
+    
+class TramlineFileRetrievalBase(Persistent, Contained):
+    """File retrieval for tramline (base class).
+    """
+    implements(interfaces.IFileRetrieval)
+
+    def getTramlinePath(self):
+        raise NotImplementedError
+
+    def isTramlineEnabled(self):
+        return True
+    
+    def getFile(self, data):
+        # tramline is disabled, so give fall-back behavior for testing
+        # without tramline
+        if not self.isTramlineEnabled():
+            return StringIO(data)
+        # we need to retrieve the actual file from the filesystem
+        # it could be either a permanently stored file in the repository,
+        # or, if that isn't available, potentially a file in the upload
+        # directory
+        path = self.getTramlinePath()
+        if not path:
+            raise ValueError("No tramline path configured")
+        repository_path = os.path.join(path, 'repository', data)
+        try:
+            f = open(repository_path, 'rb')
+        except IOError:
+            upload_path = os.path.join(path, 'upload', data)
+            f = open(upload_path, 'rb')
+        return f
+
+    def createFile(self, filename, f):
+        repository_path = os.path.join(self.getTramlinePath(),
+                                       'repository')
+        # XXX try to make this thread-safe, but it's not 100% ZEO safe..
+        lock = threading.Lock()
+        lock.acquire()
+        try:
+            while True:
+                file_id = str(random.randrange(sys.maxint))
+                if os.path.exists(os.path.join(repository_path,
+                                               file_id)):
+                    continue # try again
+                break
+            path = os.path.join(repository_path, file_id)
+            of = open(path, 'wb')
+        finally:
+            lock.release()
+
+        # XXX this can be made more efficient
+        of.write(f.read())
+        of.close()
+        
+        return HurryFile(filename, file_id)

Modified: z3/hurry.file/trunk/src/hurry/file/interfaces.py
==============================================================================
--- z3/hurry.file/trunk/src/hurry/file/interfaces.py	(original)
+++ z3/hurry.file/trunk/src/hurry/file/interfaces.py	Wed Oct 25 11:11:28 2006
@@ -10,3 +10,12 @@
     data = Bytes(title=u'Data in file')
     file = Attribute('File-like object with data')
     headers = Attribute('Headers associated with file')
+
+class IFileRetrieval(Interface):
+    def getFile(data):
+        """Get a file object for file data.
+        """
+
+    def createFile(filename, f):
+        """Given a file object, create a HurryFile with that data in it.
+        """

Added: z3/hurry.file/trunk/src/hurry/file/tests.py
==============================================================================
--- (empty file)
+++ z3/hurry.file/trunk/src/hurry/file/tests.py	Wed Oct 25 11:11:28 2006
@@ -0,0 +1,24 @@
+import unittest
+
+from zope.testing import doctest
+from zope.app.testing import placelesssetup
+from zope import component
+
+from hurry.file.file import IdFileRetrieval
+from hurry.file.interfaces import IFileRetrieval
+
+def fileSetUp(doctest):
+    placelesssetup.setUp()
+    component.provideUtility(IdFileRetrieval(), IFileRetrieval)
+    
+def test_suite():
+    return unittest.TestSuite((
+        doctest.DocFileSuite(
+            'README.txt',
+            setUp=fileSetUp, tearDown=placelesssetup.tearDown,
+            ),
+        ))
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
+

From faassen at codespeak.net  Wed Oct 25 11:12:40 2006
From: faassen at codespeak.net (faassen at codespeak.net)
Date: Wed, 25 Oct 2006 11:12:40 +0200 (CEST)
Subject: [z3-checkins] r33711 - z3/hurry.file/tag/hurry.file-1.0
Message-ID: <20061025091240.B266D10053@code0.codespeak.net>

Author: faassen
Date: Wed Oct 25 11:12:39 2006
New Revision: 33711

Added:
   z3/hurry.file/tag/hurry.file-1.0/
      - copied from r33710, z3/hurry.file/trunk/
Log:
Tag for 1.0 release.


From ltucker at codespeak.net  Wed Oct 25 21:57:05 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 25 Oct 2006 21:57:05 +0200 (CEST)
Subject: [z3-checkins] r33739 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061025195705.A1B4810053@code0.codespeak.net>

Author: ltucker
Date: Wed Oct 25 21:57:02 2006
New Revision: 33739

Modified:
   z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
   z3/deliverance/branches/packaged/deliverance/utils.py
Log:
this seems to be a far less horrible change to cover error generation for non-ascii pages

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_append.xml	Wed Oct 25 21:57:02 2006
@@ -74,8 +74,7 @@
   </head>
   <body>
     <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;append theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
-&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
 </textarea></div>
     <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_appendorreplace.xml	Wed Oct 25 21:57:02 2006
@@ -125,8 +125,7 @@
      </head>
      <body>
        <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;append-or-replace theme=".//div" content=".//div"/&gt;
-	 <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div&gt;Dummy Content&lt;/div&gt;
-&lt;div&gt;Dummy Content&lt;/div&gt;
+	 <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div&gt;Dummy Content&lt;/div&gt;&lt;div&gt;Dummy Content&lt;/div&gt;
        </textarea></div>
        <div>Dummy Content</div>
        <div>Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_copy.xml	Wed Oct 25 21:57:02 2006
@@ -70,8 +70,7 @@
   </head>
   <body>
     <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;copy theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
-&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
 </textarea></div>
     <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_prepend.xml	Wed Oct 25 21:57:02 2006
@@ -74,8 +74,7 @@
   </head>
   <body>
     <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;prepend theme=".//div[@class='foo']" content=".//div[@id='bar']"/&gt;
-  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
-&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
 </textarea></div>
     <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	Wed Oct 25 21:57:02 2006
@@ -82,8 +82,7 @@
   </head>
   <body>
     <div class="deliverance-error">Deliverance error: multiple elements found in theme<br/>rule: &lt;replace theme="//div[@class='foo']" content="//div[@id='bar']"/&gt;
-  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
-&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
+  <br/><textarea rows="24" cols="80" readonly="readonly">&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;&lt;div class="foo"&gt;Dummy Content&lt;/div&gt;
 </textarea></div>
     <div class="foo">Dummy Content</div>
     <div class="foo">Dummy Content</div>

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Wed Oct 25 21:57:02 2006
@@ -103,7 +103,7 @@
             textArea.attrib['readonly'] = 'readonly'
             textArea.text = ''
             for el in elts:
-                textArea.append(el)
+                textArea.text += etree.tostring(el)
             d.append(textArea)
         return d
 

From rmarianski at codespeak.net  Thu Oct 26 00:15:36 2006
From: rmarianski at codespeak.net (rmarianski at codespeak.net)
Date: Thu, 26 Oct 2006 00:15:36 +0200 (CEST)
Subject: [z3-checkins] r33744 -
	z3/deliverance/branches/packaged/deliverance/test-data
Message-ID: <20061025221536.4C33F10053@code0.codespeak.net>

Author: rmarianski
Date: Thu Oct 26 00:15:26 2006
New Revision: 33744

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
Log:
added tests for drop rule

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	Thu Oct 26 00:15:26 2006
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- drop a simple div tag in theme --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop theme="//div[@id='foo']"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div id="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body>Real Content</body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body></body></html>
+  </output> 
+</deliverance-test>
+
+<!-- drop 2 div tags in theme -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop theme="//div[@id='foo']"/>
+    <drop theme="//div[@id='bar']"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><body><div id="foo">foo</div><div id="bar">bar</div><div id="urn">urn</div></body></html>
+  </theme>
+
+  <content>
+     <html><body>Real Content</body></html>
+  </content>
+
+  <output>
+     <html><body><div id="urn">urn</div></body></html>
+  </output>
+</deliverance-test>
+
+<!-- drop element from content -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop content="//div[@id='foo']"/>
+    <copy theme=".//body" content="//body/child::node()"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><body><div id="urn"></div></body></html>
+  </theme>
+
+  <content>
+     <html>
+       <body>
+        <div id="foo">shouldn't appear</div>
+        <div id="bar">should appear</div>
+       </body>
+     </html>
+  </content>
+
+  <output>
+     <html><body><div id="bar">should appear</div></body></html>
+  </output>
+</deliverance-test>
+
+<!-- drop element from both theme and content -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop content="//div[@id='foo']"/>
+    <drop theme="//div[@id='bar']"/>
+    <copy theme=".//body" content="//body/child::node()"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html>
+       <body>
+        <div id="bar">disappear</div>
+       </body>
+     </html>
+  </theme>
+
+  <content>
+     <html>
+       <body>
+        <div id="foo">disappear</div>
+        <div id="urn">appear</div>
+       </body>
+     </html>
+  </content>
+
+  <output>
+     <html><body><div id="urn">appear</div></body></html>
+  </output>
+</deliverance-test>
+
+<!-- dropping a tag drops itself and all its children -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop theme="//div[@id='foo']"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html>
+       <body>
+        <div id="foo"><p>none</p><p>of these<b>should appear</b></p></div>
+       </body>
+     </html>
+  </theme>
+
+  <content>
+     <html><body>Real Content</body></html>
+  </content>
+
+  <output>
+     <html><body></body></html>
+  </output>
+</deliverance-test>
+
+<!-- dropping missing tag generates an error  -->
+<!-- XXX currently does not generate error, should it? -->
+<!--deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop theme="//div[@id='foo']"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><body>Dummy Content</body></html>
+  </theme>
+
+  <content>
+     <html><body>Real Content</body></html>
+  </content>
+
+  <output>
+     <html>
+       <body>
+         Dummy Content
+         <div class="deliverance-error">Deliverance error: no element found in theme<br/>rule: &lt;drop theme=".//div[@id='foo']"/&gt;
+         </div>
+       </body>
+     </html>
+  </output>
+</deliverance-test-->
+
+<!-- dropping a tag that doesn't exist and ignoring errors
+     should squash error messages -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop theme="//div[@id='foo']" nocontent='ignore'/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><body>Dummy Content</body></html>
+  </theme>
+
+  <content>
+     <html><body>Real Content</body></html>
+  </content>
+
+  <output>
+     <html><body>Dummy Content</body></html>
+  </output>
+</deliverance-test>
+
+</deliverance-test-suite>
+

From cabraham at codespeak.net  Thu Oct 26 23:32:59 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Thu, 26 Oct 2006 23:32:59 +0200 (CEST)
Subject: [z3-checkins] r33788 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061026213259.583BA10053@code0.codespeak.net>

Author: cabraham
Date: Thu Oct 26 23:32:56 2006
New Revision: 33788

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
Log:
errors for drop rules and debugging output

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Thu Oct 26 23:32:56 2006
@@ -342,12 +342,25 @@
 
 
     def apply_drop(self, rule, theme, content):
+
         if 'theme' in rule.attrib:
+            removed = False
             for el in theme.xpath(rule.attrib['theme']):
                 el.getparent().remove(el)
+                removed = True
+            if not removed and rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
+                self.add_to_body_start(
+                    theme, self.format_error("no element found in theme", rule))
+        
         if 'content' in rule.attrib:
+            removed = False
             for el in content.xpath(rule.attrib['content']):
                 el.getparent().remove(el)
+            if not removed and rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
+                self.add_to_body_start(
+                    theme, self.format_error("no element found in content", rule))
+
+                
 
     def elements_in(self, els):
         """

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	Thu Oct 26 23:32:56 2006
@@ -119,8 +119,7 @@
 </deliverance-test>
 
 <!-- dropping missing tag generates an error  -->
-<!-- XXX currently does not generate error, should it? -->
-<!--deliverance-test>
+<deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance">
     <drop theme="//div[@id='foo']"/>
   </rules>
@@ -137,12 +136,38 @@
      <html>
        <body>
          Dummy Content
-         <div class="deliverance-error">Deliverance error: no element found in theme<br/>rule: &lt;drop theme=".//div[@id='foo']"/&gt;
+         <div class="deliverance-error">Deliverance error: no element found in theme<br/>rule: &lt;drop theme="//div[@id='foo']"/&gt;
          </div>
        </body>
      </html>
   </output>
-</deliverance-test-->
+</deliverance-test>
+
+<!-- dropping missing tag in the content generates an error  -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop content="//div[@id='foo']"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><body>Dummy Content</body></html>
+  </theme>
+
+  <content>
+     <html><body>Real Content</body></html>
+  </content>
+
+  <output>
+     <html>
+       <body>
+         Dummy Content
+         <div class="deliverance-error">Deliverance error: no element found in content<br/>rule: &lt;drop content="//div[@id='foo']"/&gt;
+         </div>
+       </body>
+     </html>
+  </output>
+</deliverance-test>
+
 
 <!-- dropping a tag that doesn't exist and ignoring errors
      should squash error messages -->

From rmarianski at codespeak.net  Fri Oct 27 00:58:48 2006
From: rmarianski at codespeak.net (rmarianski at codespeak.net)
Date: Fri, 27 Oct 2006 00:58:48 +0200 (CEST)
Subject: [z3-checkins] r33789 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061026225848.2EAA410068@code0.codespeak.net>

Author: rmarianski
Date: Fri Oct 27 00:58:38 2006
New Revision: 33789

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
Log:
removed duplication in apply_drop rule

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Fri Oct 27 00:58:38 2006
@@ -342,25 +342,16 @@
 
 
     def apply_drop(self, rule, theme, content):
-
-        if 'theme' in rule.attrib:
+        for context in ('theme', 'content'):
+            if context not in rule.attrib: continue
+            document = locals()[context]
             removed = False
-            for el in theme.xpath(rule.attrib['theme']):
+            for el in document.xpath(rule.attrib[context]):
                 el.getparent().remove(el)
                 removed = True
             if not removed and rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
                 self.add_to_body_start(
-                    theme, self.format_error("no element found in theme", rule))
-        
-        if 'content' in rule.attrib:
-            removed = False
-            for el in content.xpath(rule.attrib['content']):
-                el.getparent().remove(el)
-            if not removed and rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
-                self.add_to_body_start(
-                    theme, self.format_error("no element found in content", rule))
-
-                
+                    theme, self.format_error("no element found in %s" % context, rule))
 
     def elements_in(self, els):
         """

From cabraham at codespeak.net  Fri Oct 27 18:01:15 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Fri, 27 Oct 2006 18:01:15 +0200 (CEST)
Subject: [z3-checkins] r33820 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061027160115.24CD3100A8@code0.codespeak.net>

Author: cabraham
Date: Fri Oct 27 18:01:11 2006
New Revision: 33820

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
Log:
fixed tail handling in apply_drop; added failing tests for drop and replace

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Fri Oct 27 18:01:11 2006
@@ -347,6 +347,7 @@
             document = locals()[context]
             removed = False
             for el in document.xpath(rule.attrib[context]):
+                self.attach_text_to_previous(el, el.tail)
                 el.getparent().remove(el)
                 removed = True
             if not removed and rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	Fri Oct 27 18:01:11 2006
@@ -189,5 +189,43 @@
   </output>
 </deliverance-test>
 
+<!-- drop a div tag but maintain the tails  --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop theme="//div[@id='foo']"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body>before<div id="foo">Dummy Content</div>after</body></html>
+  </theme>
+
+  <content> 
+     <html><body>Real Content</body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body>beforeafter</body></html>
+  </output> 
+</deliverance-test>
+
+<!-- drop an element that is just text  --> 
+<!--<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop theme="//div[@id='foo']/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body>before<div id="foo">Dummy Content</div>after</body></html>
+  </theme>
+
+  <content> 
+     <html><body>Real Content</body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body>before<div id="foo"></div>after</body></html>
+  </output> 
+</deliverance-test>-->
+
 </deliverance-test-suite>
 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	Fri Oct 27 18:01:11 2006
@@ -211,6 +211,24 @@
   </output> 
 </deliverance-test>
 
+<!-- a test that replaces text with a mixture of elements and text -->
+<!-- <deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//div[@id='foo']/child::node()" content="//div[@id='bar']/child::node()" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><p>some text</p><div id="foo">Dummy Content</div>theme tail</body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content<p>a nice p tag</p>mid text<i>some i text</i>end tail</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><p>some text</p><div id="foo">Real Content<p>a nice p tag</p>mid text<i>some i text</i>end tail</div>theme tail</body></html>
+  </output> 
+</deliverance-test>-->
 
 </deliverance-test-suite>
 

From cabraham at codespeak.net  Fri Oct 27 21:27:41 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Fri, 27 Oct 2006 21:27:41 +0200 (CEST)
Subject: [z3-checkins] r33822 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061027192741.EE6A4100AA@code0.codespeak.net>

Author: cabraham
Date: Fri Oct 27 21:27:39 2006
New Revision: 33822

Modified:
   z3/deliverance/branches/packaged/deliverance/xslt.py
Log:
Added drop rule to xsl renderer

Modified: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xslt.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Fri Oct 27 21:27:39 2006
@@ -77,6 +77,8 @@
             self.apply_copy(rule,theme)
         elif rule.tag == self.APPEND_OR_REPLACE_RULE_TAG:
             self.apply_append_or_replace(rule,theme)
+        elif rule.tag == self.DROP_RULE_TAG:
+            self.apply_drop(rule,theme)
         elif rule.tag == self.SUBRULES_TAG:
             self.apply_rules(rule,theme)
         elif rule.tag is etree.Comment:
@@ -200,6 +202,42 @@
         self.debug_append(theme_el, copier, rule)
 
 
+    def apply_drop(self,rule,theme):
+        
+        if self.RULE_THEME_KEY in rule.attrib:
+            if len(theme.xpath(rule.attrib[self.RULE_THEME_KEY])) == 0:
+                if rule.get(self.NOCONTENT_KEY) == 'ignore':
+                    return 
+                else:
+                    e = self.format_error("no element found in theme", rule)
+                    self.add_to_body_start(theme, e)
+                    return 
+                    
+            for el in theme.xpath(rule.attrib[self.RULE_THEME_KEY]):
+                self.debug_drop(el,rule)
+                self.attach_text_to_previous(el, el.tail)
+                el.getparent().remove(el)
+
+
+
+#         if 'content' in rule.attrib:
+#             self.add_conditional_missing_content_error(theme,rule)
+
+            
+
+#         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
+#         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
+
+
+#         # if content is matched, replace the theme element, otherwise, keep the
+#         # theme element 
+#         choose = self.make_when_otherwise("count(%s)=0" % 
+#                                           rule.attrib[self.RULE_CONTENT_KEY], 
+#                                           copy.deepcopy(theme_el), 
+#                                           copier)
+
+
+
     def xsl_escape_comments(self,doc):
         """
         replaces comment nodes with xsl:comment nodes so they will 
@@ -281,6 +319,21 @@
             parent.insert(index, comment_before)
             parent.insert(index+2, comment_after)
 
+    def debug_drop(self, el, rule):
+        """
+        helper method for deleting a node, if debugging is enabled, 
+        comments are inserted referring to the 
+        rule that performed the drop  
+        """
+        if self.debug:
+            parent = el.getparent()
+            index = parent.index(el)
+            
+            comment_before,comment_after = self.make_debugging_comments(rule)
+
+            parent.insert(index, comment_before)
+            parent.insert(index+2, comment_after)
+
     def debug_prepend(self, parent, child, rule):
         """
         helper method for prepending a node, if debugging is enabled, 

From rmarianski at codespeak.net  Sat Oct 28 00:11:16 2006
From: rmarianski at codespeak.net (rmarianski at codespeak.net)
Date: Sat, 28 Oct 2006 00:11:16 +0200 (CEST)
Subject: [z3-checkins] r33825 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061027221116.23747100B0@code0.codespeak.net>

Author: rmarianski
Date: Sat Oct 28 00:11:11 2006
New Revision: 33825

Modified:
   z3/deliverance/branches/packaged/deliverance/proxyapp.py
   z3/deliverance/branches/packaged/deliverance/proxycommand.py
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
add ability to specify renderer on command line

Modified: z3/deliverance/branches/packaged/deliverance/proxyapp.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/proxyapp.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/proxyapp.py	Sat Oct 28 00:11:11 2006
@@ -11,7 +11,7 @@
 
     def __init__(self, theme_uri, rule_uri, proxy,
                  transparent=False, debug_headers=False,
-                 relocate_content=False):
+                 relocate_content=False, renderer='py'):
         self.theme_uri = theme_uri,
         self.rule_uri = rule_uri,
         self.proxy = proxy
@@ -19,7 +19,7 @@
         self.debug_headers = debug_headers
         self.subapp = self.make_app()
         self.deliverance_app = wsgifilter.DeliveranceMiddleware(
-            self.subapp, theme_uri, rule_uri)
+            self.subapp, theme_uri, rule_uri, renderer)
         self.relocate_content = relocate_content
 
     def make_app(self):

Modified: z3/deliverance/branches/packaged/deliverance/proxycommand.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/proxycommand.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/proxycommand.py	Sat Oct 28 00:11:11 2006
@@ -48,6 +48,9 @@
                   help="Rewrite all headers and links",
                   action="store_true",
                   dest="rewrite")
+parser.add_option('--renderer',
+                  help="Select which renderer to use: 'py' or 'xslt'",
+                  default='py')
 
 def strip(prefix, string):
     if string.startswith(prefix):

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Sat Oct 28 00:11:11 2006
@@ -13,7 +13,7 @@
 from paste.wsgilib import intercept_output
 from paste.request import construct_url
 from paste.response import header_value, replace_header
-from interpreter import Renderer
+#from interpreter import Renderer
 #from xslt import Renderer
 from htmlserialize import tostring
 from utils import DeliveranceError
@@ -29,7 +29,7 @@
 
 class DeliveranceMiddleware(object):
 
-    def __init__(self, app, theme_uri, rule_uri):
+    def __init__(self, app, theme_uri, rule_uri, renderer='py'):
         self.app = app
         self.theme_uri = theme_uri
         self.rule_uri = rule_uri
@@ -38,6 +38,14 @@
         self._timeout = datetime.timedelta(0,10)
         self._lock = threading.Lock()
 
+        if renderer == 'py':
+            import interpreter
+            self._rendererType = interpreter.Renderer
+        elif renderer == 'xslt':
+            import xslt
+            self._rendererType = xslt.Renderer
+        else:
+            raise ValueError("Unknown Renderer: %s - Expecting 'py' or 'xslt'" % renderer)
 
     def get_renderer(self,environ):
         try:
@@ -79,7 +87,7 @@
                 newmessage += ":" + str(message)
             raise DeliveranceError(newmessage)
 
-        return Renderer(
+        return self._rendererType(
             theme=parsedTheme,
             theme_uri=full_theme_uri,
             rule=parsedRule, 

From ltucker at codespeak.net  Mon Oct 30 18:24:25 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 30 Oct 2006 18:24:25 +0100 (CET)
Subject: [z3-checkins] r33919 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061030172425.A226A10086@code0.codespeak.net>

Author: ltucker
Date: Mon Oct 30 18:24:19 2006
New Revision: 33919

Modified:
   z3/deliverance/branches/packaged/deliverance/handtransform.py
Log:
update handtransformer to xinclude changes and changes to renderer init signature

Modified: z3/deliverance/branches/packaged/deliverance/handtransform.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/handtransform.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/handtransform.py	Mon Oct 30 18:24:19 2006
@@ -37,8 +37,6 @@
     content = etree.HTML(grab_url(content_url))
     
     def reference_resolver(href, parse, encoding=None):
-        if not href.startswith('/'):
-            href = os.path.join(os.path.dirname(rules_url),href)
         text = grab_url(href)
         if parse == "xml":
             return etree.XML(text)
@@ -47,9 +45,9 @@
 
     renderer = None
     if renderer_type == 'xslt':
-        renderer = XSLTRenderer(theme,base_url,rules,reference_resolver)
+        renderer = XSLTRenderer(theme,base_url,rules,rules_url,reference_resolver)
     elif renderer_type == 'py':
-        renderer = PythonRenderer(theme,base_url,rules,reference_resolver)
+        renderer = PythonRenderer(theme,base_url,rules,rules_url,reference_resolver)
     else:
         print "Unknown renderer type '" + renderer_type + "'"
         return etree.Element("error")

From cabraham at codespeak.net  Mon Oct 30 20:18:37 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon, 30 Oct 2006 20:18:37 +0100 (CET)
Subject: [z3-checkins] r33924 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061030191837.969C310068@code0.codespeak.net>

Author: cabraham
Date: Mon Oct 30 20:18:33 2006
New Revision: 33924

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
   z3/deliverance/branches/packaged/deliverance/xslt.py
Log:
added error message fired when trying to replace the whole theme.

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Mon Oct 30 20:18:33 2006
@@ -201,6 +201,12 @@
                     theme, self.format_error("no content matched", rule))            
             return       
 
+        if theme_el.getparent() is None:
+            self.add_to_body_start(
+                theme, self.format_error("cannot replace whole theme", rule))            
+            return
+            
+
         if self.debug:
             self.debug_replace(theme_el, content_els, rule)
             return 
@@ -226,10 +232,13 @@
         # this tail, if there is one, should stick around 
         preserve_tail = non_text_els[0].tail 
 
+        #replaces first element
         self.replace_element(theme_el, non_text_els[0])
         temptail = non_text_els[0].tail 
         non_text_els[0].tail = None
         parent = non_text_els[0].getparent()
+
+        # appends the rest of the elements
         i = parent.index(non_text_els[0])
         parent[i+1:i+1] = non_text_els[1:]
 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	Mon Oct 30 20:18:33 2006
@@ -211,6 +211,29 @@
   </output> 
 </deliverance-test>
 
+<!-- tests replace command on edge case: html element  --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <replace theme="//html" content="//html" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div id="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <html><body><div id="bar">Real Content</div></body></html>
+  </content>
+ 
+  <output>
+     <html><head><title>Blah</title></head><body><div class="deliverance-error">Deliverance error: cannot replace whole theme<br /> 
+        rule: &lt;replace theme="//html" content="//html"/&gt;</div><div id="foo">Dummy Content</div> 
+     </body></html>
+  </output> 
+
+</deliverance-test>
+
+
 <!-- a test that replaces text with a mixture of elements and text -->
 <!-- <deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance">

Modified: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xslt.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Mon Oct 30 20:18:33 2006
@@ -125,6 +125,11 @@
         if theme_el is None:
             return 
 
+        if theme_el.getparent() is None:
+            self.add_to_body_start(
+                theme, self.format_error("cannot replace whole theme", rule))            
+            return
+
         self.add_conditional_missing_content_error(theme,rule)      
 
         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])

From ltucker at codespeak.net  Mon Oct 30 20:26:05 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 30 Oct 2006 20:26:05 +0100 (CET)
Subject: [z3-checkins] r33925 -
	z3/deliverance/branches/packaged/deliverance/test-data/necoro
Message-ID: <20061030192605.E91B410068@code0.codespeak.net>

Author: ltucker
Date: Mon Oct 30 20:26:02 2006
New Revision: 33925

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/__init__.py
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.theme
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.xml
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/openplans.html
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/standardrules.xml
Log:
add beginnings of charset test

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/__init__.py
==============================================================================

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.theme
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.theme	Mon Oct 30 20:26:02 2006
@@ -0,0 +1,7 @@
+
+<!-- helper file for doing hand transforms with this theme --> 
+
+<blend 
+   theme="http://www.necoro.com/photo/index.html" 
+   baseurl="http://www.necoro.com/photo" 
+   rules="./test-data/necoro/necoro.xml" /> 

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.xml	Mon Oct 30 20:26:02 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+  <xi:include href="standardrules.xml" />
+
+  <replace theme="/html/body/table[1]/tr[2]/td/div" content="//*[@id='portal-columns']" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/openplans.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/openplans.html	Mon Oct 30 20:26:02 2006
@@ -0,0 +1,648 @@
+
+  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+
+
+
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en">
+
+<head>
+    <meta http-equiv="Content-Type"
+          content="text/html;charset=utf-8" />
+
+    <title>
+        NYCSR 
+        &mdash;
+        OpenPlans
+    </title>
+
+    
+    
+      <base href="http://www.openplans.org/projects/nycstreets/project-home/" />
+    
+  
+
+    <meta name="generator" content="Plone - http://plone.org" />
+
+
+
+
+    <!--//openplans JS add//-->
+    <script type="text/javascript" src="http://www.openplans.org/projects/nycstreets/openplans.js"></script>
+
+    <!-- Plone ECMAScripts -->
+    
+        
+            
+                <script type="text/javascript"
+                        src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts6565.js">
+                </script>
+                
+            
+            
+                <script type="text/javascript"
+                        src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts0569.js">
+                </script>
+                
+            
+        
+    
+
+    
+        
+            
+                
+                    
+                    
+                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3910.css); --></style>
+                    
+                    
+                
+            
+            
+                
+                    <link rel="alternate stylesheet"
+                          type="text/css" media="screen"
+                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3993.css"
+                          title="Small Text" />
+                    
+                    
+                
+            
+            
+                
+                    <link rel="alternate stylesheet"
+                          type="text/css" media="screen"
+                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles5069.css"
+                          title="Large Text" />
+                    
+                    
+                
+            
+            
+                
+                    
+                    
+                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles7546.css); --></style>
+
+                    
+                    
+                
+            
+            
+                
+                    <link rel="alternate stylesheet"
+                          type="text/css" media="screen"
+                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3656.css"
+                          title="Small Text" />
+                    
+                    
+                
+            
+            
+                
+                    <link rel="alternate stylesheet"
+                          type="text/css" media="screen"
+                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles8929.css"
+                          title="Large Text" />
+                    
+                    
+                
+            
+            
+                
+                    
+                    
+                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3831.css); --></style>
+                    
+                    
+                
+            
+        
+    
+    
+    <!-- Internet Explorer CSS Fixes + IE7 for compliance fixes (limited set) -->
+    <!--[if lt IE 7]>
+        <style type="text/css" media="all">@import url(http://www.openplans.org/IEFixes.css);</style>
+    <![endif]-->
+
+    <link rel="shortcut icon" type="image/x-icon"
+          href="http://www.openplans.org/favicon.ico" />
+
+    <!-- Put this inside iefixstart to apply the IE7 script. It will be very slow, and currently
+         breaks with plonePrint.css and plonePresentation.css for unknown reasons.
+        <script src="ie7-standard.js" type="text/javascript" tal:attributes="src string:$portal_url/ie7/ie7-standard.js"></script>
+    -->
+
+
+    <link rel="home" href="http://www.openplans.org"
+          title="Front page" />
+    <link rel="search" title="Search this site"
+          href="http://www.openplans.org/search_form" />
+    <link rel="author" title="Author information"
+          href="http://www.openplans.org/author/Jacqueline" />
+    <link rel="contents"
+          href="http://www.openplans.org/sitemap"
+          title="Site Map" />
+    
+    
+
+    
+
+    <link rel="up" href="http://www.openplans.org/projects"
+          title="Up one level" />
+
+    
+
+    <!-- Disable IE6 image toolbar -->
+    <meta http-equiv="imagetoolbar" content="no" />
+
+    
+    
+    
+  
+
+    
+
+    
+    
+    
+    
+    
+    
+
+
+    
+    
+  
+
+    
+    
+    
+
+    
+
+  
+
+
+  </head>
+
+<body class="section-projects" dir="ltr">
+    
+  <div id="visual-portal-wrapper">
+
+    <table id="tablemain">
+      <tbody>
+        <tr>
+          <td id="topleftshadow_out"><div class="fill"></div></td>
+          <td id="topshadow"><div id="topleftshadow_in"></div><div id="toprightshadow_in"></div></td>
+
+          <td id="toprightshadow_out"><div class="fill"></div></td>
+        </tr>
+
+        <tr>
+          <td rowspan="3" id="leftshadow"><div class="fill"></div></td>
+          <td id="headerrow">
+            <div id="portal-top">
+              <div id="portal-header">
+                <a class="hiddenStructure" accesskey="2"
+                   href="http://www.openplans.org/projects/projects/nycstreets/project-home#documentContent">Skip to content</a>
+
+                <a class="hiddenStructure" accesskey="6"
+                   href="http://www.openplans.org/projects/projects/nycstreets/project-home#portlet-navigation-tree">Skip to navigation</a>
+
+		<div style="float:left; clear:both; width: 100%">
+
+                  <!-- div metal:use-macro="here/global_skinswitcher/macros/skin_tabs">
+                       The skin switcher tabs. Based on which role you have, you
+                       get a selection of skins that you can switch between.
+
+                       </div -->
+
+                  <h1 id="portal-logo">
+    <a href="http://www.openplans.org" accesskey="1">OpenPlans</a>
+</h1>
+
+                  
+    <!-- h5 class="hiddenStructure" i18n:translate="heading_sections">Sections</h5 -->
+    <div id="navwrap">
+    <ul id="portal-globalnav">
+        
+	  <li id="portaltab-people" class="plain">
+            <a href="http://www.openplans.org/people">People</a>
+	</li>
+	
+        
+	  <li id="portaltab-projects" class="selected">
+            <a href="http://www.openplans.org/projects">Projects</a>
+
+	</li>
+	
+    </ul>
+    </div>
+	
+	<!--//old links for reference
+	
+	   
+        	<li><a href="#">OpenPlans home |</a></li>
+			<li><a href="#">My Projects or Login |</a></li>
+			<li><a href="#">Logout (only if My Projects is on</a></li>
+			<li id="ts-startproject"><a href="#">Start a Project</a></li>
+	</ul>
+	//-->
+
+
+                  <div id="portal-searchbox">
+    <form name="searchform"
+          action="http://www.openplans.org/search"
+          style="white-space:nowrap"
+          onsubmit="return liveSearchSubmit()">
+
+        <label for="searchGadget" class="hiddenStructure">Search Site</label>
+
+        <div class="LSBox">
+        <input id="searchGadget" tabindex="30001"
+               name="SearchableText" type="text" size="15"
+               title="Search Site" accesskey="4"
+               class="visibility:visible" />
+
+        <input class="searchButton" type="submit"
+               tabindex="30002" value="Search" />
+
+        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
+        </div>
+    </form>
+
+    <div id="portal-advanced-search" class="hiddenStructure">
+
+        <a href="http://www.openplans.org/search_form"
+           accesskey="5">
+            Advanced Search&hellip;
+        </a>
+    </div>
+
+</div>
+		</div>
+              </div>
+	    </div>
+
+          </td>
+          <td rowspan="3" id="rightshadow"><div class="fill"></div></td>
+        </tr>
+        <tr>
+	  <td id="bannerrow">
+	    <div id="banner_header">
+
+    <div id="portal-bannerheader">
+  <table id="ts_bannerheader">
+
+    <tr>
+      <td id="ts-titleheadercol">
+        <div id="ts-titleheader">
+          
+            <a href="http://www.openplans.org/projects/nycstreets">
+              <h1>New York City Streets Renaissance Campaign</h1>
+            </a>
+          
+          
+        </div>
+      </td>
+
+      <td id="project-tabs">
+	<div>
+	  <ul condition="inProject">
+	    
+	      <li>
+		<a href="http://www.openplans.org/projects/nycstreets/contact_project_admins"
+     id="project_tabs-get-involved">Get Involved!</a>
+	      </li>
+	    
+	  </ul>
+	   
+	</div>
+
+      </td>
+      <td id="ts_imagecol"><div id="ts_image"></div></td>
+    </tr>
+  </table>
+</div>
+
+
+  </div>
+	    
+      <!--//
+	  <h5 class="hiddenStructure" i18n:translate="heading_personal_tools">Personal tools</h5>//-->
+      <div id="portal-navigation-personal">
+
+	<div id="portal-personaltools"> 
+	  <ul>
+	    
+	    
+	      <li>
+		<a href="http://www.openplans.org/login_form">
+		  Log in
+		</a>
+	      </li>
+	    
+	    
+	      <li>
+		<a href="http://www.openplans.org/createMember">
+		  Join
+		</a>
+
+	      </li>
+	    
+	</ul></div>
+	
+
+        <div id="portal-breadcrumbs">
+          
+            
+            <ul>
+              <li>
+                <a href="http://www.openplans.org/projects/nycstreets/">Project Home</a>
+              </li>
+              <li>
+
+                <a href="http://www.openplans.org/projects/nycstreets/proj_roster">Project Roster</a>
+              </li>
+            </ul>
+          
+        </div>
+
+      </div>
+     
+          </td>
+        </tr>
+
+        <!--// table row for main content
+            THIS NEVER CHANGES//-->	
+        <tr>
+          <td>
+            <div class="visualClear"><!-- --></div>
+
+            
+            <table id="portal-columns">
+              <tbody>
+                <tr>
+                  
+                  
+                  
+
+                  
+                  <td id="portal-column-content">
+
+                    
+                      <div id="content"
+                           class="documentEditable">
+
+                        
+                          
+
+        <h5 class="hiddenStructure">Views</h5>
+
+        <ul class="contentViews">
+
+            
+              <li id="contentview-view" class="selected">
+                <a href="http://www.openplans.org/projects/nycstreets/project-home">View</a>
+              </li>
+
+            
+            
+              <li id="contentview-edit" class="plain">
+                <a href="http://www.openplans.org/projects/nycstreets/project-home/edit">Edit</a>
+              </li>
+            
+
+        </ul>
+
+    
+
+                          <div class="contentActions">
+
+        
+
+        
+
+        
+
+
+
+
+
+    </div>
+                        
+
+                        <div class="documentContent" id="region-content">
+
+                          <a name="documentContent"></a>
+
+                          
+
+                          
+
+                          
+    
+
+        <div class="documentActions">
+    
+
+    <h5 class="hiddenStructure">Document Actions</h5>
+
+    <ul>
+    
+        <li>
+            <a href="http://www.openplans.org/projects/nycstreets/project-home/sendto_form">
+
+                <img src="http://www.openplans.org/mail_icon.gif"
+                     alt="Send this page to somebody"
+                     title="Send this page to somebody" />
+            </a>
+        </li>
+    
+    
+        <li>
+            <a href="javascript:this.print();">
+
+                <img src="http://www.openplans.org/print_icon.gif"
+                     alt="Print this page"
+                     title="Print this page" />
+            </a>
+        </li>
+
+    
+
+    </ul>
+    
+
+    
+
+</div>
+
+        <h1 class="documentFirstHeading">NYCSR </h1>
+    
+        <div>
+
+    <div class="documentByLine">
+        
+
+        
+
+        <span>
+        last modified
+        </span>
+
+        2006-09-15 11:18
+
+        
+
+        
+
+        
+
+        
+
+        <div class="reviewHistory">
+    
+</div>
+
+    </div>
+
+</div>
+
+        
+    
+
+    
+        <div class="plain">
+            <h2 class="heading"><b>Welcome to the NYC Streets Renaissance Campaign Headquarters</b><br /></h2><h3 class="subheading">The goal of the NYCSR is to tranform New York City streets so that they are safer, more productive and more livable. </h3><p><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Sociable%20Men-1.jpg" height="200" width="314" />  <b><em>Streets can be places for neighbors to meet</em></b></p><p>New York City is defined by its vibrant and diverse streets and neighborhoods. Unfortunately, our neighborhoods and business districts are buckling under increasing amounts of dangerous car and truck  traffic.  Children can no longer 
+  
+     
+      
+	<span class="wicked_resolved"
+       id="text-860339cd275a35aed13ed4d80e8a8ff6">
+
+	  <a href="http://www.openplans.org/projects/nycstreets/play-on-their-own-blocks">
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
+    class="chunk">play on their own blocks</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+, while parents worry about turning cars smashing into baby carriages. Senior citizens are losing their independence, shut up in their homes for fear of crossing the street.   And shoppers and investors are being turned away by chaotic, traffic-choked avenues.  </p><p>This is unacceptable. <strong>The time is long overdue for our great city to strike a better balance between traffic and the needs of pedestrians.   </strong></p><p>The <strong>NYC Streets Renaissance Campaign</strong> aims to: </p><ul type="disc"><li><b>Educate</b> New Yorkers about potential transportation policy changes that will improve quality of life across New York City</li><li><b>Promote</b> a rebalancing of this public space away from private vehicles and toward community needs</li><li><b>Demonstrate</b> the widespread public support for reform on these issues</li><li><b>Tap </b>the potential of New Yorkers to re-imagine their own streets</li></ul><p><strong></strong></p><p><strong>Our Initiatives:</strong></p><ul type="none"><li>Official launch with an <a title="MAS Exhibition Preparations" href="../mas/project-home" target="_self">exhibition</a>/event at the Municipal Arts Society</li><li>Preparation of a multimedia information packet, including a <a title="inclusionletter" href="inclusionletter" target="_self">inclusion letter</a>, a dvd featuring <a title="TOPP: video production" href="../topp-video-production/project-home" target="_self">Clarence's work</a>, and a intro booklet</li><li>Improvements <a title="website building" href="website-building" target="_self">requested</a> for the <a href="http://www.nycsr.org/" target="_self">nycstreets.org </a>homepage</li><li>Host many <a title="Postcard Revised" href="../mas/mas-nycsr-postcard-revision-2.pdf" target="_self">events</a> to supplement our exhibition at the MAS.</li><li>Promote and distribute 
+  
+     
+      
+	<span class="wicked_resolved"
+       id="text-401890cd2f8c74f7d8106ecbddde78fe">
+
+	  <a href="http://www.openplans.org/projects/nycstreets/studies-and-papers">
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
+    class="chunk">studies and papers</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+ <a href="../studies-and-papers"></a>that dispel myths of streets and transit in NYC.</li></ul><p></p><p></p><ul type="none"><li>Help neighborhood leaders in the fight for long overdue, common sense improvements to their neighborhood streets</li></ul><p></p><p><strong></strong></p><p><strong>To get involved</strong>, add your ideas for making New York City a better place to live and work to our Taking it Citywide 
+  
+     
+      
+	<span class="wicked_resolved"
+       id="text-215018586e8c7cf5386a1bdcdae59e1a">
+	  <a href="http://www.openplans.org/projects/nycstreets/neighborhoods">
+
+            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
+    class="chunk">Neighborhoods</span>
+          </a>
+	</span>
+      
+    
+    
+  
+  
+
+ page, or visit us at <a href="http://www.nycsr.org/involved.php">http://www.nycsr.org/involved.php</a> </p><p></p><p></p><p></p><p></p><p><a title="old landing page" href="old-landing-page" target="_self">old landing page </a><br /></p><p><br /></p><p><strong>Together, we can re-imagine the streets of New York City.</strong></p>
+
+
+<!-- <p>Grand Street Before:<br /><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Grand_street_Before-1.jpg" height="237" width="501" /><br /></p><p></p><p>Grand Street Re-imaged as public space:</p><p><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Grand_street_AFTER-1.jpg" height="336" width="800" /></p> --> 
+        </div>
+
+        <div class="visualClear"><!-- --></div>
+
+        
+
+	
+	
+
+        
+        <div id="relatedItems">
+    
+        
+            
+        
+    
+</div>
+    
+    
+
+
+                          
+                            <div class="discussion">
+    
+        
+            
+            
+
+        
+    
+</div>
+                          
+
+                        </div>
+
+                      </div>
+
+                    
+                  </td>
+                  
+
+                  
+                  
+                  
+                </tr>
+              </tbody>
+            </table>
+	    
+          </td>
+        </tr>
+
+        <tr>
+          <td id="bottomleftshadow_out"><div class="fill"></div></td>
+
+          <td id="bottomshadow"><div id="bottomleftshadow_in"></div><div id="bottomrightshadow_in"></div></td>
+          <td id="bottomrightshadow_out"><div class="fill"></div></td>
+        </tr>
+
+      </tbody>
+    </table>  
+  </div>
+  
+  <div class="visualClear"><!-- --></div>
+
+</body>
+</html>
+
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/standardrules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/standardrules.xml	Mon Oct 30 20:26:02 2006
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
+  <prepend theme="//head" content="//head/link" nocontent="ignore" /> 
+  <prepend theme="//head" content="//head/style" nocontent="ignore" /> 
+  <append theme="//head" content="//head/script" nocontent="ignore" />    
+  <append theme="//head" content="//head/meta" nocontent="ignore" />
+  <append-or-replace theme="//head" content="//head/title"
+  nocontent="ignore" />
+</rules>

From ltucker at codespeak.net  Mon Oct 30 20:26:33 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 30 Oct 2006 20:26:33 +0100 (CET)
Subject: [z3-checkins] r33926 -
	z3/deliverance/branches/packaged/deliverance/test-data/necoro
Message-ID: <20061030192633.6C08010068@code0.codespeak.net>

Author: ltucker
Date: Mon Oct 30 20:26:31 2006
New Revision: 33926

Removed:
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/__init__.py
Log:
this isn't a module

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/necoro/__init__.py
==============================================================================

From ltucker at codespeak.net  Mon Oct 30 21:45:43 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 30 Oct 2006 21:45:43 +0100 (CET)
Subject: [z3-checkins] r33927 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061030204543.E7A3310068@code0.codespeak.net>

Author: ltucker
Date: Mon Oct 30 21:45:39 2006
New Revision: 33927

Modified:
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
   z3/deliverance/branches/packaged/deliverance/tests.py
Log:
making tests test both renderers

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Mon Oct 30 21:45:39 2006
@@ -15,6 +15,7 @@
 tasktracker_app = StaticURLParser(tasktracker_data)
 nycsr_app = StaticURLParser(nycsr_data)
 
+
 def html_string_compare(astr, bstr):
     def reporter(x):
         print x
@@ -39,44 +40,59 @@
             "Comparison failed between actual:\n==================\n%s\n\nexpected:\n==================\n%s\n\nReport:\n%s"
             % (astr, bstr, '\n'.join(reporter)))
 
-def test_basic():
-    wsgi_app = DeliveranceMiddleware(static_app, 'theme.html', 'rules.xml')
+
+
+def do_basic(renderer_type):
+    wsgi_app = DeliveranceMiddleware(static_app, 'theme.html', 'rules.xml',
+                                     renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/example.html')
     res2 = app.get('/example_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
-def test_text():
-    wsgi_app = DeliveranceMiddleware(static_app, 'theme.html', 'text-rules.xml')
+def do_text(renderer_type):
+    wsgi_app = DeliveranceMiddleware(static_app, 'theme.html', 'text-rules.xml',
+                                     renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/example.html')
     res2 = app.get('/texttest_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
-def test_tasktracker():
-    wsgi_app = DeliveranceMiddleware(tasktracker_app, 'http://www.nycsr.org/nyc/video.php', 'tasktracker.xml')
+def do_tasktracker(renderer_type):
+    wsgi_app = DeliveranceMiddleware(tasktracker_app, 'http://www.nycsr.org/nyc/video.php', 
+                                     'tasktracker.xml',renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/content.html')
     res2 = app.get('/expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
 
-def test_xinclude():
-    wsgi_app = DeliveranceMiddleware(static_app, 'xinclude_theme.html', 'xinclude_rules.xml')
+def do_xinclude(renderer_type):
+    wsgi_app = DeliveranceMiddleware(static_app, 'xinclude_theme.html', 'xinclude_rules.xml',
+                                     renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/example.html')
     res2 = app.get('/xinclude_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
 
-def test_nycsr():
-    wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://www.nycsr.org','nycsr.xml')
+def do_nycsr(renderer_type):
+    wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://www.nycsr.org','nycsr.xml',
+                                     renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/openplans.html')
     res2 = app.get('/nycsr_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
 
+RENDERER_TYPES = ['py','xslt']
+TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr ]
+def test_all():
+    for renderer_type in RENDERER_TYPES:
+        for test_func in TEST_FUNCS: 
+            yield lambda(name): test_func(renderer_type), ("[%s] : %s" % (renderer_type, test_func.func_name))
+            
+
 if __name__ == '__main__':
     pass
 

Modified: z3/deliverance/branches/packaged/deliverance/tests.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/tests.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/tests.py	Mon Oct 30 21:45:39 2006
@@ -2,20 +2,23 @@
 import os
 from lxml import etree
 from formencode.doctest_xml_compare import xml_compare
-from interpreter import Renderer
-#from xslt import Renderer
+from interpreter import Renderer as PyRenderer
+from xslt import Renderer as XSLTRenderer
 import copy 
 import urllib
 
+RENDERER_CLASSES = [ PyRenderer, XSLTRenderer ]
+
 class DeliveranceTestCase:
 
-    def __init__(self, rules, rules_uri, theme, theme_uri, content, output):
+    def __init__(self, rules, rules_uri, theme, theme_uri, content, output, renderer_class):
         self.rules = rules
         self.rules_uri = rules_uri
         self.theme = theme
         self.theme_uri = theme_uri
         self.content = content
         self.output = output
+        self.renderer_class = renderer_class
 
     def __call__(self, name):
         def reference_resolver(href, parse, encoding=None):
@@ -27,7 +30,7 @@
             elif encoding:
                 return content.decode(encoding)
 
-        renderer = Renderer(
+        renderer = self.renderer_class(
             theme=self.theme,
             theme_uri=self.theme_uri,
             rule=self.rules, rule_uri=self.rules_uri,
@@ -50,12 +53,13 @@
 test_dir = os.path.join(os.path.dirname(__file__), 'test-data')
 
 def test_examples():
-    for fn in os.listdir(test_dir):
-        fn = os.path.join(test_dir, fn)
-        for case in cases(fn):
-            yield case
+    for renderer_class in RENDERER_CLASSES:
+        for fn in os.listdir(test_dir):
+            fn = os.path.join(test_dir, fn)
+            for case in cases(fn,renderer_class):
+                yield case
 
-def cases(fn):
+def cases(fn, renderer_class):
     if not os.path.basename(fn).startswith('test_'):
         return
     if fn.endswith('~'):
@@ -97,8 +101,9 @@
             theme=themebody,
             theme_uri=el.find('theme').attrib['base'],
             content=contentbody,
-            output=outputbody)
-        yield case, ('%s:%s' % (fn, index))
+            output=outputbody, 
+            renderer_class=renderer_class)
+        yield case, ('[%s] %s:%s' % (renderer_class, fn, index))
 
 
 

From ltucker at codespeak.net  Mon Oct 30 22:25:06 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 30 Oct 2006 22:25:06 +0100 (CET)
Subject: [z3-checkins] r33928 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061030212506.1409B10068@code0.codespeak.net>

Author: ltucker
Date: Mon Oct 30 22:25:03 2006
New Revision: 33928

Modified:
   z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml
   z3/deliverance/branches/packaged/deliverance/utils.py
Log:
adds additional support for rewriting relative css imports

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml	Mon Oct 30 22:25:03 2006
@@ -13,6 +13,9 @@
 	<style type="text/css" media="screen">
 	  @import url(/css/test-style.css);
 	  @import url(http://www.example.com/foo.css);
+	  @import url('/foo/bar.css');
+	  @import url("/flub/quone.css");
+	  @import "joop/win.css";
 	  #effbot-nav {
 	  float: left;
 	  width: 180px;
@@ -39,6 +42,9 @@
 	<style type="text/css" media="screen">
 	  @import url(http://nycsr.org/css/test-style.css);
 	  @import url(http://www.example.com/foo.css);
+	  @import url(http://nycsr.org/foo/bar.css);
+	  @import url(http://nycsr.org/flub/quone.css);
+	  @import url(http://nycsr.org/joop/win.css);
 	  #effbot-nav {
 	  float: left;
 	  width: 180px;

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Mon Oct 30 22:25:03 2006
@@ -182,7 +182,8 @@
             el.attrib[attr] = urlparse.urljoin(base_uri, el.attrib[attr])
 
 
-    CSS_URL_PAT = re.compile(r'url\((.*?)\)',re.I)
+    CSS_URL_PAT = re.compile(r'url\([\"\']*(.*?)[\"\']*\)',re.I)
+    CSS_IMPORT_PAT = re.compile(r'\@import\s*[\"\'](.*?)[\"\']',re.I)
     def fixup_css_links(self, elts, base_uri):
         """ 
         prepends url(...) in css style elements to be 
@@ -192,9 +193,14 @@
         def absuri(matchobj): 
             return 'url(' + urlparse.urljoin(base_uri,matchobj.group(1)) + ')'
 
+        def imp_absuri(matchobj):
+            return '@import url(' + urlparse.urljoin(base_uri,matchobj.group(1)) + ')'
+
         for el in elts:
             if el.text:
+                el.text = re.sub(self.CSS_IMPORT_PAT,imp_absuri,el.text)
                 el.text = re.sub(self.CSS_URL_PAT,absuri,el.text)
+        
 
 
     def attach_text_to_previous(self,el,text):

From cabraham at codespeak.net  Mon Oct 30 23:08:03 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon, 30 Oct 2006 23:08:03 +0100 (CET)
Subject: [z3-checkins] r33930 -
	z3/deliverance/branches/packaged/deliverance/test-data
Message-ID: <20061030220803.3246A1006E@code0.codespeak.net>

Author: cabraham
Date: Mon Oct 30 23:08:01 2006
New Revision: 33930

Modified:
   z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
   z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
Log:
removed a few tests that are not needed

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	Mon Oct 30 23:08:01 2006
@@ -208,24 +208,5 @@
   </output> 
 </deliverance-test>
 
-<!-- drop an element that is just text  --> 
-<!--<deliverance-test>
-  <rules xmlns="http://www.plone.org/deliverance">
-    <drop theme="//div[@id='foo']/child::node()" />
-  </rules>
-
-  <theme base="http://example.com"> 
-     <html><head><title>Blah</title></head><body>before<div id="foo">Dummy Content</div>after</body></html>
-  </theme>
-
-  <content> 
-     <html><body>Real Content</body></html>
-  </content>
- 
-  <output>
-     <html><head><title>Blah</title></head><body>before<div id="foo"></div>after</body></html>
-  </output> 
-</deliverance-test>-->
-
 </deliverance-test-suite>
 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_replace.xml	Mon Oct 30 23:08:01 2006
@@ -234,24 +234,5 @@
 </deliverance-test>
 
 
-<!-- a test that replaces text with a mixture of elements and text -->
-<!-- <deliverance-test>
-  <rules xmlns="http://www.plone.org/deliverance">
-    <replace theme="//div[@id='foo']/child::node()" content="//div[@id='bar']/child::node()" />
-  </rules>
-
-  <theme base="http://example.com"> 
-     <html><head><title>Blah</title></head><body><p>some text</p><div id="foo">Dummy Content</div>theme tail</body></html>
-  </theme>
-
-  <content> 
-     <html><body><div id="bar">Real Content<p>a nice p tag</p>mid text<i>some i text</i>end tail</div></body></html>
-  </content>
- 
-  <output>
-     <html><head><title>Blah</title></head><body><p>some text</p><div id="foo">Real Content<p>a nice p tag</p>mid text<i>some i text</i>end tail</div>theme tail</body></html>
-  </output> 
-</deliverance-test>-->
-
 </deliverance-test-suite>
 

From ltucker at codespeak.net  Mon Oct 30 23:24:30 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 30 Oct 2006 23:24:30 +0100 (CET)
Subject: [z3-checkins] r33931 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061030222430.C46F010063@code0.codespeak.net>

Author: ltucker
Date: Mon Oct 30 23:24:29 2006
New Revision: 33931

Modified:
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
fix wsgi test calls

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Mon Oct 30 23:24:29 2006
@@ -46,7 +46,7 @@
 
 
 
-def do_basic(renderer_type):
+def do_basic(renderer_type, name):
     wsgi_app = DeliveranceMiddleware(static_app, 'theme.html', 'rules.xml',
                                      renderer_type)
     app = TestApp(wsgi_app)
@@ -54,7 +54,7 @@
     res2 = app.get('/example_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
-def do_text(renderer_type):
+def do_text(renderer_type, name):
     wsgi_app = DeliveranceMiddleware(static_app, 'theme.html', 'text-rules.xml',
                                      renderer_type)
     app = TestApp(wsgi_app)
@@ -62,7 +62,7 @@
     res2 = app.get('/texttest_expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
-def do_tasktracker(renderer_type):
+def do_tasktracker(renderer_type, name):
     wsgi_app = DeliveranceMiddleware(tasktracker_app, 'http://www.nycsr.org/nyc/video.php', 
                                      'tasktracker.xml',renderer_type)
     app = TestApp(wsgi_app)
@@ -71,7 +71,7 @@
     html_string_compare(res.body, res2.body)
 
 
-def do_xinclude(renderer_type):
+def do_xinclude(renderer_type, name):
     wsgi_app = DeliveranceMiddleware(static_app, 'xinclude_theme.html', 'xinclude_rules.xml',
                                      renderer_type)
     app = TestApp(wsgi_app)
@@ -80,7 +80,7 @@
     html_string_compare(res.body, res2.body)
 
 
-def do_nycsr(renderer_type):
+def do_nycsr(renderer_type, name):
     wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://www.nycsr.org','nycsr.xml',
                                      renderer_type)
     app = TestApp(wsgi_app)
@@ -89,14 +89,14 @@
     html_string_compare(res.body, res2.body)
 
 
-def do_necoro(renderer_type):
+def do_necoro(renderer_type, name):
     wsgi_app = DeliveranceMiddleware(necoro_app, 'http://www.necoro.com/photo/index.html','necoro.xml', renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/zope.html')
     res2 = app.get('/expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
-def do_guidesearch(renderer_type):
+def do_guidesearch(renderer_type, name):
     wsgi_app = DeliveranceMiddleware(guidesearch_app, 'http://www.guidesearch.jp/index.php?language=schinese','guidesearch.xml', renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/zope.html')
@@ -104,12 +104,12 @@
     html_string_compare(res.body, res2.body)
 
 
-RENDERER_TYPES = ['py','xslt']
-TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch ]
+RENDERER_TYPES = ['py', 'xslt']
+TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch ] 
 def test_all():
     for renderer_type in RENDERER_TYPES:
         for test_func in TEST_FUNCS: 
-            yield lambda(name): test_func(renderer_type), ("[%s] : %s" % (renderer_type, test_func.func_name))
+            yield test_func, renderer_type, test_func.func_name
             
 
 if __name__ == '__main__':

From cabraham at codespeak.net  Mon Oct 30 22:58:09 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon, 30 Oct 2006 22:58:09 +0100 (CET)
Subject: [z3-checkins] r33929 - in
	z3/deliverance/branches/packaged/deliverance: .
	test-data/guidesearch test-data/necoro
Message-ID: <20061030215809.E30561006E@code0.codespeak.net>

Author: cabraham
Date: Mon Oct 30 22:58:02 2006
New Revision: 33929

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/guidesearch.xml
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/out.html
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/standardrules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/zope.html
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/out.html
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/out.html~
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/zope.html
Removed:
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.theme
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/openplans.html
Modified:
   z3/deliverance/branches/packaged/deliverance/htmlserialize.py
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.xml
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
added tests for foreign character sets

Modified: z3/deliverance/branches/packaged/deliverance/htmlserialize.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/htmlserialize.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/htmlserialize.py	Mon Oct 30 22:58:02 2006
@@ -52,7 +52,7 @@
 
     if m:
         charset = m.group('charset')
-        text = text.decode(charset)
+#        text = text.decode(charset)
 
     content = etree.HTML(text)
     assert content is not None

Added: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,180 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style type="text/css" media="all"> @import url(http://www.zope.org/plone.css?skin=);</style>
+<style type="text/css" media="all">@import url(http://www.zope.org/ploneCustom.css);</style>
+<link rel="Stylesheet" type="text/css" href="http://www.zope.org/ploneNS4.css">
+<link rel="stylesheet" type="text/css" media="print" href="http://www.zope.org/plonePrint.css">
+<link rel="stylesheet" type="text/css" media="projection" href="http://www.zope.org/plonePresentation.css">
+<link rel="shortcut icon" href="http://www.zope.org/favicon.ico" type="image/x-icon">
+<link rel="home" href="http://www.zope.org" title="Front Page">
+<link rel="search" href="http://www.zope.org/search_form" title="Search this site">
+<meta name="author" content="??????????">
+<meta name="copyright" content="?????????????">
+<meta name="description" content="??????????">
+<meta name="generator" content="GUIDE 0.5.0">
+<script type="text/javascript">
+<!--
+
+function restChar(txtarea,maxlength) {
+  len = txtarea.value.length;
+  if(len > maxlength) alert("max length "+maxlength+" ---------");
+  txtarea.innerText = txtarea.value.substring(0, maxlength);
+}
+
+//-->
+</script><link rel="stylesheet" type="text/css" media="all" href="http://www.guidesearch.jp/css/top_schinese.css">
+<script type="text/javascript" src="http://www.zope.org/plone_javascripts.js"></script><script language="javascript" type="text/javascript">
+          function formtooltip(el,flag){}
+        </script><meta http-equiv="imagetoolbar" content="no">
+<title>
+           Zope.org</title>
+</head>
+<body>
+<div id="wrapper">
+  <div id="mainpic">
+  <h1>??????????</h1>
+  <div id="mainbox">
+  <p>????????????1949????210?????????????????????????????????????????????????????????????<br>
+???????????????????????????????????<br>????????????????????????????????????????????</p>
+  <ul>
+<li>
+<a href="http://www.guidesearch.jp/search/search.php?language=schinese">????????</a>
+  </li>
+    </ul>
+</div>
+<div id="lang">    
+  <form name="top" action="/index.php" method="POST">
+    <select name="language"><option value="japanese">??</option>
+<option value="english">English</option>
+<option value="korean">Korean</option>
+<option value="schinese" selected>Simple Chinese</option>
+<option value="tchinese">Traditional Chinese</option></select><input name="change_language" type="submit" value="Change">
+</form>
+  </div>
+    <div id="copy">
+  <a href="http://www.guidesearch.jp/about.php?language=schinese">????  &gt;&gt;</a>
+  <a href="http://www.guidesearch.jp/priv.php?language=schinese">??????  &gt;&gt;</a>
+  <a href="http://www.mlit.go.jp/sogoseisaku/kanko/english/">?????(english)</a>
+    </div>
+  </div>
+</div>
+
+<td class="main">
+      <h1>Welcome to Zope.org</h1>
+
+      <div class="hilite">The Web Site for the Zope Community</div>
+
+      <p>Zope is an open source application server for building
+      content management systems, intranets, portals, and custom
+      applications. The Zope community consists of hundreds of
+      companies and thousands of developers all over the world,
+      working on building the platform and Zope applications. Zope is
+      written in Python, a highly-productive, object-oriented
+      scripting language. <a href="/WhatIsZope">more</a></p>
+
+
+     <!-- 
+     <div class="eventBox">
+       <p><b>Notices go here</b> 
+       Notice text
+       </p>
+     </div>
+     -->
+
+      <h2>Zope for...</h2>
+
+<table><tr>
+<td>
+      <ul>
+<li>
+      <strong>New Users</strong>
+              <div class="subitems">
+<a href="http://www.zope.org/WhatIsZope">Introduction To Zope</a>, 
+<a href="http://www.python.org/" target="_new">About Python</a>
+        </div>
+      </li>
+     </ul>
+<ul>
+<li>
+      <strong>Web Masters</strong>
+              <div class="subitems">
+
+<a href="http://www.zope.org/Members/shaw/HowTo/ApacheFrontEnd">Using Apache</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/Security.stx">Security</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixA.stx">DTML</a>
+	      </div>
+      </li>
+     </ul>
+</td>
+<td>
+     <ul>
+<li>
+      <strong>Product Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Documentation/Books/ZDG/current">Developers Guide</a>, 
+<a href="http://www.zope.org/Members/mcdonc/PDG/UnitTesting/view">Unit Testing</a>
+	</div>
+     </li>
+     </ul>
+<ul>
+<li>
+     <strong>Zope Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Products/CMF/">Content Management Framework (CMF)</a>, <br><a href="http://www.zope.org/Products/">Products</a>, 
+Using <a href="http://dev.zope.org/CVS/">CVS</a>/<a href="http://dev.zope.org/Subversion/">SVN</a>, 
+<a href="http://dev.zope.org/CVS/BugDays">Bug Days</a>
+	</div>
+     </li>
+     </ul>
+</td>
+</tr></table>
+<div class="box">
+<h2>What You can do on Zope.org</h2>
+<p>    Membership gives you your own home folder on Zope.org where you can create
+    and manage your own Zope objects. The objects you create and maintain will
+    be available to all people who visit Zope.org.</p>
+<p>    Site visitors can find your content using the site search or by browsing 
+    your member folder.</p>
+<p>    Many pages on the zope.org site are generated by search queries - by 
+    providing metadata such as keywords with your content it can appear in 
+    automated site pages such as product or news listings. <a href="/Help">more</a></p>
+</div>
+
+<div class="box">
+
+<h2>Zope Training ...</h2>
+<br><!--
+<div class="eventBox">
+<strong>
+<a href="#"
+ target="_new"> </a>
+</strong>
+<br />
+ <span class="hilite">Month from-to in Location, Country</span>
+</div>
+-->
+
+
+Send your Zope training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+<div class="box">
+
+<h2>Plone Training ...</h2>
+<br> 
+
+
+Send your Plone training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+    </td>
+<center>
+<br>Powered by?GUIDE 0.5.0 ? 2006 <a href="http://www.jga21c.or.jp/" target="_blank">The Guide-Interpreter Search System</a>
+</center>
+</body>
+</html>
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/guidesearch.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/guidesearch.xml	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+  <xi:include href="standardrules.xml" />
+
+  <replace theme="/html/body/center[1]" content="//div[@id='content']//table[@class='columns']//td[@class='main']" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/out.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/out.html	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,178 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style type="text/css" media="all"> @import url(http://www.zope.org/plone.css?skin=);</style>
+<style type="text/css" media="all">@import url(http://www.zope.org/ploneCustom.css);</style>
+<link rel="Stylesheet" type="text/css" href="http://www.zope.org/ploneNS4.css">
+<link rel="stylesheet" type="text/css" media="print" href="http://www.zope.org/plonePrint.css"><link rel="stylesheet" type="text/css" media="projection" href="http://www.zope.org/plonePresentation.css">
+<link rel="shortcut icon" href="http://www.zope.org/favicon.ico" type="image/x-icon">
+<link rel="home" href="http://www.zope.org" title="Front Page">
+<link rel="search" href="http://www.zope.org/search_form" title="Search this site">
+<meta name="author" content="???????????????????????????">
+<meta name="copyright" content="??????????????????????????????????">
+<meta name="description" content="???????????????????????????">
+<meta name="generator" content="GUIDE 0.5.0">
+<script type="text/javascript">
+<!--
+
+function restChar(txtarea,maxlength) {
+  len = txtarea.value.length;
+  if(len > maxlength) alert("max length "+maxlength+" ---------");
+  txtarea.innerText = txtarea.value.substring(0, maxlength);
+}
+
+//-->
+</script><link rel="stylesheet" type="text/css" media="all" href="http://www.guidesearch.jp/css/top_schinese.css">
+<script type="text/javascript" src="http://www.zope.org/plone_javascripts.js"></script><script language="javascript" type="text/javascript">
+          function formtooltip(el,flag){}
+        </script><meta http-equiv="imagetoolbar" content="no">
+<title>
+           Zope.org</title>
+</head>
+<body>
+<div id="wrapper">
+  <div id="mainpic">
+  <h1>???????????????????????????</h1>
+  <div id="mainbox">
+  <p>?????????????????????????????????1949????????????210???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????<br>
+???????????????????????????????????????????????????????????????????????????????????????????????????<br>?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????</p>
+  <ul>
+<li>
+<a href="http://www.guidesearch.jp/search/search.php?language=schinese">?????????????????????</a>
+  </li>
+    </ul>
+</div>
+<div id="lang">
+  <form name="top" action="/index.php" method="POST">
+    <select name="language"><option value="japanese">??????</option>
+<option value="english">English</option>
+<option value="korean">Korean</option>
+<option value="schinese" selected>Simple Chinese</option>
+<option value="tchinese">Traditional Chinese</option></select><input name="change_language" type="submit" value="Change">
+</form>
+  </div>
+    <div id="copy">
+  <a href="http://www.guidesearch.jp/about.php?language=schinese">??????????  &gt;&gt;</a>
+  <a href="http://www.guidesearch.jp/priv.php?language=schinese">??????????????????  &gt;&gt;</a>
+  <a href="http://www.mlit.go.jp/sogoseisaku/kanko/english/">???????????????(english)</a>
+    </div>
+  </div>
+</div>
+
+<td class="main">
+      <h1>Welcome to Zope.org</h1>
+
+      <div class="hilite">The Web Site for the Zope Community</div>
+
+      <p>Zope is an open source application server for building
+      content management systems, intranets, portals, and custom
+      applications. The Zope community consists of hundreds of
+      companies and thousands of developers all over the world,
+      working on building the platform and Zope applications. Zope is
+      written in Python, a highly-productive, object-oriented
+      scripting language. <a href="/WhatIsZope">more</a></p>
+
+
+     <!--
+     <div class="eventBox">
+       <p><b>Notices go here</b>
+       Notice text
+       </p>
+     </div>
+     -->
+
+      <h2>Zope for...</h2>
+
+<table><tr>
+<td>
+      <ul>
+<li>
+      <strong>New Users</strong>
+              <div class="subitems">
+<a href="http://www.zope.org/WhatIsZope">Introduction To Zope</a>,
+<a href="http://www.python.org/" target="_new">About Python</a>
+        </div>
+      </li>
+     </ul>
+<ul>
+<li>
+      <strong>Web Masters</strong>
+              <div class="subitems">
+
+<a href="http://www.zope.org/Members/shaw/HowTo/ApacheFrontEnd">Using Apache</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/Security.stx">Security</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixA.stx">DTML</a>
+              </div>
+      </li>
+     </ul>
+</td>
+<td>
+     <ul>
+<li>
+      <strong>Product Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Documentation/Books/ZDG/current">Developers Guide</a>,
+<a href="http://www.zope.org/Members/mcdonc/PDG/UnitTesting/view">Unit Testing</a>
+        </div>
+     </li>
+     </ul>
+<ul>
+<li>
+     <strong>Zope Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Products/CMF/">Content Management Framework (CMF)</a>, <br><a href="http://www.zope.org/Products/">Products</a>,
+Using <a href="http://dev.zope.org/CVS/">CVS</a>/<a href="http://dev.zope.org/Subversion/">SVN</a>,
+<a href="http://dev.zope.org/CVS/BugDays">Bug Days</a>
+        </div>
+     </li>
+     </ul>
+</td>
+</tr></table>
+<div class="box">
+<h2>What You can do on Zope.org</h2>
+<p>    Membership gives you your own home folder on Zope.org where you can create
+    and manage your own Zope objects. The objects you create and maintain will
+    be available to all people who visit Zope.org.</p>
+<p>    Site visitors can find your content using the site search or by browsing
+    your member folder.</p>
+<p>    Many pages on the zope.org site are generated by search queries - by
+    providing metadata such as keywords with your content it can appear in
+    automated site pages such as product or news listings. <a href="/Help">more</a></p>
+</div>
+
+<div class="box">
+
+<h2>Zope Training ...</h2>
+<br><!--
+<div class="eventBox">
+<strong>
+<a href="#"
+ target="_new"> </a>
+</strong>
+<br />
+ <span class="hilite">Month from-to in Location, Country</span>
+</div>
+-->
+
+
+Send your Zope training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+<div class="box">
+
+<h2>Plone Training ...</h2>
+<br>
+
+
+Send your Plone training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+    </td>
+<center>
+<br>Powered by??GUIDE 0.5.0 ?? 2006 <a href="http://www.jga21c.or.jp/" target="_blank">The Guide-Interpreter Search System</a>
+</center>
+</body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/standardrules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/standardrules.xml	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
+  <prepend theme="//head" content="//head/link" nocontent="ignore" /> 
+  <prepend theme="//head" content="//head/style" nocontent="ignore" /> 
+  <append theme="//head" content="//head/script" nocontent="ignore" />    
+  <append theme="//head" content="//head/meta" nocontent="ignore" />
+  <append-or-replace theme="//head" content="//head/title"
+  nocontent="ignore" />
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/zope.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/zope.html	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,751 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en">
+
+<head>
+    <meta http-equiv="Content-Type"
+          content="text/html;charset=utf-8" />
+
+    <title>
+           Zope.org</title>
+
+    
+    
+       <base href="http://www.zope.org/" />
+       
+    
+  
+
+
+    <!-- Basic crude style for Netscape4.x - This can be removed
+         if you don't want the special NS4 look - it will still work,
+	 just be plain text instead. -->
+    <link rel="Stylesheet" type="text/css"
+          href="http://www.zope.org/ploneNS4.css" />
+
+    <!-- Main style sheets for CSS2 capable browsers -->
+    <style type="text/css" media="all"> @import url(http://www.zope.org/plone.css?skin=);</style>
+
+    <!-- Custom style sheet if available -->
+    <style type="text/css" media="all">@import url(http://www.zope.org/ploneCustom.css);</style>
+
+    <!-- Style sheet used for printing -->
+    <link rel="stylesheet" type="text/css" media="print"
+          href="http://www.zope.org/plonePrint.css" />
+
+    <!-- Style sheet used for presentations (Opera is the only browser supporting this at the moment) -->
+    <link rel="stylesheet" type="text/css"
+          media="projection"
+          href="http://www.zope.org/plonePresentation.css" />
+
+    <link rel="shortcut icon"
+          href="http://www.zope.org/favicon.ico"
+          type="image/x-icon" />
+
+    <link rel="home" href="http://www.zope.org"
+          title="Front Page" />
+    <link rel="search"
+          href="http://www.zope.org/search_form"
+          title="Search this site" />
+
+    <!-- Disable IE6 image toolbar -->
+    <meta http-equiv="imagetoolbar" content="no" />
+
+    
+    
+  
+
+    
+
+    
+    
+
+    
+  
+
+    
+    
+  
+
+    <!-- Common Plone ECMAScripts -->
+    <script type="text/javascript"
+            src="http://www.zope.org/plone_javascripts.js"></script>
+
+    
+      
+      
+        <script language='javascript' type='text/javascript' >
+          function formtooltip(el,flag){}
+        </script>
+      
+
+    
+</head>
+
+<body>
+
+<div>
+
+     
+
+        <div class="top">
+
+            <div class="searchBox">
+                <form name="searchform"
+                      action="http://www.zope.org/search">
+
+                    <input id="searchGadget"
+                           name="SearchableText" type="text"
+                           size="20" tabindex="30001" />
+
+                    <input class="context searchButton"
+                           type="submit" value="Search"
+                           tabindex="30002" />
+                </form>
+            </div>
+
+            <a href="http://www.zope.org">
+                <img src="http://www.zope.org/logo.gif" class="logo" width="201" height="54" border="0" alt="" />
+            </a>
+        </div>
+
+        <hr size="" class="netscape4" />
+
+        <div class="tabs">
+
+
+        </div>
+
+        <div class="personalBar">&nbsp;
+
+            
+
+            <span>You are not logged in</span>
+
+            
+            <a href="http://www.zope.org/login_form">
+                <img src="http://www.zope.org/linkOpaque.gif" alt="" title="" height="1" width="1" border="0" />
+
+                Log in
+            </a>
+            
+            
+            <a href="http://www.zope.org/portal_form/join_form">
+                <img src="http://www.zope.org/linkOpaque.gif" alt="" title="" height="1" width="1" border="0" />
+
+                Join
+            </a>
+            
+        </div>
+
+        <div class="pathBar">
+
+            
+	    You are here:
+	        
+
+            
+                Home
+            
+
+
+        </div>
+
+        <hr size="" class="netscape4" />
+
+    </div>
+
+
+<table class="columns">
+
+    <tbody>
+        <tr>
+            <td class="left">
+                
+                
+                    <div class="box">
+        <div class="body">
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/Products/">Download</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.org/Products/">Download Zope</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Products/">Zope Products</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Products/CMF/">Zope CMF</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/Resources/">Resources</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.org/Collectors/">Report Bugs</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/MailingLists">Mailing Lists</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/UserGroups/">User Groups</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/License/">License</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/Documentation/">Documentation</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.org/Documentation/Books/ZopeBook/">The Zope Book</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixB.stx">API reference</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT reference</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Documentation/Books/ZDG/">Developer Guide</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Products/CMF/docs/">CMF Documentation</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/Articles/">Zope Articles</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Documentation/How-To/">Zope How-Tos</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.com/about_us/open_source_community/zope_and_python_books.html">Books In Print</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/WhatIsZope">About Zope</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.org/WhatIsZope">What Is Zope?</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/ZopePowered/">Zope Powered Sites</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/About/">About Zope.org</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Help/">Member FAQ</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/Resources/ZSP/">Business</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.com">Zope Corporation</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/ZSP/">Solution Providers</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Training/">Zope Training</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://dev.zope.org/">Developers</a>
+	  <ul>
+	     <li>
+               <a href="http://dev.zope.org/Projects/">Zope Projects</a>
+	    </li>
+	     <li>
+               <a href="http://wiki.zope.org/zope3/">Zope 3</a>
+	    </li>
+	     <li>
+               <a href="http://dev.zope.org/CVS/">Zope CVS</a>
+	    </li>
+	     <li>
+               <a href="http://dev.zope.org/Subversion/">Zope SVN</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://wiki.zope.org/zope2/Sites">Zope Sites</a>
+	  
+         </li>
+        </ul>
+        </div>
+   </div>
+                
+                
+                
+                
+                
+                    
+
+    <div class="box">
+
+        <h5>Log in</h5>
+
+        <div class="body">
+        
+            <div class="content odd">
+                <form action="http://www.zope.org/logged_in"
+                      id="login_box_form" method="post">
+    
+ 
+                    <strong>Name</strong> <br />
+                    <input type="text" name="__ac_name"
+                           size="12" alt="Username"
+                           title="Username" tabindex="10001" />
+    
+                    <br />
+    
+                    <strong>Password</strong>  <br />
+                    <input type="password"
+                           name="__ac_password" size="12"
+                           alt="Password" title="Password"
+                           tabindex="10002" />
+    
+                    <br />
+                    &nbsp;
+                    <br />
+    
+                    <input class="context searchButton"
+                           type="submit" name="submit"
+                           value="Log in" tabindex="10003" />
+
+                   
+    
+                </form>
+<script type="text/javascript" language="javascript"><!--
+
+function getCookie(cname) {
+  var search = cname + "="
+  if (document.cookie.length > 0) {
+    offset = document.cookie.indexOf(search);
+    if (offset != -1) {
+      offset += search.length;
+      end = document.cookie.indexOf(";", offset);
+      if (end == -1){
+          end = document.cookie.length;
+      }
+      var value = unescape(document.cookie.substring(offset, end));
+      if (value.charAt(0) == '"' && value.charAt(value.length -1) == '"') {
+        value = value.substring(1, value.length -1);
+      }
+      return value;
+    }
+  }
+  return '';
+}
+
+window.document.forms.login_box_form.elements[0].value=getCookie('__ac_name');            
+--></script>
+            </div>
+    
+            <div class="content even"> 
+                <a href="http://www.zope.org/mail_password_form">
+                   <img src="http://www.zope.org/linkTransparent.gif" alt="Link icon" title="Link icon" height="11" width="6" border="0" />
+                   Forgot your password?
+                </a>
+            </div>
+
+            <div class="content odd">
+          
+                <a href="http://www.zope.org/portal_form/join_form">
+                    <img src="http://www.zope.org/linkTransparent.gif" alt="Link icon" title="Link icon" height="11" width="6" border="0" />
+                    New user?
+                </a>
+    
+            </div>
+
+        </div>
+        
+    </div>
+
+
+                
+                
+                
+            </td>
+            <td class="main">
+
+                
+
+                <div class="document">
+
+                    <div id="content">
+
+                        
+    
+
+
+    
+
+
+
+
+                        <div class="documentActions">
+
+                            
+
+                            
+
+                            <a href="javascript:this.print();">
+                                <img alt="Print"
+    src="http://www.zope.org/print_icon.gif"
+    title="Print this page" />
+                            </a>
+                        </div>
+
+                        
+
+                        <div>
+<table class="columns">
+  <tr>
+    <td class="main">
+      <h1>Welcome to Zope.org</h1>
+
+      <div class="hilite">The Web Site for the Zope Community</div>
+
+      <p>Zope is an open source application server for building
+      content management systems, intranets, portals, and custom
+      applications. The Zope community consists of hundreds of
+      companies and thousands of developers all over the world,
+      working on building the platform and Zope applications. Zope is
+      written in Python, a highly-productive, object-oriented
+      scripting language. <a href="/WhatIsZope">more</a></p>
+
+
+     <!-- 
+     <div class="eventBox">
+       <p><b>Notices go here</b> 
+       Notice text
+       </p>
+     </div>
+     -->
+
+      <h2>Zope for...</h2>
+
+<table>
+<tr>
+<td>
+      <ul>
+      <li>
+      <strong>New Users</strong>
+              <div class="subitems">
+<a href="http://www.zope.org/WhatIsZope">Introduction To Zope</a>, 
+<a href="http://www.python.org/" target="_new">About Python</a>
+        </div>
+      </li>
+     </ul>
+     <ul>
+     <li>
+      <strong>Web Masters</strong>
+              <div class="subitems">
+
+<a href="http://www.zope.org/Members/shaw/HowTo/ApacheFrontEnd">Using Apache</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/Security.stx">Security</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixA.stx">DTML</a>
+	      </div>
+      </li>
+     </ul>
+</td>
+<td>
+     <ul>
+      <li>
+      <strong>Product Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Documentation/Books/ZDG/current">Developers Guide</a>, 
+<a href="http://www.zope.org/Members/mcdonc/PDG/UnitTesting/view">Unit Testing</a>
+	</div>
+     </li>
+     </ul>
+     <ul>
+     <li>
+     <strong>Zope Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Products/CMF/">Content Management Framework (CMF)</a>, <br />
+<a href="http://www.zope.org/Products/">Products</a>, 
+Using <a href="http://dev.zope.org/CVS/">CVS</a>/<a href="http://dev.zope.org/Subversion/">SVN</a>, 
+<a href="http://dev.zope.org/CVS/BugDays">Bug Days</a>
+	</div>
+     </li>
+     </ul>
+</td>
+</tr>
+</table>
+
+<div class="box">
+<h2>What You can do on Zope.org</h2>
+<p>    Membership gives you your own home folder on Zope.org where you can create
+    and manage your own Zope objects. The objects you create and maintain will
+    be available to all people who visit Zope.org.</p>
+<p>    Site visitors can find your content using the site search or by browsing 
+    your member folder.</p>
+<p>    Many pages on the zope.org site are generated by search queries - by 
+    providing metadata such as keywords with your content it can appear in 
+    automated site pages such as product or news listings. <a href="/Help">more</a></p>
+</div>
+
+<div class="box">
+
+<h2>Zope Training ...</h2>
+<br> 
+
+<!--
+<div class="eventBox">
+<strong>
+<a href="#"
+ target="_new"> </a>
+</strong>
+<br />
+ <span class="hilite">Month from-to in Location, Country</span>
+</div>
+-->
+
+
+Send your Zope training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+<div class="box">
+
+<h2>Plone Training ...</h2>
+<br> 
+
+
+Send your Plone training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+    </td>
+
+    <td class="right">
+    <div class="box">
+
+    <div class="box">
+
+        <h5><span>Planets</span></h5>
+	<div class="body">
+	 <div class="content even">
+          <img src="newsitem_icon.gif" />
+	  <a href="http://planet.zope.org">Planet Zope</a>
+	  <div class="boxDetails">Zope related news
+<a href="http://planet.zope.org/planet_rss10.xml">
+               <img src="http://www.zope.org/rss.gif"
+                    alt="RSS Newsfeed" /></a>
+          </div>
+         </div>
+	 <div class="content odd">
+          <img src="newsitem_icon.gif" />
+	  <a href="http://planet.plone.org">Planet Plone</a>
+	  <div class="boxDetails">Plone related news
+<a href="http://planet.plone.org/rss20.xml">
+               <img src="http://www.zope.org/rss.gif"
+                    alt="RSS Newsfeed" /></a>
+          </div>
+	 </div>
+	</div>
+     </div>
+
+    <div class="box">
+
+        <h5><span><a href="http://www.zope.org/News/">News</a>
+            </span>
+            <a href="http://www.zope.org/news.rss">
+               <img src="http://www.zope.org/xml.gif"
+                    alt="RSS Newsfeed" /></a>
+             </h5>
+	<div class="body">
+        
+	<div class="content even">
+        <img src="newsitem_icon.gif" alt="ZopeDictDB 0.1" />
+	<a href="http://www.zope.org/Members/ebrun/ZopeDictDB">
+		      ZopeDictDB 0.1
+	  </a>
+	  <div class="boxDetails">October 30</div>
+
+	</div>
+        
+        
+	<div class="content odd">
+        <img src="newsitem_icon.gif"
+             alt="Russian Zope3 Maillist" />
+	<a href="http://www.zope.org/Members/mkashkin/zope3maillist">
+		      Russian Zope3 Maillist
+	  </a>
+	  <div class="boxDetails">October 26</div>
+
+	</div>
+        
+        
+	<div class="content even">
+        <img src="newsitem_icon.gif"
+             alt="kiss 0.1:  Serve filesystem content, simply" />
+	<a href="http://www.zope.org/Members/tseaver/Projects/kiss-0.1-released">
+		      kiss 0.1:  Serve filesystem content, simply
+	  </a>
+	  <div class="boxDetails">October 17</div>
+
+	</div>
+        
+        
+	<div class="content odd">
+        <img src="newsitem_icon.gif"
+             alt="ZInformixDA 0.3 released" />
+	<a href="http://www.zope.org/Members/nbk/products/zinformixda/0.3/released_news">
+		      ZInformixDA 0.3 released
+	  </a>
+	  <div class="boxDetails">October 16</div>
+
+	</div>
+        
+        
+	<div class="content even">
+        <img src="newsitem_icon.gif"
+             alt="zForum 1.0 Release 16 - Skin Me" />
+	<a href="http://www.zope.org/Members/speedbird/zforum1016">
+		      zForum 1.0 Release 16 - Skin Me
+	  </a>
+	  <div class="boxDetails">October 16</div>
+
+	</div>
+        
+	</div>
+     </div>
+    <div class="box">
+
+        <h5><span><a href="http://www.zope.org/Products">Products</a></span>
+            <a href="http://www.zope.org/products.rss">
+               <img src="http://www.zope.org/xml.gif"
+                    alt="Products RSS" /></a></h5>
+	<div class="body">
+        
+	<div class="content even">
+        <img src="folder_icon.gif" alt="Content Dispatcher" />
+        <a href="http://www.zope.org/Members/ingeniweb2/ContentDispatcher/Content%20Dispatcher">
+		      ContentDispatcher: Dispatch content over many plone sites in one click ! (1.0.1)
+	  </a>
+	  <div class="boxDetails">October 11</div>
+
+	</div>
+        
+        
+	<div class="content odd">
+        <img src="folder_icon.gif" alt="CMF-2.1.0-alpha" />
+        <a href="http://www.zope.org/Products/CMF/CMF-2.1.0-alpha">
+		      Content Management Framework (2.1.0-alpha)
+	  </a>
+	  <div class="boxDetails">October 09</div>
+
+	</div>
+        
+        
+	<div class="content even">
+        <img src="folder_icon.gif" alt="ZopeEditArea 0.1" />
+        <a href="http://www.zope.org/Members/pfurman/ZopeEditArea/ZopeEditArea%200.1">
+		       (0.1)
+	  </a>
+	  <div class="boxDetails">October 08</div>
+
+	</div>
+        
+        
+	<div class="content odd">
+        <img src="folder_icon.gif" alt="2.10.0" />
+        <a href="http://www.zope.org/Products/Zope/2.10.0">
+		      Zope (2_10_0-final)
+	  </a>
+	  <div class="boxDetails">October 03</div>
+
+	</div>
+        
+        
+	<div class="content even">
+        <img src="folder_icon.gif" alt="3.2.2" />
+        <a href="http://www.zope.org/Products/Zope3/3.2.2">
+		      Zope 3 (3.2.2)
+	  </a>
+	  <div class="boxDetails">October 02</div>
+
+	</div>
+        
+	</div>
+     </div>
+</div>
+
+   </td>
+  </tr>
+</table>
+</div>
+
+                        
+                        <div>
+    
+</div>
+                        
+                    </div>
+                </div>
+            </td>
+
+            
+        </tr>
+    </tbody>
+</table>
+
+<hr size="" class="netscape4" />
+
+<div class="footer">
+
+Copyright (c) 2006 Zope Corporation. All rights reserved.
+<a href="http://www.zope.com/about_us/legal/legal_notice.html">Legal</a> | <a href="mailto:webmaster at zope.org">Contact</a>
+
+<hr size="" class="netscape4" />
+
+<strong class="netscape4">
+If you can read this text, it means you are not experiencing the Plone design at its best.
+Plone makes heavy use of CSS, which means it is accessible to any internet browser, 
+but the design needs a 
+<a href="http://www.webstandards.org/upgrade/">standards-compliant browser to look like we intended it</a>. 
+Just so you know ;)
+</strong>
+
+<!-- Start Google Analytics, JV 2006/07/20 -->
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-481514-2";
+urchinTracker();
+</script>
+<!-- End Google Analytics -->
+ 
+</div>
+
+</body>
+</html>
+
+
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,242 @@
+<html>
+<!-- #BeginTemplate "/Templates/photo.dwt" --><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style type="text/css" media="all"> @import url(http://www.zope.org/plone.css?skin=);</style>
+<style type="text/css" media="all">@import url(http://www.zope.org/ploneCustom.css);</style>
+<link rel="Stylesheet" type="text/css" href="http://www.zope.org/ploneNS4.css">
+<link rel="stylesheet" type="text/css" media="print" href="http://www.zope.org/plonePrint.css">
+<link rel="stylesheet" type="text/css" media="projection" href="http://www.zope.org/plonePresentation.css">
+<link rel="shortcut icon" href="http://www.zope.org/favicon.ico" type="image/x-icon">
+<link rel="home" href="http://www.zope.org" title="Front Page">
+<link rel="search" href="http://www.zope.org/search_form" title="Search this site">
+<!-- #BeginEditable "doctitle" --><!-- #EndEditable --><script language="JavaScript">
+<!--
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+
+
+//-->
+</script><script src="http://www.necoro.com/photo/anime.js"></script><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+<script language="JavaScript">
+<!--
+<!--
+function MM_reloadPage(init) {  //reloads the window if Nav4 resized
+  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
+    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
+  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
+}
+MM_reloadPage(true);
+// -->
+
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+//-->
+</script><script type="text/javascript" src="http://www.zope.org/plone_javascripts.js"></script><script language="javascript" type="text/javascript">
+          function formtooltip(el,flag){}
+        </script><meta http-equiv="imagetoolbar" content="no">
+<title>
+           Zope.org</title>
+</head>
+<body bgcolor="#FFFFFF" text="#000000" onload="MM_preloadImages('../leftnabi/images/left_05.jpg','../leftnabi/images/left_05-over.jpg','../leftnabi/images/left_06.jpg','../leftnabi/images/left_06-over.jpg','../leftnabi/images/left_07.jpg','../leftnabi/images/left_07-over.jpg','images/vp_01-over.jpg')" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<table width="640" border="0" cellspacing="0" cellpadding="0">
+<tr valign="top">
+<td rowspan="2" width="88" align="left">
+<table width="88" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td colspan="2" height="82"><a href="http://www.necoro.com/home.html"><script language="JavaScript"> //necoro random anime
+			anime_1(Math.random())</script></a></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_02" src="http://www.necoro.com/leftnabi/images/left_02.jpg" width="88" height="1"></td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/photo/index.html"><img name="left_03" src="http://www.necoro.com/leftnabi/images/left_03-over.jpg" width="88" height="73" border="0"></a></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/left_04.jpg" width="1" height="49"></td>
+<td> <a href="http://www.necoro.com/item/index.html" onmouseover="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)" onmouseout="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="http://www.necoro.com/leftnabi/images/left_05.jpg" width="87" height="49" border="0"></a>
+</td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/owners/index.html" onmouseover="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)" onmouseout="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="http://www.necoro.com/leftnabi/images/left_06.jpg" width="88" height="47" border="0"></a></td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/fanland/index.html" onmouseover="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)" onmouseout="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="http://www.necoro.com/leftnabi/images/left_07.jpg" width="88" height="66" border="0"></a></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_08" src="http://www.necoro.com/leftnabi/images/left_08.jpg" width="88" height="59" border="0"></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_09" src="http://www.necoro.com/leftnabi/images/left_09.jpg" width="88" height="62" border="0"></td>
+</tr>
+<tr>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/left_10.jpg" width="1" height="100"></td>
+<td><img src="http://www.necoro.com/leftnabi/images/left_11.jpg" width="87" height="64"></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/left_12.jpg" width="87" height="36"></td>
+</tr>
+</table>
+</td>
+<td> 
+<table width="452" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_01.jpg" width="50" height="49"></td>
+<td><img src="http://www.necoro.com/images/tstudio_02.jpg" width="260" height="30" alt="Photo studio"></td>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_03.jpg" width="139" height="49"></td>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_04.jpg" width="103" height="49" alt="omron"></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/top_05.jpg" width="260" height="19"></td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td class="main">
+      <h1>Welcome to Zope.org</h1>
+
+      <div class="hilite">The Web Site for the Zope Community</div>
+
+      <p>Zope is an open source application server for building
+      content management systems, intranets, portals, and custom
+      applications. The Zope community consists of hundreds of
+      companies and thousands of developers all over the world,
+      working on building the platform and Zope applications. Zope is
+      written in Python, a highly-productive, object-oriented
+      scripting language. <a href="/WhatIsZope">more</a></p>
+
+
+     <!-- 
+     <div class="eventBox">
+       <p><b>Notices go here</b> 
+       Notice text
+       </p>
+     </div>
+     -->
+
+      <h2>Zope for...</h2>
+
+<table><tr>
+<td>
+      <ul>
+<li>
+      <strong>New Users</strong>
+              <div class="subitems">
+<a href="http://www.zope.org/WhatIsZope">Introduction To Zope</a>, 
+<a href="http://www.python.org/" target="_new">About Python</a>
+        </div>
+      </li>
+     </ul>
+<ul>
+<li>
+      <strong>Web Masters</strong>
+              <div class="subitems">
+
+<a href="http://www.zope.org/Members/shaw/HowTo/ApacheFrontEnd">Using Apache</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/Security.stx">Security</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixA.stx">DTML</a>
+	      </div>
+      </li>
+     </ul>
+</td>
+<td>
+     <ul>
+<li>
+      <strong>Product Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Documentation/Books/ZDG/current">Developers Guide</a>, 
+<a href="http://www.zope.org/Members/mcdonc/PDG/UnitTesting/view">Unit Testing</a>
+	</div>
+     </li>
+     </ul>
+<ul>
+<li>
+     <strong>Zope Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Products/CMF/">Content Management Framework (CMF)</a>, <br><a href="http://www.zope.org/Products/">Products</a>, 
+Using <a href="http://dev.zope.org/CVS/">CVS</a>/<a href="http://dev.zope.org/Subversion/">SVN</a>, 
+<a href="http://dev.zope.org/CVS/BugDays">Bug Days</a>
+	</div>
+     </li>
+     </ul>
+</td>
+</tr></table>
+<div class="box">
+<h2>What You can do on Zope.org</h2>
+<p>    Membership gives you your own home folder on Zope.org where you can create
+    and manage your own Zope objects. The objects you create and maintain will
+    be available to all people who visit Zope.org.</p>
+<p>    Site visitors can find your content using the site search or by browsing 
+    your member folder.</p>
+<p>    Many pages on the zope.org site are generated by search queries - by 
+    providing metadata such as keywords with your content it can appear in 
+    automated site pages such as product or news listings. <a href="/Help">more</a></p>
+</div>
+
+<div class="box">
+
+<h2>Zope Training ...</h2>
+<br><!--
+<div class="eventBox">
+<strong>
+<a href="#"
+ target="_new"> </a>
+</strong>
+<br />
+ <span class="hilite">Month from-to in Location, Country</span>
+</div>
+-->
+
+
+Send your Zope training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+<div class="box">
+
+<h2>Plone Training ...</h2>
+<br> 
+
+
+Send your Plone training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+    </td>
+</tr>
+</table>
+<!-- #BeginLibraryItem "/Library/futtaj.lbi" --><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+<table width="640" border="0" cellspacing="0" cellpadding="0"><tr>
+<td width="87">?@</td>
+    <td width="553" align="center" class="small"> 
+      <p><a href="javascript:history.back();"><img src="http://www.necoro.com/images/back.gif" border="0"></a><br><a href="http://www.necoro.com/home.html">?g?b?v</a>?@?b?@<a href="http://www.necoro.com/photo/index.html">?X?^?W?I</a>?@?b?@<a href="http://www.necoro.com/item/index.html">?l?R??????</a>?@?b?@<a href="http://www.necoro.com/owners/index.html">?I?[?i?[???F??????</a> 
+?@?b?@<a href="http://www.necoro.com/fanland/index.html">?t?@???????h</a> </p>
+      <p><font size="3"><img src="http://www.necoro.com/images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON 
+        Corporation </p>
+    </td>
+  </tr></table>
+<!-- #EndLibraryItem -->
+</body>
+<!-- #EndTemplate -->
+</html>
+

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.theme
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.theme	Mon Oct 30 22:58:02 2006
+++ (empty file)
@@ -1,7 +0,0 @@
-
-<!-- helper file for doing hand transforms with this theme --> 
-
-<blend 
-   theme="http://www.necoro.com/photo/index.html" 
-   baseurl="http://www.necoro.com/photo" 
-   rules="./test-data/necoro/necoro.xml" /> 

Modified: z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/necoro.xml	Mon Oct 30 22:58:02 2006
@@ -3,5 +3,5 @@
 <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
   <xi:include href="standardrules.xml" />
 
-  <replace theme="/html/body/table[1]/tr[2]/td/div" content="//*[@id='portal-columns']" />
+  <replace theme="/html/body/table[1]/tr[2]/td" content="//div[@id='content']//table[@class='columns']//td[@class='main']" />
 </rules>

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/necoro/openplans.html
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/test-data/necoro/openplans.html	Mon Oct 30 22:58:02 2006
+++ (empty file)
@@ -1,648 +0,0 @@
-
-  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-
-
-
-
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      lang="en">
-
-<head>
-    <meta http-equiv="Content-Type"
-          content="text/html;charset=utf-8" />
-
-    <title>
-        NYCSR 
-        &mdash;
-        OpenPlans
-    </title>
-
-    
-    
-      <base href="http://www.openplans.org/projects/nycstreets/project-home/" />
-    
-  
-
-    <meta name="generator" content="Plone - http://plone.org" />
-
-
-
-
-    <!--//openplans JS add//-->
-    <script type="text/javascript" src="http://www.openplans.org/projects/nycstreets/openplans.js"></script>
-
-    <!-- Plone ECMAScripts -->
-    
-        
-            
-                <script type="text/javascript"
-                        src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts6565.js">
-                </script>
-                
-            
-            
-                <script type="text/javascript"
-                        src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts0569.js">
-                </script>
-                
-            
-        
-    
-
-    
-        
-            
-                
-                    
-                    
-                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3910.css); --></style>
-                    
-                    
-                
-            
-            
-                
-                    <link rel="alternate stylesheet"
-                          type="text/css" media="screen"
-                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3993.css"
-                          title="Small Text" />
-                    
-                    
-                
-            
-            
-                
-                    <link rel="alternate stylesheet"
-                          type="text/css" media="screen"
-                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles5069.css"
-                          title="Large Text" />
-                    
-                    
-                
-            
-            
-                
-                    
-                    
-                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles7546.css); --></style>
-
-                    
-                    
-                
-            
-            
-                
-                    <link rel="alternate stylesheet"
-                          type="text/css" media="screen"
-                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3656.css"
-                          title="Small Text" />
-                    
-                    
-                
-            
-            
-                
-                    <link rel="alternate stylesheet"
-                          type="text/css" media="screen"
-                          href="http://www.openplans.org/portal_css/Plone%20Default/ploneStyles8929.css"
-                          title="Large Text" />
-                    
-                    
-                
-            
-            
-                
-                    
-                    
-                        <style type="text/css"><!-- @import url(http://www.openplans.org/portal_css/Plone%20Default/ploneStyles3831.css); --></style>
-                    
-                    
-                
-            
-        
-    
-    
-    <!-- Internet Explorer CSS Fixes + IE7 for compliance fixes (limited set) -->
-    <!--[if lt IE 7]>
-        <style type="text/css" media="all">@import url(http://www.openplans.org/IEFixes.css);</style>
-    <![endif]-->
-
-    <link rel="shortcut icon" type="image/x-icon"
-          href="http://www.openplans.org/favicon.ico" />
-
-    <!-- Put this inside iefixstart to apply the IE7 script. It will be very slow, and currently
-         breaks with plonePrint.css and plonePresentation.css for unknown reasons.
-        <script src="ie7-standard.js" type="text/javascript" tal:attributes="src string:$portal_url/ie7/ie7-standard.js"></script>
-    -->
-
-
-    <link rel="home" href="http://www.openplans.org"
-          title="Front page" />
-    <link rel="search" title="Search this site"
-          href="http://www.openplans.org/search_form" />
-    <link rel="author" title="Author information"
-          href="http://www.openplans.org/author/Jacqueline" />
-    <link rel="contents"
-          href="http://www.openplans.org/sitemap"
-          title="Site Map" />
-    
-    
-
-    
-
-    <link rel="up" href="http://www.openplans.org/projects"
-          title="Up one level" />
-
-    
-
-    <!-- Disable IE6 image toolbar -->
-    <meta http-equiv="imagetoolbar" content="no" />
-
-    
-    
-    
-  
-
-    
-
-    
-    
-    
-    
-    
-    
-
-
-    
-    
-  
-
-    
-    
-    
-
-    
-
-  
-
-
-  </head>
-
-<body class="section-projects" dir="ltr">
-    
-  <div id="visual-portal-wrapper">
-
-    <table id="tablemain">
-      <tbody>
-        <tr>
-          <td id="topleftshadow_out"><div class="fill"></div></td>
-          <td id="topshadow"><div id="topleftshadow_in"></div><div id="toprightshadow_in"></div></td>
-
-          <td id="toprightshadow_out"><div class="fill"></div></td>
-        </tr>
-
-        <tr>
-          <td rowspan="3" id="leftshadow"><div class="fill"></div></td>
-          <td id="headerrow">
-            <div id="portal-top">
-              <div id="portal-header">
-                <a class="hiddenStructure" accesskey="2"
-                   href="http://www.openplans.org/projects/projects/nycstreets/project-home#documentContent">Skip to content</a>
-
-                <a class="hiddenStructure" accesskey="6"
-                   href="http://www.openplans.org/projects/projects/nycstreets/project-home#portlet-navigation-tree">Skip to navigation</a>
-
-		<div style="float:left; clear:both; width: 100%">
-
-                  <!-- div metal:use-macro="here/global_skinswitcher/macros/skin_tabs">
-                       The skin switcher tabs. Based on which role you have, you
-                       get a selection of skins that you can switch between.
-
-                       </div -->
-
-                  <h1 id="portal-logo">
-    <a href="http://www.openplans.org" accesskey="1">OpenPlans</a>
-</h1>
-
-                  
-    <!-- h5 class="hiddenStructure" i18n:translate="heading_sections">Sections</h5 -->
-    <div id="navwrap">
-    <ul id="portal-globalnav">
-        
-	  <li id="portaltab-people" class="plain">
-            <a href="http://www.openplans.org/people">People</a>
-	</li>
-	
-        
-	  <li id="portaltab-projects" class="selected">
-            <a href="http://www.openplans.org/projects">Projects</a>
-
-	</li>
-	
-    </ul>
-    </div>
-	
-	<!--//old links for reference
-	
-	   
-        	<li><a href="#">OpenPlans home |</a></li>
-			<li><a href="#">My Projects or Login |</a></li>
-			<li><a href="#">Logout (only if My Projects is on</a></li>
-			<li id="ts-startproject"><a href="#">Start a Project</a></li>
-	</ul>
-	//-->
-
-
-                  <div id="portal-searchbox">
-    <form name="searchform"
-          action="http://www.openplans.org/search"
-          style="white-space:nowrap"
-          onsubmit="return liveSearchSubmit()">
-
-        <label for="searchGadget" class="hiddenStructure">Search Site</label>
-
-        <div class="LSBox">
-        <input id="searchGadget" tabindex="30001"
-               name="SearchableText" type="text" size="15"
-               title="Search Site" accesskey="4"
-               class="visibility:visible" />
-
-        <input class="searchButton" type="submit"
-               tabindex="30002" value="Search" />
-
-        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
-        </div>
-    </form>
-
-    <div id="portal-advanced-search" class="hiddenStructure">
-
-        <a href="http://www.openplans.org/search_form"
-           accesskey="5">
-            Advanced Search&hellip;
-        </a>
-    </div>
-
-</div>
-		</div>
-              </div>
-	    </div>
-
-          </td>
-          <td rowspan="3" id="rightshadow"><div class="fill"></div></td>
-        </tr>
-        <tr>
-	  <td id="bannerrow">
-	    <div id="banner_header">
-
-    <div id="portal-bannerheader">
-  <table id="ts_bannerheader">
-
-    <tr>
-      <td id="ts-titleheadercol">
-        <div id="ts-titleheader">
-          
-            <a href="http://www.openplans.org/projects/nycstreets">
-              <h1>New York City Streets Renaissance Campaign</h1>
-            </a>
-          
-          
-        </div>
-      </td>
-
-      <td id="project-tabs">
-	<div>
-	  <ul condition="inProject">
-	    
-	      <li>
-		<a href="http://www.openplans.org/projects/nycstreets/contact_project_admins"
-     id="project_tabs-get-involved">Get Involved!</a>
-	      </li>
-	    
-	  </ul>
-	   
-	</div>
-
-      </td>
-      <td id="ts_imagecol"><div id="ts_image"></div></td>
-    </tr>
-  </table>
-</div>
-
-
-  </div>
-	    
-      <!--//
-	  <h5 class="hiddenStructure" i18n:translate="heading_personal_tools">Personal tools</h5>//-->
-      <div id="portal-navigation-personal">
-
-	<div id="portal-personaltools"> 
-	  <ul>
-	    
-	    
-	      <li>
-		<a href="http://www.openplans.org/login_form">
-		  Log in
-		</a>
-	      </li>
-	    
-	    
-	      <li>
-		<a href="http://www.openplans.org/createMember">
-		  Join
-		</a>
-
-	      </li>
-	    
-	</ul></div>
-	
-
-        <div id="portal-breadcrumbs">
-          
-            
-            <ul>
-              <li>
-                <a href="http://www.openplans.org/projects/nycstreets/">Project Home</a>
-              </li>
-              <li>
-
-                <a href="http://www.openplans.org/projects/nycstreets/proj_roster">Project Roster</a>
-              </li>
-            </ul>
-          
-        </div>
-
-      </div>
-     
-          </td>
-        </tr>
-
-        <!--// table row for main content
-            THIS NEVER CHANGES//-->	
-        <tr>
-          <td>
-            <div class="visualClear"><!-- --></div>
-
-            
-            <table id="portal-columns">
-              <tbody>
-                <tr>
-                  
-                  
-                  
-
-                  
-                  <td id="portal-column-content">
-
-                    
-                      <div id="content"
-                           class="documentEditable">
-
-                        
-                          
-
-        <h5 class="hiddenStructure">Views</h5>
-
-        <ul class="contentViews">
-
-            
-              <li id="contentview-view" class="selected">
-                <a href="http://www.openplans.org/projects/nycstreets/project-home">View</a>
-              </li>
-
-            
-            
-              <li id="contentview-edit" class="plain">
-                <a href="http://www.openplans.org/projects/nycstreets/project-home/edit">Edit</a>
-              </li>
-            
-
-        </ul>
-
-    
-
-                          <div class="contentActions">
-
-        
-
-        
-
-        
-
-
-
-
-
-    </div>
-                        
-
-                        <div class="documentContent" id="region-content">
-
-                          <a name="documentContent"></a>
-
-                          
-
-                          
-
-                          
-    
-
-        <div class="documentActions">
-    
-
-    <h5 class="hiddenStructure">Document Actions</h5>
-
-    <ul>
-    
-        <li>
-            <a href="http://www.openplans.org/projects/nycstreets/project-home/sendto_form">
-
-                <img src="http://www.openplans.org/mail_icon.gif"
-                     alt="Send this page to somebody"
-                     title="Send this page to somebody" />
-            </a>
-        </li>
-    
-    
-        <li>
-            <a href="javascript:this.print();">
-
-                <img src="http://www.openplans.org/print_icon.gif"
-                     alt="Print this page"
-                     title="Print this page" />
-            </a>
-        </li>
-
-    
-
-    </ul>
-    
-
-    
-
-</div>
-
-        <h1 class="documentFirstHeading">NYCSR </h1>
-    
-        <div>
-
-    <div class="documentByLine">
-        
-
-        
-
-        <span>
-        last modified
-        </span>
-
-        2006-09-15 11:18
-
-        
-
-        
-
-        
-
-        
-
-        <div class="reviewHistory">
-    
-</div>
-
-    </div>
-
-</div>
-
-        
-    
-
-    
-        <div class="plain">
-            <h2 class="heading"><b>Welcome to the NYC Streets Renaissance Campaign Headquarters</b><br /></h2><h3 class="subheading">The goal of the NYCSR is to tranform New York City streets so that they are safer, more productive and more livable. </h3><p><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Sociable%20Men-1.jpg" height="200" width="314" />  <b><em>Streets can be places for neighbors to meet</em></b></p><p>New York City is defined by its vibrant and diverse streets and neighborhoods. Unfortunately, our neighborhoods and business districts are buckling under increasing amounts of dangerous car and truck  traffic.  Children can no longer 
-  
-     
-      
-	<span class="wicked_resolved"
-       id="text-860339cd275a35aed13ed4d80e8a8ff6">
-
-	  <a href="http://www.openplans.org/projects/nycstreets/play-on-their-own-blocks">
-            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
-    class="chunk">play on their own blocks</span>
-          </a>
-	</span>
-      
-    
-    
-  
-  
-
-, while parents worry about turning cars smashing into baby carriages. Senior citizens are losing their independence, shut up in their homes for fear of crossing the street.   And shoppers and investors are being turned away by chaotic, traffic-choked avenues.  </p><p>This is unacceptable. <strong>The time is long overdue for our great city to strike a better balance between traffic and the needs of pedestrians.   </strong></p><p>The <strong>NYC Streets Renaissance Campaign</strong> aims to: </p><ul type="disc"><li><b>Educate</b> New Yorkers about potential transportation policy changes that will improve quality of life across New York City</li><li><b>Promote</b> a rebalancing of this public space away from private vehicles and toward community needs</li><li><b>Demonstrate</b> the widespread public support for reform on these issues</li><li><b>Tap </b>the potential of New Yorkers to re-imagine their own streets</li></ul><p><strong></strong></p><p><strong>Our Initiatives:</strong></p><ul type="none"><li>Official launch with an <a title="MAS Exhibition Preparations" href="../mas/project-home" target="_self">exhibition</a>/event at the Municipal Arts Society</li><li>Preparation of a multimedia information packet, including a <a title="inclusionletter" href="inclusionletter" target="_self">inclusion letter</a>, a dvd featuring <a title="TOPP: video production" href="../topp-video-production/project-home" target="_self">Clarence's work</a>, and a intro booklet</li><li>Improvements <a title="website building" href="website-building" target="_self">requested</a> for the <a href="http://www.nycsr.org/" target="_self">nycstreets.org </a>homepage</li><li>Host many <a title="Postcard Revised" href="../mas/mas-nycsr-postcard-revision-2.pdf" target="_self">events</a> to supplement our exhibition at the MAS.</li><li>Promote and distribute 
-  
-     
-      
-	<span class="wicked_resolved"
-       id="text-401890cd2f8c74f7d8106ecbddde78fe">
-
-	  <a href="http://www.openplans.org/projects/nycstreets/studies-and-papers">
-            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
-    class="chunk">studies and papers</span>
-          </a>
-	</span>
-      
-    
-    
-  
-  
-
- <a href="../studies-and-papers"></a>that dispel myths of streets and transit in NYC.</li></ul><p></p><p></p><ul type="none"><li>Help neighborhood leaders in the fight for long overdue, common sense improvements to their neighborhood streets</li></ul><p></p><p><strong></strong></p><p><strong>To get involved</strong>, add your ideas for making New York City a better place to live and work to our Taking it Citywide 
-  
-     
-      
-	<span class="wicked_resolved"
-       id="text-215018586e8c7cf5386a1bdcdae59e1a">
-	  <a href="http://www.openplans.org/projects/nycstreets/neighborhoods">
-
-            <img src="http://www.openplans.org/projects/nycstreets/document_icon.gif" /><span
-    class="chunk">Neighborhoods</span>
-          </a>
-	</span>
-      
-    
-    
-  
-  
-
- page, or visit us at <a href="http://www.nycsr.org/involved.php">http://www.nycsr.org/involved.php</a> </p><p></p><p></p><p></p><p></p><p><a title="old landing page" href="old-landing-page" target="_self">old landing page </a><br /></p><p><br /></p><p><strong>Together, we can re-imagine the streets of New York City.</strong></p>
-
-
-<!-- <p>Grand Street Before:<br /><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Grand_street_Before-1.jpg" height="237" width="501" /><br /></p><p></p><p>Grand Street Re-imaged as public space:</p><p><img class="image-inline" src="http://www.openplans.org/projects/nycstreets/Grand_street_AFTER-1.jpg" height="336" width="800" /></p> --> 
-        </div>
-
-        <div class="visualClear"><!-- --></div>
-
-        
-
-	
-	
-
-        
-        <div id="relatedItems">
-    
-        
-            
-        
-    
-</div>
-    
-    
-
-
-                          
-                            <div class="discussion">
-    
-        
-            
-            
-
-        
-    
-</div>
-                          
-
-                        </div>
-
-                      </div>
-
-                    
-                  </td>
-                  
-
-                  
-                  
-                  
-                </tr>
-              </tbody>
-            </table>
-	    
-          </td>
-        </tr>
-
-        <tr>
-          <td id="bottomleftshadow_out"><div class="fill"></div></td>
-
-          <td id="bottomshadow"><div id="bottomleftshadow_in"></div><div id="bottomrightshadow_in"></div></td>
-          <td id="bottomrightshadow_out"><div class="fill"></div></td>
-        </tr>
-
-      </tbody>
-    </table>  
-  </div>
-  
-  <div class="visualClear"><!-- --></div>
-
-</body>
-</html>
-
-

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/out.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/out.html	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,240 @@
+<html>
+<!-- #BeginTemplate "/Templates/photo.dwt" --><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style type="text/css" media="all"> @import url(http://www.zope.org/plone.css?skin=);</style>
+<style type="text/css" media="all">@import url(http://www.zope.org/ploneCustom.css);</style>
+<link rel="Stylesheet" type="text/css" href="http://www.zope.org/ploneNS4.css">
+<link rel="stylesheet" type="text/css" media="print" href="http://www.zope.org/plonePrint.css"><link rel="stylesheet" type="text/css" media="projection" href="http://www.zope.org/plonePresentation.css">
+<link rel="shortcut icon" href="http://www.zope.org/favicon.ico" type="image/x-icon">
+<link rel="home" href="http://www.zope.org" title="Front Page">
+<link rel="search" href="http://www.zope.org/search_form" title="Search this site">
+<!-- #BeginEditable "doctitle" --><!-- #EndEditable --><script language="JavaScript">
+<!--
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+
+
+//-->
+</script><script src="http://www.necoro.com/photo/anime.js"></script><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+<script language="JavaScript">
+<!--
+<!--
+function MM_reloadPage(init) {  //reloads the window if Nav4 resized
+  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
+    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
+  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
+}
+MM_reloadPage(true);
+// -->
+
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+//-->
+</script><script type="text/javascript" src="http://www.zope.org/plone_javascripts.js"></script><script language="javascript" type="text/javascript">
+          function formtooltip(el,flag){}
+        </script><meta http-equiv="imagetoolbar" content="no">
+<title>
+           Zope.org</title>
+</head>
+<body bgcolor="#FFFFFF" text="#000000" onload="MM_preloadImages('../leftnabi/images/left_05.jpg','../leftnabi/images/left_05-over.jpg','../leftnabi/images/left_06.jpg','../leftnabi/images/left_06-over.jpg','../leftnabi/images/left_07.jpg','../leftnabi/images/left_07-over.jpg','images/vp_01-over.jpg')" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<table width="640" border="0" cellspacing="0" cellpadding="0">
+<tr valign="top">
+<td rowspan="2" width="88" align="left">
+<table width="88" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td colspan="2" height="82"><a href="http://www.necoro.com/home.html"><script language="JavaScript"> //necoro random anime
+                        anime_1(Math.random())</script></a></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_02" src="http://www.necoro.com/leftnabi/images/left_02.jpg" width="88" height="1"></td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/photo/index.html"><img name="left_03" src="http://www.necoro.com/leftnabi/images/left_03-over.jpg" width="88" height="73" border="0"></a></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/left_04.jpg" width="1" height="49"></td>
+<td> <a href="http://www.necoro.com/item/index.html" onmouseover="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)" onmouseout="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="http://www.necoro.com/leftnabi/images/left_05.jpg" width="87" height="49" border="0"></a>
+</td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/owners/index.html" onmouseover="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)" onmouseout="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="http://www.necoro.com/leftnabi/images/left_06.jpg" width="88" height="47" border="0"></a></td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/fanland/index.html" onmouseover="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)" onmouseout="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="http://www.necoro.com/leftnabi/images/left_07.jpg" width="88" height="66" border="0"></a></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_08" src="http://www.necoro.com/leftnabi/images/left_08.jpg" width="88" height="59" border="0"></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_09" src="http://www.necoro.com/leftnabi/images/left_09.jpg" width="88" height="62" border="0"></td>
+</tr>
+<tr>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/left_10.jpg" width="1" height="100"></td>
+<td><img src="http://www.necoro.com/leftnabi/images/left_11.jpg" width="87" height="64"></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/left_12.jpg" width="87" height="36"></td>
+</tr>
+</table>
+</td>
+<td>
+<table width="452" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_01.jpg" width="50" height="49"></td>
+<td><img src="http://www.necoro.com/images/tstudio_02.jpg" width="260" height="30" alt="Photo studio"></td>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_03.jpg" width="139" height="49"></td>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_04.jpg" width="103" height="49" alt="omron"></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/top_05.jpg" width="260" height="19"></td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td class="main">
+      <h1>Welcome to Zope.org</h1>
+
+      <div class="hilite">The Web Site for the Zope Community</div>
+
+      <p>Zope is an open source application server for building
+      content management systems, intranets, portals, and custom
+      applications. The Zope community consists of hundreds of
+      companies and thousands of developers all over the world,
+      working on building the platform and Zope applications. Zope is
+      written in Python, a highly-productive, object-oriented
+      scripting language. <a href="/WhatIsZope">more</a></p>
+
+
+     <!--
+     <div class="eventBox">
+       <p><b>Notices go here</b>
+       Notice text
+       </p>
+     </div>
+     -->
+
+      <h2>Zope for...</h2>
+
+<table><tr>
+<td>
+      <ul>
+<li>
+      <strong>New Users</strong>
+              <div class="subitems">
+<a href="http://www.zope.org/WhatIsZope">Introduction To Zope</a>,
+<a href="http://www.python.org/" target="_new">About Python</a>
+        </div>
+      </li>
+     </ul>
+<ul>
+<li>
+      <strong>Web Masters</strong>
+              <div class="subitems">
+
+<a href="http://www.zope.org/Members/shaw/HowTo/ApacheFrontEnd">Using Apache</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/Security.stx">Security</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixA.stx">DTML</a>
+              </div>
+      </li>
+     </ul>
+</td>
+<td>
+     <ul>
+<li>
+      <strong>Product Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Documentation/Books/ZDG/current">Developers Guide</a>,
+<a href="http://www.zope.org/Members/mcdonc/PDG/UnitTesting/view">Unit Testing</a>
+        </div>
+     </li>
+     </ul>
+<ul>
+<li>
+     <strong>Zope Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Products/CMF/">Content Management Framework (CMF)</a>, <br><a href="http://www.zope.org/Products/">Products</a>,
+Using <a href="http://dev.zope.org/CVS/">CVS</a>/<a href="http://dev.zope.org/Subversion/">SVN</a>,
+<a href="http://dev.zope.org/CVS/BugDays">Bug Days</a>
+        </div>
+     </li>
+     </ul>
+</td>
+</tr></table>
+<div class="box">
+<h2>What You can do on Zope.org</h2>
+<p>    Membership gives you your own home folder on Zope.org where you can create
+    and manage your own Zope objects. The objects you create and maintain will
+    be available to all people who visit Zope.org.</p>
+<p>    Site visitors can find your content using the site search or by browsing
+    your member folder.</p>
+<p>    Many pages on the zope.org site are generated by search queries - by
+    providing metadata such as keywords with your content it can appear in
+    automated site pages such as product or news listings. <a href="/Help">more</a></p>
+</div>
+
+<div class="box">
+
+<h2>Zope Training ...</h2>
+<br><!--
+<div class="eventBox">
+<strong>
+<a href="#"
+ target="_new"> </a>
+</strong>
+<br />
+ <span class="hilite">Month from-to in Location, Country</span>
+</div>
+-->
+
+
+Send your Zope training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+<div class="box">
+
+<h2>Plone Training ...</h2>
+<br>
+
+
+Send your Plone training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+    </td>
+</tr>
+</table>
+<!-- #BeginLibraryItem "/Library/futtaj.lbi" --><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+<table width="640" border="0" cellspacing="0" cellpadding="0"><tr>
+<td width="87">???</td>
+    <td width="553" align="center" class="small">
+      <p><a href="javascript:history.back();"><img src="http://www.necoro.com/images/back.gif" border="0"></a><br><a href="http://www.necoro.com/home.html">?????????</a>?????????<a href="http://www.necoro.com/photo/index.html">????????????</a>?????????<a href="http://www.necoro.com/item/index.html">???????????????</a>?????????<a href="http://www.necoro.com/owners/index.html">???????????????????????????</a>
+?????????<a href="http://www.necoro.com/fanland/index.html">??????????????????</a> </p>
+      <p><font size="3"><img src="http://www.necoro.com/images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON
+        Corporation </p>
+    </td>
+  </tr></table>
+<!-- #EndLibraryItem -->
+</body>
+<!-- #EndTemplate -->
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/out.html~
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/out.html~	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,251 @@
+<html>
+<!-- #BeginTemplate "/Templates/photo.dwt" --><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style type="text/css" media="all"> @import url(http://www.zope.org/plone.css?skin=);</style>
+<style type="text/css" media="all">@import url(http://www.zope.org/ploneCustom.css);</style>
+<link rel="Stylesheet" type="text/css" href="http://www.zope.org/ploneNS4.css">
+<link rel="stylesheet" type="text/css" media="print" href="http://www.zope.org/plonePrint.css"><link rel="stylesheet" type="text/css" media="projection" href="http://www.zope.org/plonePresentation.css">
+<link rel="shortcut icon" href="http://www.zope.org/favicon.ico" type="image/x-icon">
+<link rel="home" href="http://www.zope.org" title="Front Page">
+<link rel="search" href="http://www.zope.org/search_form" title="Search this site">
+<!-- #BeginEditable "doctitle" --><!-- #EndEditable --><script language="JavaScript">
+<!--
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+
+
+//-->
+</script><script src="http://www.necoro.com/photo/anime.js"></script><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+<script language="JavaScript">
+<!--
+<!--
+function MM_reloadPage(init) {  //reloads the window if Nav4 resized
+  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
+    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
+  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
+}
+MM_reloadPage(true);
+// -->
+
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+//-->
+</script><script type="text/javascript" src="http://www.zope.org/plone_javascripts.js"></script><script language="javascript" type="text/javascript">
+          function formtooltip(el,flag){}
+        </script><meta http-equiv="imagetoolbar" content="no">
+<title>
+           Zope.org</title>
+</head>
+<body bgcolor="#FFFFFF" text="#000000" onload="MM_preloadImages('../leftnabi/images/left_05.jpg','../leftnabi/images/left_05-over.jpg','../leftnabi/images/left_06.jpg','../leftnabi/images/left_06-over.jpg','../leftnabi/images/left_07.jpg','../leftnabi/images/left_07-over.jpg','images/vp_01-over.jpg')" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<table width="640" border="0" cellspacing="0" cellpadding="0">
+<tr valign="top">
+<td rowspan="2" width="88" align="left">
+<table width="88" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td colspan="2" height="82"><a href="http://www.necoro.com/home.html"><script language="JavaScript"> //necoro random anime
+                        anime_1(Math.random())</script></a></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_02" src="http://www.necoro.com/leftnabi/images/left_02.jpg" width="88" height="1"></td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/photo/index.html"><img name="left_03" src="http://www.necoro.com/leftnabi/images/left_03-over.jpg" width="88" height="73" border="0"></a></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/left_04.jpg" width="1" height="49"></td>
+<td> <a href="http://www.necoro.com/item/index.html" onmouseover="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)" onmouseout="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="http://www.necoro.com/leftnabi/images/left_05.jpg" width="87" height="49" border="0"></a>
+</td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/owners/index.html" onmouseover="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)" onmouseout="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="http://www.necoro.com/leftnabi/images/left_06.jpg" width="88" height="47" border="0"></a></td>
+</tr>
+<tr>
+<td colspan="2"><a href="http://www.necoro.com/fanland/index.html" onmouseover="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)" onmouseout="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="http://www.necoro.com/leftnabi/images/left_07.jpg" width="88" height="66" border="0"></a></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_08" src="http://www.necoro.com/leftnabi/images/left_08.jpg" width="88" height="59" border="0"></td>
+</tr>
+<tr>
+<td colspan="2"><img name="left_09" src="http://www.necoro.com/leftnabi/images/left_09.jpg" width="88" height="62" border="0"></td>
+</tr>
+<tr>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/left_10.jpg" width="1" height="100"></td>
+<td><img src="http://www.necoro.com/leftnabi/images/left_11.jpg" width="87" height="64"></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/left_12.jpg" width="87" height="36"></td>
+</tr>
+</table>
+</td>
+<td>
+<table width="452" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_01.jpg" width="50" height="49"></td>
+<td><img src="http://www.necoro.com/images/tstudio_02.jpg" width="260" height="30" alt="Photo studio"></td>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_03.jpg" width="139" height="49"></td>
+<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_04.jpg" width="103" height="49" alt="omron"></td>
+</tr>
+<tr>
+<td><img src="http://www.necoro.com/leftnabi/images/top_05.jpg" width="260" height="19"></td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td valign="top"> <!-- #BeginEditable "main" -->
+      <script language="JavaScript">
+<!--
+function MM_openBrWindow(theURL,winName,features) { //v2.0
+  window.open(theURL,winName,features);
+}
+//-->
+</script><!-- ImageReady Preload Script (phototop.psd) --><img src="http://www.necoro.com/photo/images/tseisiga.gif" width="300" height="61"><td class="main">
+      <h1>Welcome to Zope.org</h1>
+
+      <div class="hilite">The Web Site for the Zope Community</div>
+
+      <p>Zope is an open source application server for building
+      content management systems, intranets, portals, and custom
+      applications. The Zope community consists of hundreds of
+      companies and thousands of developers all over the world,
+      working on building the platform and Zope applications. Zope is
+      written in Python, a highly-productive, object-oriented
+      scripting language. <a href="/WhatIsZope">more</a></p>
+
+
+     <!--
+     <div class="eventBox">
+       <p><b>Notices go here</b>
+       Notice text
+       </p>
+     </div>
+     -->
+
+      <h2>Zope for...</h2>
+
+<table><tr>
+<td>
+      <ul>
+<li>
+      <strong>New Users</strong>
+              <div class="subitems">
+<a href="http://www.zope.org/WhatIsZope">Introduction To Zope</a>,
+<a href="http://www.python.org/" target="_new">About Python</a>
+        </div>
+      </li>
+     </ul>
+<ul>
+<li>
+      <strong>Web Masters</strong>
+              <div class="subitems">
+
+<a href="http://www.zope.org/Members/shaw/HowTo/ApacheFrontEnd">Using Apache</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/Security.stx">Security</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT</a>,
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixA.stx">DTML</a>
+              </div>
+      </li>
+     </ul>
+</td>
+<td>
+     <ul>
+<li>
+      <strong>Product Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Documentation/Books/ZDG/current">Developers Guide</a>,
+<a href="http://www.zope.org/Members/mcdonc/PDG/UnitTesting/view">Unit Testing</a>
+        </div>
+     </li>
+     </ul>
+<ul>
+<li>
+     <strong>Zope Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Products/CMF/">Content Management Framework (CMF)</a>, <br><a href="http://www.zope.org/Products/">Products</a>,
+Using <a href="http://dev.zope.org/CVS/">CVS</a>/<a href="http://dev.zope.org/Subversion/">SVN</a>,
+<a href="http://dev.zope.org/CVS/BugDays">Bug Days</a>
+        </div>
+     </li>
+     </ul>
+</td>
+</tr></table>
+<div class="box">
+<h2>What You can do on Zope.org</h2>
+<p>    Membership gives you your own home folder on Zope.org where you can create
+    and manage your own Zope objects. The objects you create and maintain will
+    be available to all people who visit Zope.org.</p>
+<p>    Site visitors can find your content using the site search or by browsing
+    your member folder.</p>
+<p>    Many pages on the zope.org site are generated by search queries - by
+    providing metadata such as keywords with your content it can appear in
+    automated site pages such as product or news listings. <a href="/Help">more</a></p>
+</div>
+
+<div class="box">
+
+<h2>Zope Training ...</h2>
+<br><!--
+<div class="eventBox">
+<strong>
+<a href="#"
+ target="_new"> </a>
+</strong>
+<br />
+ <span class="hilite">Month from-to in Location, Country</span>
+</div>
+-->
+
+
+Send your Zope training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+<div class="box">
+
+<h2>Plone Training ...</h2>
+<br>
+
+
+Send your Plone training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+    </td>
+      <!-- #EndEditable -->
+</td>
+</tr>
+</table>
+<!-- #BeginLibraryItem "/Library/futtaj.lbi" --><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+<table width="640" border="0" cellspacing="0" cellpadding="0"><tr>
+<td width="87">???</td>
+    <td width="553" align="center" class="small">
+      <p><a href="javascript:history.back();"><img src="http://www.necoro.com/images/back.gif" border="0"></a><br><a href="http://www.necoro.com/home.html">?????????</a>?????????<a href="http://www.necoro.com/photo/index.html">????????????</a>?????????<a href="http://www.necoro.com/item/index.html">???????????????</a>?????????<a href="http://www.necoro.com/owners/index.html">???????????????????????????</a>
+?????????<a href="http://www.necoro.com/fanland/index.html">??????????????????</a> </p>
+      <p><font size="3"><img src="http://www.necoro.com/images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON
+        Corporation </p>
+    </td>
+  </tr></table>
+<!-- #EndLibraryItem -->
+</body>
+<!-- #EndTemplate -->
+</html>
+
+

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/zope.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/zope.html	Mon Oct 30 22:58:02 2006
@@ -0,0 +1,751 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en">
+
+<head>
+    <meta http-equiv="Content-Type"
+          content="text/html;charset=utf-8" />
+
+    <title>
+           Zope.org</title>
+
+    
+    
+       <base href="http://www.zope.org/" />
+       
+    
+  
+
+
+    <!-- Basic crude style for Netscape4.x - This can be removed
+         if you don't want the special NS4 look - it will still work,
+	 just be plain text instead. -->
+    <link rel="Stylesheet" type="text/css"
+          href="http://www.zope.org/ploneNS4.css" />
+
+    <!-- Main style sheets for CSS2 capable browsers -->
+    <style type="text/css" media="all"> @import url(http://www.zope.org/plone.css?skin=);</style>
+
+    <!-- Custom style sheet if available -->
+    <style type="text/css" media="all">@import url(http://www.zope.org/ploneCustom.css);</style>
+
+    <!-- Style sheet used for printing -->
+    <link rel="stylesheet" type="text/css" media="print"
+          href="http://www.zope.org/plonePrint.css" />
+
+    <!-- Style sheet used for presentations (Opera is the only browser supporting this at the moment) -->
+    <link rel="stylesheet" type="text/css"
+          media="projection"
+          href="http://www.zope.org/plonePresentation.css" />
+
+    <link rel="shortcut icon"
+          href="http://www.zope.org/favicon.ico"
+          type="image/x-icon" />
+
+    <link rel="home" href="http://www.zope.org"
+          title="Front Page" />
+    <link rel="search"
+          href="http://www.zope.org/search_form"
+          title="Search this site" />
+
+    <!-- Disable IE6 image toolbar -->
+    <meta http-equiv="imagetoolbar" content="no" />
+
+    
+    
+  
+
+    
+
+    
+    
+
+    
+  
+
+    
+    
+  
+
+    <!-- Common Plone ECMAScripts -->
+    <script type="text/javascript"
+            src="http://www.zope.org/plone_javascripts.js"></script>
+
+    
+      
+      
+        <script language='javascript' type='text/javascript' >
+          function formtooltip(el,flag){}
+        </script>
+      
+
+    
+</head>
+
+<body>
+
+<div>
+
+     
+
+        <div class="top">
+
+            <div class="searchBox">
+                <form name="searchform"
+                      action="http://www.zope.org/search">
+
+                    <input id="searchGadget"
+                           name="SearchableText" type="text"
+                           size="20" tabindex="30001" />
+
+                    <input class="context searchButton"
+                           type="submit" value="Search"
+                           tabindex="30002" />
+                </form>
+            </div>
+
+            <a href="http://www.zope.org">
+                <img src="http://www.zope.org/logo.gif" class="logo" width="201" height="54" border="0" alt="" />
+            </a>
+        </div>
+
+        <hr size="" class="netscape4" />
+
+        <div class="tabs">
+
+
+        </div>
+
+        <div class="personalBar">&nbsp;
+
+            
+
+            <span>You are not logged in</span>
+
+            
+            <a href="http://www.zope.org/login_form">
+                <img src="http://www.zope.org/linkOpaque.gif" alt="" title="" height="1" width="1" border="0" />
+
+                Log in
+            </a>
+            
+            
+            <a href="http://www.zope.org/portal_form/join_form">
+                <img src="http://www.zope.org/linkOpaque.gif" alt="" title="" height="1" width="1" border="0" />
+
+                Join
+            </a>
+            
+        </div>
+
+        <div class="pathBar">
+
+            
+	    You are here:
+	        
+
+            
+                Home
+            
+
+
+        </div>
+
+        <hr size="" class="netscape4" />
+
+    </div>
+
+
+<table class="columns">
+
+    <tbody>
+        <tr>
+            <td class="left">
+                
+                
+                    <div class="box">
+        <div class="body">
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/Products/">Download</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.org/Products/">Download Zope</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Products/">Zope Products</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Products/CMF/">Zope CMF</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/Resources/">Resources</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.org/Collectors/">Report Bugs</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/MailingLists">Mailing Lists</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/UserGroups/">User Groups</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/License/">License</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/Documentation/">Documentation</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.org/Documentation/Books/ZopeBook/">The Zope Book</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixB.stx">API reference</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT reference</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Documentation/Books/ZDG/">Developer Guide</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Products/CMF/docs/">CMF Documentation</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/Articles/">Zope Articles</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Documentation/How-To/">Zope How-Tos</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.com/about_us/open_source_community/zope_and_python_books.html">Books In Print</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/WhatIsZope">About Zope</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.org/WhatIsZope">What Is Zope?</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/ZopePowered/">Zope Powered Sites</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/About/">About Zope.org</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Help/">Member FAQ</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://www.zope.org/Resources/ZSP/">Business</a>
+	  <ul>
+	     <li>
+               <a href="http://www.zope.com">Zope Corporation</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Resources/ZSP/">Solution Providers</a>
+	    </li>
+	     <li>
+               <a href="http://www.zope.org/Training/">Zope Training</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://dev.zope.org/">Developers</a>
+	  <ul>
+	     <li>
+               <a href="http://dev.zope.org/Projects/">Zope Projects</a>
+	    </li>
+	     <li>
+               <a href="http://wiki.zope.org/zope3/">Zope 3</a>
+	    </li>
+	     <li>
+               <a href="http://dev.zope.org/CVS/">Zope CVS</a>
+	    </li>
+	     <li>
+               <a href="http://dev.zope.org/Subversion/">Zope SVN</a>
+	    </li>
+	  </ul>
+         </li>
+        </ul>
+        <ul>
+	  <li>
+          <a href="http://wiki.zope.org/zope2/Sites">Zope Sites</a>
+	  
+         </li>
+        </ul>
+        </div>
+   </div>
+                
+                
+                
+                
+                
+                    
+
+    <div class="box">
+
+        <h5>Log in</h5>
+
+        <div class="body">
+        
+            <div class="content odd">
+                <form action="http://www.zope.org/logged_in"
+                      id="login_box_form" method="post">
+    
+ 
+                    <strong>Name</strong> <br />
+                    <input type="text" name="__ac_name"
+                           size="12" alt="Username"
+                           title="Username" tabindex="10001" />
+    
+                    <br />
+    
+                    <strong>Password</strong>  <br />
+                    <input type="password"
+                           name="__ac_password" size="12"
+                           alt="Password" title="Password"
+                           tabindex="10002" />
+    
+                    <br />
+                    &nbsp;
+                    <br />
+    
+                    <input class="context searchButton"
+                           type="submit" name="submit"
+                           value="Log in" tabindex="10003" />
+
+                   
+    
+                </form>
+<script type="text/javascript" language="javascript"><!--
+
+function getCookie(cname) {
+  var search = cname + "="
+  if (document.cookie.length > 0) {
+    offset = document.cookie.indexOf(search);
+    if (offset != -1) {
+      offset += search.length;
+      end = document.cookie.indexOf(";", offset);
+      if (end == -1){
+          end = document.cookie.length;
+      }
+      var value = unescape(document.cookie.substring(offset, end));
+      if (value.charAt(0) == '"' && value.charAt(value.length -1) == '"') {
+        value = value.substring(1, value.length -1);
+      }
+      return value;
+    }
+  }
+  return '';
+}
+
+window.document.forms.login_box_form.elements[0].value=getCookie('__ac_name');            
+--></script>
+            </div>
+    
+            <div class="content even"> 
+                <a href="http://www.zope.org/mail_password_form">
+                   <img src="http://www.zope.org/linkTransparent.gif" alt="Link icon" title="Link icon" height="11" width="6" border="0" />
+                   Forgot your password?
+                </a>
+            </div>
+
+            <div class="content odd">
+          
+                <a href="http://www.zope.org/portal_form/join_form">
+                    <img src="http://www.zope.org/linkTransparent.gif" alt="Link icon" title="Link icon" height="11" width="6" border="0" />
+                    New user?
+                </a>
+    
+            </div>
+
+        </div>
+        
+    </div>
+
+
+                
+                
+                
+            </td>
+            <td class="main">
+
+                
+
+                <div class="document">
+
+                    <div id="content">
+
+                        
+    
+
+
+    
+
+
+
+
+                        <div class="documentActions">
+
+                            
+
+                            
+
+                            <a href="javascript:this.print();">
+                                <img alt="Print"
+    src="http://www.zope.org/print_icon.gif"
+    title="Print this page" />
+                            </a>
+                        </div>
+
+                        
+
+                        <div>
+<table class="columns">
+  <tr>
+    <td class="main">
+      <h1>Welcome to Zope.org</h1>
+
+      <div class="hilite">The Web Site for the Zope Community</div>
+
+      <p>Zope is an open source application server for building
+      content management systems, intranets, portals, and custom
+      applications. The Zope community consists of hundreds of
+      companies and thousands of developers all over the world,
+      working on building the platform and Zope applications. Zope is
+      written in Python, a highly-productive, object-oriented
+      scripting language. <a href="/WhatIsZope">more</a></p>
+
+
+     <!-- 
+     <div class="eventBox">
+       <p><b>Notices go here</b> 
+       Notice text
+       </p>
+     </div>
+     -->
+
+      <h2>Zope for...</h2>
+
+<table>
+<tr>
+<td>
+      <ul>
+      <li>
+      <strong>New Users</strong>
+              <div class="subitems">
+<a href="http://www.zope.org/WhatIsZope">Introduction To Zope</a>, 
+<a href="http://www.python.org/" target="_new">About Python</a>
+        </div>
+      </li>
+     </ul>
+     <ul>
+     <li>
+      <strong>Web Masters</strong>
+              <div class="subitems">
+
+<a href="http://www.zope.org/Members/shaw/HowTo/ApacheFrontEnd">Using Apache</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/Security.stx">Security</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixC.stx">ZPT</a>, 
+<a href="http://www.zope.org/Documentation/Books/ZopeBook/current/AppendixA.stx">DTML</a>
+	      </div>
+      </li>
+     </ul>
+</td>
+<td>
+     <ul>
+      <li>
+      <strong>Product Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Documentation/Books/ZDG/current">Developers Guide</a>, 
+<a href="http://www.zope.org/Members/mcdonc/PDG/UnitTesting/view">Unit Testing</a>
+	</div>
+     </li>
+     </ul>
+     <ul>
+     <li>
+     <strong>Zope Developers</strong>
+        <div class="subitems">
+<a href="http://www.zope.org/Products/CMF/">Content Management Framework (CMF)</a>, <br />
+<a href="http://www.zope.org/Products/">Products</a>, 
+Using <a href="http://dev.zope.org/CVS/">CVS</a>/<a href="http://dev.zope.org/Subversion/">SVN</a>, 
+<a href="http://dev.zope.org/CVS/BugDays">Bug Days</a>
+	</div>
+     </li>
+     </ul>
+</td>
+</tr>
+</table>
+
+<div class="box">
+<h2>What You can do on Zope.org</h2>
+<p>    Membership gives you your own home folder on Zope.org where you can create
+    and manage your own Zope objects. The objects you create and maintain will
+    be available to all people who visit Zope.org.</p>
+<p>    Site visitors can find your content using the site search or by browsing 
+    your member folder.</p>
+<p>    Many pages on the zope.org site are generated by search queries - by 
+    providing metadata such as keywords with your content it can appear in 
+    automated site pages such as product or news listings. <a href="/Help">more</a></p>
+</div>
+
+<div class="box">
+
+<h2>Zope Training ...</h2>
+<br> 
+
+<!--
+<div class="eventBox">
+<strong>
+<a href="#"
+ target="_new"> </a>
+</strong>
+<br />
+ <span class="hilite">Month from-to in Location, Country</span>
+</div>
+-->
+
+
+Send your Zope training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+<div class="box">
+
+<h2>Plone Training ...</h2>
+<br> 
+
+
+Send your Plone training announcements to <a href="mailto:webmaster at zope.org">webmaster at zope.org</a>
+
+</div>
+
+    </td>
+
+    <td class="right">
+    <div class="box">
+
+    <div class="box">
+
+        <h5><span>Planets</span></h5>
+	<div class="body">
+	 <div class="content even">
+          <img src="newsitem_icon.gif" />
+	  <a href="http://planet.zope.org">Planet Zope</a>
+	  <div class="boxDetails">Zope related news
+<a href="http://planet.zope.org/planet_rss10.xml">
+               <img src="http://www.zope.org/rss.gif"
+                    alt="RSS Newsfeed" /></a>
+          </div>
+         </div>
+	 <div class="content odd">
+          <img src="newsitem_icon.gif" />
+	  <a href="http://planet.plone.org">Planet Plone</a>
+	  <div class="boxDetails">Plone related news
+<a href="http://planet.plone.org/rss20.xml">
+               <img src="http://www.zope.org/rss.gif"
+                    alt="RSS Newsfeed" /></a>
+          </div>
+	 </div>
+	</div>
+     </div>
+
+    <div class="box">
+
+        <h5><span><a href="http://www.zope.org/News/">News</a>
+            </span>
+            <a href="http://www.zope.org/news.rss">
+               <img src="http://www.zope.org/xml.gif"
+                    alt="RSS Newsfeed" /></a>
+             </h5>
+	<div class="body">
+        
+	<div class="content even">
+        <img src="newsitem_icon.gif" alt="ZopeDictDB 0.1" />
+	<a href="http://www.zope.org/Members/ebrun/ZopeDictDB">
+		      ZopeDictDB 0.1
+	  </a>
+	  <div class="boxDetails">October 30</div>
+
+	</div>
+        
+        
+	<div class="content odd">
+        <img src="newsitem_icon.gif"
+             alt="Russian Zope3 Maillist" />
+	<a href="http://www.zope.org/Members/mkashkin/zope3maillist">
+		      Russian Zope3 Maillist
+	  </a>
+	  <div class="boxDetails">October 26</div>
+
+	</div>
+        
+        
+	<div class="content even">
+        <img src="newsitem_icon.gif"
+             alt="kiss 0.1:  Serve filesystem content, simply" />
+	<a href="http://www.zope.org/Members/tseaver/Projects/kiss-0.1-released">
+		      kiss 0.1:  Serve filesystem content, simply
+	  </a>
+	  <div class="boxDetails">October 17</div>
+
+	</div>
+        
+        
+	<div class="content odd">
+        <img src="newsitem_icon.gif"
+             alt="ZInformixDA 0.3 released" />
+	<a href="http://www.zope.org/Members/nbk/products/zinformixda/0.3/released_news">
+		      ZInformixDA 0.3 released
+	  </a>
+	  <div class="boxDetails">October 16</div>
+
+	</div>
+        
+        
+	<div class="content even">
+        <img src="newsitem_icon.gif"
+             alt="zForum 1.0 Release 16 - Skin Me" />
+	<a href="http://www.zope.org/Members/speedbird/zforum1016">
+		      zForum 1.0 Release 16 - Skin Me
+	  </a>
+	  <div class="boxDetails">October 16</div>
+
+	</div>
+        
+	</div>
+     </div>
+    <div class="box">
+
+        <h5><span><a href="http://www.zope.org/Products">Products</a></span>
+            <a href="http://www.zope.org/products.rss">
+               <img src="http://www.zope.org/xml.gif"
+                    alt="Products RSS" /></a></h5>
+	<div class="body">
+        
+	<div class="content even">
+        <img src="folder_icon.gif" alt="Content Dispatcher" />
+        <a href="http://www.zope.org/Members/ingeniweb2/ContentDispatcher/Content%20Dispatcher">
+		      ContentDispatcher: Dispatch content over many plone sites in one click ! (1.0.1)
+	  </a>
+	  <div class="boxDetails">October 11</div>
+
+	</div>
+        
+        
+	<div class="content odd">
+        <img src="folder_icon.gif" alt="CMF-2.1.0-alpha" />
+        <a href="http://www.zope.org/Products/CMF/CMF-2.1.0-alpha">
+		      Content Management Framework (2.1.0-alpha)
+	  </a>
+	  <div class="boxDetails">October 09</div>
+
+	</div>
+        
+        
+	<div class="content even">
+        <img src="folder_icon.gif" alt="ZopeEditArea 0.1" />
+        <a href="http://www.zope.org/Members/pfurman/ZopeEditArea/ZopeEditArea%200.1">
+		       (0.1)
+	  </a>
+	  <div class="boxDetails">October 08</div>
+
+	</div>
+        
+        
+	<div class="content odd">
+        <img src="folder_icon.gif" alt="2.10.0" />
+        <a href="http://www.zope.org/Products/Zope/2.10.0">
+		      Zope (2_10_0-final)
+	  </a>
+	  <div class="boxDetails">October 03</div>
+
+	</div>
+        
+        
+	<div class="content even">
+        <img src="folder_icon.gif" alt="3.2.2" />
+        <a href="http://www.zope.org/Products/Zope3/3.2.2">
+		      Zope 3 (3.2.2)
+	  </a>
+	  <div class="boxDetails">October 02</div>
+
+	</div>
+        
+	</div>
+     </div>
+</div>
+
+   </td>
+  </tr>
+</table>
+</div>
+
+                        
+                        <div>
+    
+</div>
+                        
+                    </div>
+                </div>
+            </td>
+
+            
+        </tr>
+    </tbody>
+</table>
+
+<hr size="" class="netscape4" />
+
+<div class="footer">
+
+Copyright (c) 2006 Zope Corporation. All rights reserved.
+<a href="http://www.zope.com/about_us/legal/legal_notice.html">Legal</a> | <a href="mailto:webmaster at zope.org">Contact</a>
+
+<hr size="" class="netscape4" />
+
+<strong class="netscape4">
+If you can read this text, it means you are not experiencing the Plone design at its best.
+Plone makes heavy use of CSS, which means it is accessible to any internet browser, 
+but the design needs a 
+<a href="http://www.webstandards.org/upgrade/">standards-compliant browser to look like we intended it</a>. 
+Just so you know ;)
+</strong>
+
+<!-- Start Google Analytics, JV 2006/07/20 -->
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-481514-2";
+urchinTracker();
+</script>
+<!-- End Google Analytics -->
+ 
+</div>
+
+</body>
+</html>
+
+
+

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Mon Oct 30 22:58:02 2006
@@ -10,10 +10,14 @@
 static_data = os.path.join(os.path.dirname(__file__), 'test-data', 'static')
 tasktracker_data = os.path.join(os.path.dirname(__file__), 'test-data', 'tasktracker')
 nycsr_data = os.path.join(os.path.dirname(__file__), 'test-data', 'nycsr')
+necoro_data = os.path.join(os.path.dirname(__file__), 'test-data', 'necoro')
+guidesearch_data = os.path.join(os.path.dirname(__file__), 'test-data', 'guidesearch')
 
 static_app = StaticURLParser(static_data)
 tasktracker_app = StaticURLParser(tasktracker_data)
 nycsr_app = StaticURLParser(nycsr_data)
+necoro_app = StaticURLParser(necoro_data)
+guidesearch_app = StaticURLParser(guidesearch_data)
 
 
 def html_string_compare(astr, bstr):
@@ -85,8 +89,23 @@
     html_string_compare(res.body, res2.body)
 
 
+def do_necoro(renderer_type):
+    wsgi_app = DeliveranceMiddleware(necoro_app, 'http://www.necoro.com/photo/index.html','necoro.xml', renderer_type)
+    app = TestApp(wsgi_app)
+    res = app.get('/zope.html')
+    res2 = app.get('/expected.html?notheme')
+    html_string_compare(res.body, res2.body)
+
+def do_guidesearch(renderer_type):
+    wsgi_app = DeliveranceMiddleware(guidesearch_app, 'http://www.guidesearch.jp/index.php?language=schinese','guidesearch.xml', renderer_type)
+    app = TestApp(wsgi_app)
+    res = app.get('/zope.html')
+    res2 = app.get('/expected.html?notheme')
+    html_string_compare(res.body, res2.body)
+
+
 RENDERER_TYPES = ['py','xslt']
-TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr ]
+TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch ]
 def test_all():
     for renderer_type in RENDERER_TYPES:
         for test_func in TEST_FUNCS: 

From cabraham at codespeak.net  Tue Oct 31 17:56:11 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Tue, 31 Oct 2006 17:56:11 +0100 (CET)
Subject: [z3-checkins] r33970 - in
	z3/deliverance/branches/packaged/deliverance: .
	test-data/guidesearch test-data/necoro
Message-ID: <20061031165611.DB3EF10076@code0.codespeak.net>

Author: cabraham
Date: Tue Oct 31 17:56:07 2006
New Revision: 33970

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/theme.html
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/theme.html
Modified:
   z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
fixed up tests for foreign character encodings

Modified: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/expected.html	Tue Oct 31 17:56:07 2006
@@ -18,7 +18,7 @@
 
 function restChar(txtarea,maxlength) {
   len = txtarea.value.length;
-  if(len > maxlength) alert("max length "+maxlength+" ---------");
+  if(len > maxlength) alert("max length "+maxlength+" .........");
   txtarea.innerText = txtarea.value.substring(0, maxlength);
 }
 
@@ -39,7 +39,7 @@
 ?????????????????????????????????????????????????????????????????????????????????????????????????????????<br>????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????</p>
   <ul>
 <li>
-<a href="http://www.guidesearch.jp/search/search.php?language=schinese">????????????????????????</a>
+<a href="http://localhost/search/search.php?language=schinese">????????????????????????</a>
   </li>
     </ul>
 </div>
@@ -53,8 +53,8 @@
 </form>
   </div>
     <div id="copy">
-  <a href="http://www.guidesearch.jp/about.php?language=schinese">????????????  &gt;&gt;</a>
-  <a href="http://www.guidesearch.jp/priv.php?language=schinese">??????????????????  &gt;&gt;</a>
+  <a href="http://localhost/about.php?language=schinese">????????????  &gt;&gt;</a>
+  <a href="http://localhost/priv.php?language=schinese">??????????????????  &gt;&gt;</a>
   <a href="http://www.mlit.go.jp/sogoseisaku/kanko/english/">???????????????(english)</a>
     </div>
   </div>

Added: z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/guidesearch/theme.html	Tue Oct 31 17:56:07 2006
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
+<meta name='author' content='????????????????????' />
+<meta name='copyright' content='??????????????????????????' />
+<meta name='description' content='????????????????????' />
+<meta name='generator' content='GUIDE 0.5.0' />
+
+<title>????????????????????</title>
+<script type='text/javascript'>
+<!--
+
+function restChar(txtarea,maxlength) {
+  len = txtarea.value.length;
+  if(len > maxlength) alert("max length "+maxlength+" .........");
+  txtarea.innerText = txtarea.value.substring(0, maxlength);
+}
+
+//-->
+</script>
+<link rel='stylesheet' type='text/css' media='all' href='http://www.guidesearch.jp/css/top_schinese.css' />
+
+<div id="wrapper">
+  <div id="mainpic">
+  <h1>????????????????????</h1>
+  <div id="mainbox">
+  <p>????????????????????????1949????????210??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????<br>
+??????????????????????????????????????????????????????????????????????<br>????????????????????????????????????????????????????????????????????????????????????????</p>
+  <ul>
+  <li><a href="./search/search.php?language=schinese">????????????????</a>
+  </li>
+    </ul>
+  </div>
+<div id="lang">    
+  <form name="top" action="/index.php" method="POST">
+    <select name="language">
+      <option value="japanese" >????</option>
+      <option value="english">English</option>
+      <option value="korean">Korean</option>
+      <option value="schinese" selected>Simple Chinese</option>
+      <option value="tchinese">Traditional Chinese</option>
+    </select>
+    <input name="change_language" type="submit" value="Change" />
+  </form>
+  </div>
+    <div id="copy">
+  <a href="./about.php?language=schinese">????????  >></a>
+  <a href="./priv.php?language=schinese">????????????  >></a>
+  <a href="http://www.mlit.go.jp/sogoseisaku/kanko/english/">??????????(english)</a>
+    </div>
+  </div>
+</div>
+
+<center>Special URL<br>Admin URL<a href="admin/index.php">Admin</a><br>User URL<a href="user/user.php">User</a><br></center><center>
+<br />Powered by&nbsp;GUIDE 0.5.0 &copy; 2006 <a href='http://www.jga21c.or.jp/' target='_blank'>The Guide-Interpreter Search System</a>
+</center>
+</body>
+</html>

Modified: z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/expected.html	Tue Oct 31 17:56:07 2006
@@ -33,9 +33,9 @@
 
 
 //-->
-</script><script src="http://www.necoro.com/photo/anime.js"></script><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+</script><script src="http://localhost/anime.js"></script><link rel="stylesheet" href="http://localhost/../css.css" type="text/css">
 <script language="JavaScript">
-<!--
+
 <!--
 function MM_reloadPage(init) {  //reloads the window if Nav4 resized
   if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
@@ -61,51 +61,51 @@
 <td rowspan="2" width="88" align="left">
 <table width="88" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td colspan="2" height="82"><a href="http://www.necoro.com/home.html"><script language="JavaScript"> //necoro random anime
+<td colspan="2" height="82"><a href="http://localhost/../home.html"><script language="JavaScript"> //necoro random anime
 			anime_1(Math.random())</script></a></td>
 </tr>
 <tr>
-<td colspan="2"><img name="left_02" src="http://www.necoro.com/leftnabi/images/left_02.jpg" width="88" height="1"></td>
+<td colspan="2"><img name="left_02" src="http://localhost/../leftnabi/images/left_02.jpg" width="88" height="1"></td>
 </tr>
 <tr>
-<td colspan="2"><a href="http://www.necoro.com/photo/index.html"><img name="left_03" src="http://www.necoro.com/leftnabi/images/left_03-over.jpg" width="88" height="73" border="0"></a></td>
+<td colspan="2"><a href="http://localhost/index.html"><img name="left_03" src="http://localhost/../leftnabi/images/left_03-over.jpg" width="88" height="73" border="0"></a></td>
 </tr>
 <tr>
-<td><img src="http://www.necoro.com/leftnabi/images/left_04.jpg" width="1" height="49"></td>
-<td> <a href="http://www.necoro.com/item/index.html" onmouseover="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)" onmouseout="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="http://www.necoro.com/leftnabi/images/left_05.jpg" width="87" height="49" border="0"></a>
+<td><img src="http://localhost/../leftnabi/images/left_04.jpg" width="1" height="49"></td>
+<td> <a href="http://localhost/../item/index.html" onmouseover="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)" onmouseout="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="http://localhost/../leftnabi/images/left_05.jpg" width="87" height="49" border="0"></a>
 </td>
 </tr>
 <tr>
-<td colspan="2"><a href="http://www.necoro.com/owners/index.html" onmouseover="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)" onmouseout="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="http://www.necoro.com/leftnabi/images/left_06.jpg" width="88" height="47" border="0"></a></td>
+<td colspan="2"><a href="http://localhost/../owners/index.html" onmouseover="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)" onmouseout="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="http://localhost/../leftnabi/images/left_06.jpg" width="88" height="47" border="0"></a></td>
 </tr>
 <tr>
-<td colspan="2"><a href="http://www.necoro.com/fanland/index.html" onmouseover="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)" onmouseout="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="http://www.necoro.com/leftnabi/images/left_07.jpg" width="88" height="66" border="0"></a></td>
+<td colspan="2"><a href="http://localhost/../fanland/index.html" onmouseover="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)" onmouseout="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="http://localhost/../leftnabi/images/left_07.jpg" width="88" height="66" border="0"></a></td>
 </tr>
 <tr>
-<td colspan="2"><img name="left_08" src="http://www.necoro.com/leftnabi/images/left_08.jpg" width="88" height="59" border="0"></td>
+<td colspan="2"><img name="left_08" src="http://localhost/../leftnabi/images/left_08.jpg" width="88" height="59" border="0"></td>
 </tr>
 <tr>
-<td colspan="2"><img name="left_09" src="http://www.necoro.com/leftnabi/images/left_09.jpg" width="88" height="62" border="0"></td>
+<td colspan="2"><img name="left_09" src="http://localhost/../leftnabi/images/left_09.jpg" width="88" height="62" border="0"></td>
 </tr>
 <tr>
-<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/left_10.jpg" width="1" height="100"></td>
-<td><img src="http://www.necoro.com/leftnabi/images/left_11.jpg" width="87" height="64"></td>
+<td rowspan="2"><img src="http://localhost/../leftnabi/images/left_10.jpg" width="1" height="100"></td>
+<td><img src="http://localhost/../leftnabi/images/left_11.jpg" width="87" height="64"></td>
 </tr>
 <tr>
-<td><img src="http://www.necoro.com/leftnabi/images/left_12.jpg" width="87" height="36"></td>
+<td><img src="http://localhost/../leftnabi/images/left_12.jpg" width="87" height="36"></td>
 </tr>
 </table>
 </td>
 <td> 
 <table width="452" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_01.jpg" width="50" height="49"></td>
-<td><img src="http://www.necoro.com/images/tstudio_02.jpg" width="260" height="30" alt="Photo studio"></td>
-<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_03.jpg" width="139" height="49"></td>
-<td rowspan="2"><img src="http://www.necoro.com/leftnabi/images/top_04.jpg" width="103" height="49" alt="omron"></td>
+<td rowspan="2"><img src="http://localhost/../leftnabi/images/top_01.jpg" width="50" height="49"></td>
+<td><img src="http://localhost/../images/tstudio_02.jpg" width="260" height="30" alt="Photo studio"></td>
+<td rowspan="2"><img src="http://localhost/../leftnabi/images/top_03.jpg" width="139" height="49"></td>
+<td rowspan="2"><img src="http://localhost/../leftnabi/images/top_04.jpg" width="103" height="49" alt="omron"></td>
 </tr>
 <tr>
-<td><img src="http://www.necoro.com/leftnabi/images/top_05.jpg" width="260" height="19"></td>
+<td><img src="http://localhost/../leftnabi/images/top_05.jpg" width="260" height="19"></td>
 </tr>
 </table>
 </td>
@@ -225,13 +225,13 @@
     </td>
 </tr>
 </table>
-<!-- #BeginLibraryItem "/Library/futtaj.lbi" --><link rel="stylesheet" href="http://www.necoro.com/css.css" type="text/css">
+<!-- #BeginLibraryItem "/Library/futtaj.lbi" --><link rel="stylesheet" href="http://localhost/../css.css" type="text/css">
 <table width="640" border="0" cellspacing="0" cellpadding="0"><tr>
 <td width="87">??@</td>
     <td width="553" align="center" class="small"> 
-      <p><a href="javascript:history.back();"><img src="http://www.necoro.com/images/back.gif" border="0"></a><br><a href="http://www.necoro.com/home.html">??g??b??v</a>??@??b??@<a href="http://www.necoro.com/photo/index.html">??X??^??W??I</a>??@??b??@<a href="http://www.necoro.com/item/index.html">??l??R????????????</a>??@??b??@<a href="http://www.necoro.com/owners/index.html">??I??[??i??[??????F????????????</a> 
-??@??b??@<a href="http://www.necoro.com/fanland/index.html">??t??@??????????????h</a> </p>
-      <p><font size="3"><img src="http://www.necoro.com/images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON 
+      <p><a href="javascript:history.back();"><img src="http://localhost/../images/back.gif" border="0"></a><br><a href="http://localhost/../home.html">??g??b??v</a>??@??b??@<a href="http://localhost/index.html">??X??^??W??I</a>??@??b??@<a href="http://localhost/../item/index.html">??l??R????????????</a>??@??b??@<a href="http://localhost/../owners/index.html">??I??[??i??[??????F????????????</a> 
+??@??b??@<a href="http://localhost/../fanland/index.html">??t??@??????????????h</a> </p>
+      <p><font size="3"><img src="http://localhost/../images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON 
         Corporation </p>
     </td>
   </tr></table>

Added: z3/deliverance/branches/packaged/deliverance/test-data/necoro/theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/necoro/theme.html	Tue Oct 31 17:56:07 2006
@@ -0,0 +1,230 @@
+<html><!-- #BeginTemplate "/Templates/photo.dwt" -->
+<head>
+<!-- #BeginEditable "doctitle" --> 
+<title>?l?R???X?^?W?I</title>
+<!-- #EndEditable --> 
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<script language="JavaScript">
+<!--
+
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+
+
+//-->
+</script>
+<script src="anime.js"></script>
+<link rel="stylesheet" href="../css.css" type="text/css">
+<script language="JavaScript">
+
+<!--
+function MM_reloadPage(init) {  //reloads the window if Nav4 resized
+  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
+    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
+  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
+}
+MM_reloadPage(true);
+// -->
+
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+//-->
+</script>
+</head>
+<body bgcolor="#FFFFFF" text="#000000" onLoad="MM_preloadImages('../leftnabi/images/left_05.jpg','../leftnabi/images/left_05-over.jpg','../leftnabi/images/left_06.jpg','../leftnabi/images/left_06-over.jpg','../leftnabi/images/left_07.jpg','../leftnabi/images/left_07-over.jpg','images/vp_01-over.jpg')" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<table width="640" border="0" cellspacing="0" cellpadding="0">
+<tr valign="top"> 
+<td rowspan="2" width="88" align="left">
+<table width=88 border=0 cellpadding=0 cellspacing=0>
+<tr> 
+<td colspan=2 height="82"><a href="../home.html"><script language="JavaScript"> //necoro random anime
+			anime_1(Math.random())</script></a></td>
+</tr>
+<tr> 
+<td colspan=2><img name="left_02" src="../leftnabi/images/left_02.jpg" width=88 height=1></td>
+</tr>
+<tr> 
+<td colspan=2><a href="index.html"><img name="left_03" src="../leftnabi/images/left_03-over.jpg" width=88 height=73 border=0></a></td>
+</tr>
+<tr> 
+<td><img src="../leftnabi/images/left_04.jpg" width=1 height=49></td>
+<td> <a href="../item/index.html"
+				onMouseOver="MM_swapImage('left_05','','../leftnabi/images/left_05-over.jpg',1)"
+				onMouseOut="MM_swapImage('left_05','','../leftnabi/images/left_05.jpg',1)"><img name="left_05" src="../leftnabi/images/left_05.jpg" width=87 height=49 border=0></a></td>
+</tr>
+<tr> 
+<td colspan=2><a href="../owners/index.html"
+				onMouseOver="MM_swapImage('left_06','','../leftnabi/images/left_06-over.jpg',1)"
+				onMouseOut="MM_swapImage('left_06','','../leftnabi/images/left_06.jpg',1)"><img name="left_06" src="../leftnabi/images/left_06.jpg" width=88 height=47 border=0></a></td>
+</tr>
+<tr> 
+<td colspan=2><a href="../fanland/index.html"
+				onMouseOver="MM_swapImage('left_07','','../leftnabi/images/left_07-over.jpg',1)"
+				onMouseOut="MM_swapImage('left_07','','../leftnabi/images/left_07.jpg',1)"><img name="left_07" src="../leftnabi/images/left_07.jpg" width=88 height=66 border=0></a></td>
+</tr>
+<tr> 
+<td colspan=2><img name="left_08" src="../leftnabi/images/left_08.jpg" width=88 height=59 border=0></td>
+</tr>
+<tr> 
+<td colspan=2><img name="left_09" src="../leftnabi/images/left_09.jpg" width=88 height=62 border=0></td>
+</tr>
+<tr> 
+<td rowspan=2><img src="../leftnabi/images/left_10.jpg" width=1 height=100></td>
+<td><img src="../leftnabi/images/left_11.jpg" width=87 height=64></td>
+</tr>
+<tr> 
+<td><img src="../leftnabi/images/left_12.jpg" width=87 height=36></td>
+</tr>
+</table>
+</td>
+<td> 
+<table width=452 border=0 cellpadding=0 cellspacing=0>
+<tr> 
+<td rowspan=2><img src="../leftnabi/images/top_01.jpg" width=50 height=49></td>
+<td><img src="../images/tstudio_02.jpg" width=260 height=30 alt="Photo studio"></td>
+<td rowspan=2><img src="../leftnabi/images/top_03.jpg" width=139 height=49></td>
+<td rowspan=2><img src="../leftnabi/images/top_04.jpg" width=103 height=49 alt="omron"></td>
+</tr>
+<tr> 
+<td><img src="../leftnabi/images/top_05.jpg" width=260 height=19></td>
+</tr>
+</table>
+</td>
+</tr>
+<tr> 
+<td valign="top"> <!-- #BeginEditable "main" --> 
+      <script language="JavaScript">
+<!--
+function MM_openBrWindow(theURL,winName,features) { //v2.0
+  window.open(theURL,winName,features);
+}
+//-->
+</script>
+      <!-- ImageReady Preload Script (phototop.psd) -->
+      <img src="images/tseisiga.gif" width="300" height="61"> 
+      <DIV ALIGN="CENTER"> 
+        <SCRIPT LANGUAGE="JavaScript">
+<!--
+
+function newImage(arg) {
+	if (document.images) {
+		rslt = new Image();
+		rslt.src = arg;
+		return rslt;
+	}
+}
+
+function changeImages() {
+	if (document.images && (preloadFlag == true)) {
+		for (var i=0; i<changeImages.arguments.length; i+=2) {
+			document[changeImages.arguments[i]].src = changeImages.arguments[i+1];
+		}
+	}
+}
+
+var preloadFlag = false;
+function preloadImages() {
+	if (document.images) {
+		photo_index_01_over = newImage("images/photo_index_01-over.gif");
+		photo_index_04_over = newImage("images/photo_index_04-over.gif");
+		preloadFlag = true;
+	}
+}
+
+// -->
+</SCRIPT>
+        <!-- End Preload Script -->
+        <SCRIPT LANGUAGE="JavaScript">
+<!--
+    preloadImages();
+// -->
+</SCRIPT>
+        <!-- ImageReady Slices (phototop.psd) -->
+        <TABLE WIDTH=463 BORDER=0 CELLPADDING=0 CELLSPACING=0>
+          <TR> 
+            <TD> <A HREF="#" onClick="MM_openBrWindow('./swf/flash_index.html','flash','toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=640,height=480')"
+				onMouseOver="changeImages('photo_index_01', 'images/photo_index_01-over.gif'); return true;"
+				onMouseOut="changeImages('photo_index_01', 'images/photo_index_01.gif'); return true;"><IMG NAME="photo_index_01" SRC="images/photo_index_01.gif" WIDTH=242 HEIGHT=77 BORDER=0></A></TD>
+            <TD ROWSPAN=2> <IMG SRC="images/photo_index_02.gif" WIDTH=221 HEIGHT=125></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=77></TD>
+          </TR>
+          <TR> 
+            <TD ROWSPAN=3> <A HREF="#" onClick="MM_openBrWindow('./swf/flash_index.html','flash','toolbar=yes,location=yes,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=640,height=480')"
+				onMouseOver="changeImages('photo_index_01', 'images/photo_index_01-over.gif'); return true;"
+				onMouseOut="changeImages('photo_index_01', 'images/photo_index_01.gif'); return true;"> 
+              <IMG SRC="images/photo_index_03.jpg" WIDTH=242 HEIGHT=175 BORDER=0></A></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=48></TD>
+          </TR>
+          <TR> 
+            <TD> <A HREF="html_top.html"
+				onMouseOver="changeImages('photo_index_04', 'images/photo_index_04-over.gif'); return true;"
+				onMouseOut="changeImages('photo_index_04', 'images/photo_index_04.gif'); return true;"> 
+              <IMG NAME="photo_index_04" SRC="images/photo_index_04.gif" WIDTH=221 HEIGHT=72 BORDER=0></A></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=72></TD>
+          </TR>
+          <TR> 
+            <TD ROWSPAN=2> <A HREF="html_top.html"
+				onMouseOver="changeImages('photo_index_04', 'images/photo_index_04-over.gif'); return true;"
+				onMouseOut="changeImages('photo_index_04', 'images/photo_index_04.gif'); return true;"> 
+              <IMG SRC="images/photo_index_05.jpg" WIDTH=221 HEIGHT=111 BORDER=0></A></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=55></TD>
+          </TR>
+          <TR> 
+            <TD> <IMG SRC="images/photo_index_06.gif" WIDTH=242 HEIGHT=56></TD>
+            <TD> <IMG SRC="images/spacer.gif" WIDTH=1 HEIGHT=56></TD>
+          </TR>
+        </TABLE>
+        <!-- End ImageReady Slices -->
+        <P><A HREF="http://www.macromedia.com/jp/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"><IMG SRC="../images/flash_get.gif" WIDTH="88" HEIGHT="31" BORDER="0"></A><BR>
+          Flash?????????????????????A<BR>
+          Flash Plugin(ver.5????)???K?v?????B</P>
+        <P align="left"><img src="images/tdouga.gif" width="250" height="61"></P>
+        <table width=320 border=0 cellpadding=0 cellspacing=0>
+          <tr> 
+            <td> <a href="../theater/index.html"
+				onMouseOver="changeImages('vp_01', 'images/vp_01-over.jpg'); return true;"
+				onMouseOut="changeImages('vp_01', 'images/vp_01.jpg'); return true;"> 
+              <img name="vp_01" src="images/vp_01.jpg" width=202 height=32 border=0></a></td>
+            <td rowspan=2> <a href="../theater/index.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('vp_01','','images/vp_01-over.jpg',1)"><img src="images/vp_02.jpg" width=118 height=240 border="0"></a></td>
+          </tr>
+          <tr> 
+            <td> <a href="../theater/index.html" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('vp_01','','images/vp_01-over.jpg',1)"><img src="images/vp_03.jpg" width=202 height=208 border="0"></a></td>
+          </tr>
+        </table>
+        <P align="center">?@</P>
+      </DIV>
+      <!-- #EndEditable --></td>
+</tr>
+</table>
+<!-- #BeginLibraryItem "/Library/futtaj.lbi" -->
+<link rel="stylesheet" href="../css.css" type="text/css">
+<table width="640" border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="87">?@</td>
+    <td width="553" align="center" class="small"> 
+      <p><a href="javascript:history.back();"><img src="../images/back.gif" border="0"></a><br>
+<a href="../home.html">?g?b?v</a>?@?b?@<a href="index.html">?X?^?W?I</a>?@?b?@<A HREF="../item/index.html">?l?R??????</A>?@?b?@<a href="../owners/index.html">?I?[?i?[???F??????</a> 
+?@?b?@<a href="../fanland/index.html">?t?@???????h</a> </p>
+      <p><font size="3"><img src="../images/markc-s2t.gif" width="9" height="9" border="0"></font>OMRON 
+        Corporation </p>
+    </td>
+  </tr>
+</table><!-- #EndLibraryItem --></body>
+<!-- #EndTemplate --></html>

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Tue Oct 31 17:56:07 2006
@@ -90,14 +90,14 @@
 
 
 def do_necoro(renderer_type, name):
-    wsgi_app = DeliveranceMiddleware(necoro_app, 'http://www.necoro.com/photo/index.html','necoro.xml', renderer_type)
+    wsgi_app = DeliveranceMiddleware(necoro_app, 'theme.html','necoro.xml', renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/zope.html')
     res2 = app.get('/expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
 def do_guidesearch(renderer_type, name):
-    wsgi_app = DeliveranceMiddleware(guidesearch_app, 'http://www.guidesearch.jp/index.php?language=schinese','guidesearch.xml', renderer_type)
+    wsgi_app = DeliveranceMiddleware(guidesearch_app, 'theme.html','guidesearch.xml', renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/zope.html')
     res2 = app.get('/expected.html?notheme')

From ltucker at codespeak.net  Tue Oct 31 20:43:42 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue, 31 Oct 2006 20:43:42 +0100 (CET)
Subject: [z3-checkins] r33986 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
Message-ID: <20061031194342.494221005A@code0.codespeak.net>

Author: ltucker
Date: Tue Oct 31 20:43:38 2006
New Revision: 33986

Modified:
   z3/deliverance/branches/packaged/deliverance/interpreter.py
   z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
   z3/deliverance/branches/packaged/deliverance/utils.py
   z3/deliverance/branches/packaged/deliverance/xslt.py
Log:
Drop rules now apply first. Added support for content dropping to xslt renderer. Content dropping happens in as a separate transform of the content. We should look at folding this into the normal transform if possible

Modified: z3/deliverance/branches/packaged/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/interpreter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/interpreter.py	Tue Oct 31 20:43:38 2006
@@ -37,7 +37,14 @@
 
 
     def apply_rules(self, rules, theme, content):
-        for rule in rules:
+
+        drop_rules, other_rules = self.separate_drop_rules(rules)
+
+        # process all drop rules first 
+        for rule in drop_rules:
+            self.apply_rule(rule, theme, content) 
+
+        for rule in other_rules:
             self.apply_rule(rule, theme, content)
 
 
@@ -361,7 +368,7 @@
                 removed = True
             if not removed and rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
                 self.add_to_body_start(
-                    theme, self.format_error("no element found in %s" % context, rule))
+                    theme, self.format_error("no %s matched" % context, rule))
 
     def elements_in(self, els):
         """

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_drop.xml	Tue Oct 31 20:43:38 2006
@@ -136,7 +136,7 @@
      <html>
        <body>
          Dummy Content
-         <div class="deliverance-error">Deliverance error: no element found in theme<br/>rule: &lt;drop theme="//div[@id='foo']"/&gt;
+         <div class="deliverance-error">Deliverance error: no theme matched<br/>rule: &lt;drop theme="//div[@id='foo']"/&gt;
          </div>
        </body>
      </html>
@@ -161,7 +161,7 @@
      <html>
        <body>
          Dummy Content
-         <div class="deliverance-error">Deliverance error: no element found in content<br/>rule: &lt;drop content="//div[@id='foo']"/&gt;
+         <div class="deliverance-error">Deliverance error: no content matched<br/>rule: &lt;drop content="//div[@id='foo']"/&gt;
          </div>
        </body>
      </html>

Modified: z3/deliverance/branches/packaged/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/utils.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/utils.py	Tue Oct 31 20:43:38 2006
@@ -181,6 +181,24 @@
         for el in elts:
             el.attrib[attr] = urlparse.urljoin(base_uri, el.attrib[attr])
 
+    def separate_drop_rules(self, rules):
+        """
+        separates out drop rules from a list of rules, returns two 
+        lists. 
+
+        first the list of all drop rules, second all other rules 
+        order is preserved. 
+        """
+        regular_rules = []
+        drop_rules = []
+        for rule in rules:
+            if rule.tag == self.DROP_RULE_TAG:
+                drop_rules.append(rule)
+            else:
+                regular_rules.append(rule)
+        return drop_rules, regular_rules
+        
+
 
     CSS_URL_PAT = re.compile(r'url\([\"\']*(.*?)[\"\']*\)',re.I)
     CSS_IMPORT_PAT = re.compile(r'\@import\s*[\"\'](.*?)[\"\']',re.I)

Modified: z3/deliverance/branches/packaged/deliverance/xslt.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/xslt.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/xslt.py	Tue Oct 31 20:43:38 2006
@@ -14,6 +14,19 @@
   </xsl:template>
 </xsl:transform>"""
 
+xslt_dropper_skel = """
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!-- match nodes that do dropping are inserted here --> 
+
+  <xsl:template match="node()|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
+  </xsl:template> 
+
+</xsl:transform>
+"""
 
 nsmap = {
     "dv": "http://www.plone.org/deliverance",
@@ -45,7 +58,9 @@
         else:
             self.debug = False
 
+        self.transform_drop = None
         self.apply_rules(self.rules,theme_copy)
+    
         xslt_wrapper = etree.XML(xslt_wrapper_skel)
         insertion_point = xslt_wrapper.xpath("//xsl:transform/xsl:template[@match='/']",
                                              nsmap)[0]
@@ -57,15 +72,29 @@
 
     def render(self,content):
         if content:
+            if self.transform_drop:
+                content = self.transform_drop(content)
+
             return self.transform(content).getroot()
+
         else:
             return self.transform(etree.Element("dummy")).getroot()
 
 
     def apply_rules(self,rules,theme):
-        for rule in rules:
+
+        drop_rules, other_rules = self.separate_drop_rules(rules)
+
+        if len(drop_rules):
+            self.xslt_dropper = etree.XML(xslt_dropper_skel)
+            for rule in drop_rules:
+                self.apply_drop(rule, theme)
+            self.transform_drop = etree.XSLT(self.xslt_dropper)
+
+        for rule in other_rules:
             self.apply_rule(rule,theme)
 
+
     def apply_rule(self,rule,theme):
         if rule.tag == self.APPEND_RULE_TAG:
             self.apply_append(rule,theme)
@@ -214,7 +243,7 @@
                 if rule.get(self.NOCONTENT_KEY) == 'ignore':
                     return 
                 else:
-                    e = self.format_error("no element found in theme", rule)
+                    e = self.format_error("no theme matched", rule)
                     self.add_to_body_start(theme, e)
                     return 
                     
@@ -223,23 +252,16 @@
                 self.attach_text_to_previous(el, el.tail)
                 el.getparent().remove(el)
 
+        if self.RULE_CONTENT_KEY in rule.attrib:
+            drop_template = etree.Element("{%s}template" % nsmap["xsl"])
+            drop_template.set("match", rule.attrib[self.RULE_CONTENT_KEY])
+            self.xslt_dropper[0:0] = [drop_template]
+
+            # add an element that produces an error if 
+            # no content is matched 
+            self.add_conditional_missing_content_error(theme,rule)
 
 
-#         if 'content' in rule.attrib:
-#             self.add_conditional_missing_content_error(theme,rule)
-
-            
-
-#         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
-#         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
-
-
-#         # if content is matched, replace the theme element, otherwise, keep the
-#         # theme element 
-#         choose = self.make_when_otherwise("count(%s)=0" % 
-#                                           rule.attrib[self.RULE_CONTENT_KEY], 
-#                                           copy.deepcopy(theme_el), 
-#                                           copier)
 
 
 

From cabraham at codespeak.net  Tue Oct 31 23:50:03 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Tue, 31 Oct 2006 23:50:03 +0100 (CET)
Subject: [z3-checkins] r33987 -
	z3/deliverance/branches/packaged/deliverance/test-data
Message-ID: <20061031225003.6A76A1005A@code0.codespeak.net>

Author: cabraham
Date: Tue Oct 31 23:49:59 2006
New Revision: 33987

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml
Log:
added AJAX test

Added: z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml	Tue Oct 31 23:49:59 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests that deliverance does not theme content that is not bound in <html> tags 
+ such as in AJAX requests --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme=".//div[@id='foo']" content=".//span[@class='bar']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+     <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content</div></body></html>
+  </theme>
+
+  <content> 
+     <ajax><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></ajax>
+  </content>
+ 
+  <output>
+     <ajax><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></ajax>
+  </output> 
+</deliverance-test>
+
+
+
+</deliverance-test-suite>

From cabraham at codespeak.net  Wed Nov  1 00:08:16 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Wed,  1 Nov 2006 00:08:16 +0100 (CET)
Subject: [z3-checkins] r33988 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
	test-data/ajax
Message-ID: <20061031230816.DCB771005A@code0.codespeak.net>

Author: cabraham
Date: Wed Nov  1 00:08:12 2006
New Revision: 33988

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/ajax/
   z3/deliverance/branches/packaged/deliverance/test-data/ajax/content.html
   z3/deliverance/branches/packaged/deliverance/test-data/ajax/rules.xml
   z3/deliverance/branches/packaged/deliverance/test-data/ajax/theme.html
Removed:
   z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml
Modified:
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
made ajax test wsgi

Added: z3/deliverance/branches/packaged/deliverance/test-data/ajax/content.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/ajax/content.html	Wed Nov  1 00:08:12 2006
@@ -0,0 +1 @@
+<ajax><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></ajax>

Added: z3/deliverance/branches/packaged/deliverance/test-data/ajax/rules.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/ajax/rules.xml	Wed Nov  1 00:08:12 2006
@@ -0,0 +1 @@
+<copy theme=".//div[@id='foo']" content=".//span[@class='bar']" />

Added: z3/deliverance/branches/packaged/deliverance/test-data/ajax/theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/ajax/theme.html	Wed Nov  1 00:08:12 2006
@@ -0,0 +1 @@
+<html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content</div></body></html>

Deleted: /z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml
==============================================================================
--- /z3/deliverance/branches/packaged/deliverance/test-data/test_ajax.xml	Wed Nov  1 00:08:12 2006
+++ (empty file)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deliverance-test-suite>
-
-<!-- tests that deliverance does not theme content that is not bound in <html> tags 
- such as in AJAX requests --> 
-<deliverance-test>
-  <rules xmlns="http://www.plone.org/deliverance">
-    <copy theme=".//div[@id='foo']" content=".//span[@class='bar']" />
-  </rules>
-
-  <theme base="http://example.com"> 
-     <html><head><title>Blah</title></head><body><div></div><div id="foo">Dummy Content</div></body></html>
-  </theme>
-
-  <content> 
-     <ajax><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></ajax>
-  </content>
- 
-  <output>
-     <ajax><body><div class="bar">Real Content</div><span class="bar">1</span><span class="quux">2</span><p>zzz</p><span class="bar">3</span></body></ajax>
-  </output> 
-</deliverance-test>
-
-
-
-</deliverance-test-suite>

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Wed Nov  1 00:08:12 2006
@@ -12,12 +12,14 @@
 nycsr_data = os.path.join(os.path.dirname(__file__), 'test-data', 'nycsr')
 necoro_data = os.path.join(os.path.dirname(__file__), 'test-data', 'necoro')
 guidesearch_data = os.path.join(os.path.dirname(__file__), 'test-data', 'guidesearch')
+ajax_data = os.path.join(os.path.dirname(__file__), 'test-data', 'ajax')
 
 static_app = StaticURLParser(static_data)
 tasktracker_app = StaticURLParser(tasktracker_data)
 nycsr_app = StaticURLParser(nycsr_data)
 necoro_app = StaticURLParser(necoro_data)
 guidesearch_app = StaticURLParser(guidesearch_data)
+ajax_app = StaticURLParser(ajax_data)
 
 
 def html_string_compare(astr, bstr):
@@ -103,6 +105,13 @@
     res2 = app.get('/expected.html?notheme')
     html_string_compare(res.body, res2.body)
 
+def do_ajax(renderer_type, name):
+    wsgi_app = DeliveranceMiddleware(ajax_app, 'theme.html','rules.xml', renderer_type)
+    app = TestApp(wsgi_app)
+    res = app.get('/content.html')
+    res2 = app.get('/content.html?notheme')
+    html_string_compare(res.body, res2.body)
+
 
 RENDERER_TYPES = ['py', 'xslt']
 TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch ] 

From ltucker at codespeak.net  Wed Nov  1 00:17:30 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed,  1 Nov 2006 00:17:30 +0100 (CET)
Subject: [z3-checkins] r33989 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061031231730.687CC1005A@code0.codespeak.net>

Author: ltucker
Date: Wed Nov  1 00:17:28 2006
New Revision: 33989

Modified:
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
preliminary heuristic to ignore ajax responses in the wsgifilter

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Wed Nov  1 00:17:28 2006
@@ -114,7 +114,7 @@
 
 
 RENDERER_TYPES = ['py', 'xslt']
-TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch ] 
+TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch, do_ajax ] 
 def test_all():
     for renderer_type in RENDERER_TYPES:
         for test_func in TEST_FUNCS: 

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Wed Nov  1 00:17:28 2006
@@ -133,12 +133,14 @@
                 self.should_intercept,
                 start_response)
 
-
+            # ignore non-html responses 
             if status is None:
-                # should_intercept returned False
                 return body
 
-            body = self.filter_body(environ, body)
+            # don't theme html snippets 
+            if self.hasHTMLTag(body):
+                body = self.filter_body(environ, body)
+
             replace_header(headers, 'content-length', str(len(body)))
             replace_header(headers, 'content-type', 'text/html; charset=utf-8')
             start_response(status, headers)
@@ -212,6 +214,16 @@
                    loc))
         return body
 
+    HTML_DOC_PAT = re.compile(r"^.*<\s*html(\s*|>).*$",re.I|re.M)
+    def hasHTMLTag(self, body):
+        """
+        a quick and dirty check to see if some text contains 
+        anything that looks like an html tag. This could 
+        certainly be improved if needed or there are 
+        ambiguous tags 
+        """
+        return self.HTML_DOC_PAT.search(body) is not None
+
 def make_filter(app, global_conf,
                 theme_uri=None, rule_uri=None):
     assert theme_uri is not None, (

From ltucker at codespeak.net  Wed Nov  1 23:08:56 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed,  1 Nov 2006 23:08:56 +0100 (CET)
Subject: [z3-checkins] r34049 - z3/deliverance/branches/packaged
Message-ID: <20061101220856.AE04C1006E@code0.codespeak.net>

Author: ltucker
Date: Wed Nov  1 23:08:52 2006
New Revision: 34049

Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
updating and fleshing out the current README

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Wed Nov  1 23:08:52 2006
@@ -1,15 +1,39 @@
 
-See: http://www.openplans.org/projects/deliverance/specification 
+
+See: http://www.openplans.org/projects/deliverance
 for more information
 
-Quick Start to run tests 
--------------------------
 
-The easiest way to get started is to check out the buildout: 
+Contents: 
+* What's Deliverance? 
+* Quick Start to build deliverance 
+* Deliverance Proxy 
+* WSGI Middleware 
+* Command Line Transformations 
+* Simple Tests
+* WSGI Tests 
+* Quick Example
+
+----------------------------------
+What's Deliverance? 
+----------------------------------
+
+Deliverance is a non-invasive mechanism for combining HTML content produced 
+by other systems and normal web pages that typify a desired look and feel 
+(themes) using a set of rules. This approach allows the "branding" aspects 
+of a design to remain separate from content production, allows designers to 
+avoid using and mixing in particular template syntaxes and allows reuse of 
+existing static designs. 
+
+
+-----------------------------------
+Quick Start to build deliverance
+-----------------------------------
 
-svn co https://svn.openplans.org/svn/deliverance.buildout deliverance.buildout
+The easiest way to get started is to checkout the buildout and follow the instructions
+found there. 
 
-If you follow the instructions there. 
+svn co https://svn.openplans.org/svn/deliverance.buildout deliverance.buildout
 
 
 Otherwise to install manually: 
@@ -38,8 +62,63 @@
 
 from the top level checkout directory
 
+----------------------------------------------
+Deliverance Proxy
+----------------------------------------------
+
+The deliverance proxy is a standalone application which serves a "themed" version of some web 
+location given a theme page and a set of rules. 
+
+eg:
+
+deliverance-proxy --serve=localhost:5001 --proxy=localhost:8080 
+                  --theme=http://www.example.org 
+                  --rule=file:///some/path/somerulesfile.xml
+
+provides a themed version of a local webserver at port 8080 served on port 5001. 
+The theme page is http://www.example.org and somerulesfile.xml describes how to 
+put the content from localhost:8080 together with the look of the webpage at 
+http://www.example.org to produce the "themed" result. 
+
+run deliverance-proxy --help for more options 
+
+------------------------------------------------
+WSGI Middleware 
+------------------------------------------------
+
+Deliverance theming can also used directly in a WSGI stack using 
+deliverance.wsgifilter.DeliveranceMiddleware
+
+see deliverance/wsgifilter.py and deliverance/test_wsgi.py for examples. 
+
+
+-------------------------------------------------
+Command Line Transformations 
+-------------------------------------------------
+
+a command line transformation may also be performed using the 
+handtransform.py script. 
+
+run python handtransform.py --help for instructions. The result of the 
+transform is output to standard out. 
+
+To avoid lengthy command lines, the script can accept a file which describes 
+the theme and rules to apply using the -f flag eg: 
+
+python handtransform.py -f ./example.theme http://www.example.org
+
+
+The second argument refers to the content and example.theme contains something like: 
+
+<blend 
+   theme="http://www.example.org" 
+   baseurl="http://www.example.org" 
+   rules="./example-rules.xml" /> 
+
+
+------------------------------------------------
 Simple Tests
-------------
+------------------------------------------------
 
 There are a number of tests in the test-data directory that follow the form:
 
@@ -67,34 +146,95 @@
 
 </deliverance-test-suite>
 
-
+----------------------------------------------
 WSGI Tests 
-----------
+----------------------------------------------
 
 test_wsgi.py contains tests which take the theme and content from the 
 web and local pages found under test-data. 
 
 
-Hand Transform 
---------------
+----------------------------------------------
+Quick Example 
+----------------------------------------------
+
+Deliverance combines a content web page with a theme web page, containing no special markup, 
+according to a set of rules. Example: 
+
+
+This is an unstyled page produced by myBoringTodoList.com/deliverance_user/:  
+this page is the content page: 
+
+<html>
+  <head>
+    <title>my boring todo page</title>
+  <head>
+  <body>
+    <div id="todo">
+      <h1>Things To Do</h1>
+      <ul>
+        <li>Feed the cat</li>
+        <li>Wash the dishes</li>
+      </ul>
+    </div> 
+  </body>
+</html> 
 
-a hand test may also be performed using the handtransform.py script 
-run python handtransform.py --help for instructions. The result of the 
-transform is output to standard out. 
-
-To avoid lengthy command lines, the script can accept a file which describes 
-the theme and rules to apply using the -f flag eg: 
 
-python handtransform.py -f test-data/nycsr/nycsr.theme ./test-data/nycsr/openplans.html
 
-where nycsr.theme contains something like: 
-
-<blend 
-   theme="http://www.nycsr.org" 
-   baseurl="http://www.nycsr.org" 
-   rules="./test-data/nycsr/nycsr.xml" /> 
-
-and the second argument points to the content 
+Here is another web page that typifies how we'd like to see the todo list 
+at excitingHomePage.com/deliverance_user/. 
+this page is the theme: 
+
+<html>
+  <head>
+    <style type="text/css">
+      div {background: #00ffdd;}
+      li {list-style-type: disc;}
+    </style>
+    <title>my exciting home page</title>
+  </head>
+  <body>
+     <h1>Deliverance User's Exciting Page</h1>
+     <div id="wishes">
+       I wish my todo list looked this cool
+     </div>
+  </body> 
+</html>
+
+Here are some deliverance rules that put the todo list into the 
+exciting home page and take away the wish. This tells deliverance
+to replace the "wishes" div in the exciting home page with the 
+"todo" div in the content page. 
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<rules xmlns="http://www.plone.org/deliverance" >
+  <replace theme="//div[@id='wishes']" content="//div[@id='todo']" />
+</rules>
+
+Here is the output: 
+
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <style type="text/css">
+      div {background: #00ffdd;}
+      li {list-style-type: disc;}
+    </style>
+    <title>my exciting home page</title>
+  </head>
+  <body>
+    <h1>Deliverance User's Exciting Page</h1>
+    <div id="todo">
+      <h1>Things To Do</h1>
+      <ul>
+        <li>Feed the cat</li>
+        <li>Wash the dishes</li>
+      <ul>
+    </div>
+  </body>
+</html>
 
+see http://www.openplans.org/projects/deliverance for more information. 
+There are many other examples in deliverance/test-data 

From ltucker at codespeak.net  Thu Nov  2 00:30:08 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu,  2 Nov 2006 00:30:08 +0100 (CET)
Subject: [z3-checkins] r34052 - in
	z3/deliverance/branches/packaged/deliverance: . test-data
	test-data/wsgiurl test-data/wsgiurl/foo test-data/wsgiurl/foo/bar
Message-ID: <20061101233008.E589E1006E@code0.codespeak.net>

Author: ltucker
Date: Thu Nov  2 00:30:05 2006
New Revision: 34052

Added:
   z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/
   z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/
   z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/
   z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url.xml
   z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_content.html
   z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_expected.html
   z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_theme.html
Modified:
   z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml
   z3/deliverance/branches/packaged/deliverance/test_wsgi.py
Log:
more url tests

Modified: z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml	(original)
+++ z3/deliverance/branches/packaged/deliverance/test-data/test_url.xml	Thu Nov  2 00:30:05 2006
@@ -1,6 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deliverance-test-suite>
 
+<deliverance-test>
+<rules xmlns="http://www.plone.org/deliverance">
+</rules>
+
+<theme base="http://www.example.com/foo/bar/" >
+  <html>
+     <head>
+       <style type="text/css">
+         @import url(whatever.css)
+       </style>
+     </head>
+     <body>
+        <a href="quux/zoop">zoop</a>
+     </body>
+  </html>
+</theme>
+
+<content>
+</content>
+
+<output> 
+  <html>
+     <head>
+       <style type="text/css">
+          @import url(http://www.example.com/foo/bar/whatever.css)
+       </style>
+       </head>
+       <body>
+          <a href="http://www.example.com/foo/bar/quux/zoop">zoop</a>
+       </body>
+     </html>
+</output>
+
+</deliverance-test>
+
 <!-- tests url replacement successfully; replaces the relative urls with absolute urls based on <base> if present --> 
 <deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance">

Added: z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url.xml	Thu Nov  2 00:30:05 2006
@@ -0,0 +1,2 @@
+<rules xmlns="http://www.plone.org/deliverance">
+</rules>

Added: z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_content.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_content.html	Thu Nov  2 00:30:05 2006
@@ -0,0 +1,4 @@
+<html>
+<head></head>
+<body></body>
+</html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_expected.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_expected.html	Thu Nov  2 00:30:05 2006
@@ -0,0 +1,11 @@
+  <html>
+     <head>
+       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+       <style type="text/css">
+         @import url(http://localhost/foo/bar/whatever.css)
+       </style>
+     </head>
+     <body>
+        <a href="http://localhost/foo/bar/quux/zoop">zoop</a>
+     </body>
+  </html>

Added: z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/branches/packaged/deliverance/test-data/wsgiurl/foo/bar/test_url_theme.html	Thu Nov  2 00:30:05 2006
@@ -0,0 +1,10 @@
+  <html>
+     <head>
+       <style type="text/css">
+         @import url(whatever.css)
+       </style>
+     </head>
+     <body>
+        <a href="quux/zoop">zoop</a>
+     </body>
+  </html>

Modified: z3/deliverance/branches/packaged/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/test_wsgi.py	Thu Nov  2 00:30:05 2006
@@ -13,6 +13,7 @@
 necoro_data = os.path.join(os.path.dirname(__file__), 'test-data', 'necoro')
 guidesearch_data = os.path.join(os.path.dirname(__file__), 'test-data', 'guidesearch')
 ajax_data = os.path.join(os.path.dirname(__file__), 'test-data', 'ajax')
+url_data = os.path.join(os.path.dirname(__file__), 'test-data', 'wsgiurl')
 
 static_app = StaticURLParser(static_data)
 tasktracker_app = StaticURLParser(tasktracker_data)
@@ -20,6 +21,7 @@
 necoro_app = StaticURLParser(necoro_data)
 guidesearch_app = StaticURLParser(guidesearch_data)
 ajax_app = StaticURLParser(ajax_data)
+url_app = StaticURLParser(url_data)
 
 
 def html_string_compare(astr, bstr):
@@ -112,9 +114,16 @@
     res2 = app.get('/content.html?notheme')
     html_string_compare(res.body, res2.body)
 
+def do_url(renderer_type, name):
+    wsgi_app = DeliveranceMiddleware(url_app, '/foo/bar/test_url_theme.html','/foo/bar/test_url.xml', renderer_type)
+    app = TestApp(wsgi_app)
+    res = app.get('/foo/bar/test_url_content.html')
+    res2 = app.get('/foo/bar/test_url_expected.html?notheme')
+    html_string_compare(res.body,res2.body)
+
 
 RENDERER_TYPES = ['py', 'xslt']
-TEST_FUNCS = [ do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch, do_ajax ] 
+TEST_FUNCS = [ do_url, do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch, do_ajax ] 
 def test_all():
     for renderer_type in RENDERER_TYPES:
         for test_func in TEST_FUNCS: 

From ltucker at codespeak.net  Thu Nov  2 17:43:08 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu,  2 Nov 2006 17:43:08 +0100 (CET)
Subject: [z3-checkins] r34066 - z3/deliverance/branches/packaged/deliverance
Message-ID: <20061102164308.33B2B1006E@code0.codespeak.net>

Author: ltucker
Date: Thu Nov  2 17:43:06 2006
New Revision: 34066

Modified:
   z3/deliverance/branches/packaged/deliverance/fixuplinks.py
Log:
fix reference to CSS_URL_PAT in fixup_css_links, referred to non-existent self

Modified: z3/deliverance/branches/packaged/deliverance/fixuplinks.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/fixuplinks.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/fixuplinks.py	Thu Nov  2 17:43:06 2006
@@ -42,5 +42,5 @@
     els = doc.xpath('//head/style')
     for el in els:
         if el.text:
-            el.text = re.sub(self.CSS_URL_PAT,absuri,el.text)
+            el.text = re.sub(CSS_URL_PAT,absuri,el.text)
 

From cabraham at codespeak.net  Thu Nov  2 17:46:21 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Thu,  2 Nov 2006 17:46:21 +0100 (CET)
Subject: [z3-checkins] r34067 - in z3/deliverance/branches/packaged: .
	deliverance
Message-ID: <20061102164621.B77B21006E@code0.codespeak.net>

Author: cabraham
Date: Thu Nov  2 17:46:18 2006
New Revision: 34067

Modified:
   z3/deliverance/branches/packaged/README.txt
   z3/deliverance/branches/packaged/deliverance/handtransform.py
   z3/deliverance/branches/packaged/setup.py
Log:
made handtransform into an executable, installed in setup.py

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Thu Nov  2 17:46:18 2006
@@ -43,8 +43,8 @@
 
 Create a working enviornment for deliverance and its dependencies:  
 
-workingenv.py deliverance_env
-source deliverance_env/bin/activate
+$ workingenv.py deliverance_env
+$ source deliverance_env/bin/activate
 
 install a recent cvs version of libxml2,libxstl and svn lxml. 
 You are likely to encounter segfaults and other failures if recent versions are not used.

Modified: z3/deliverance/branches/packaged/deliverance/handtransform.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/handtransform.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/handtransform.py	Thu Nov  2 17:46:18 2006
@@ -24,6 +24,20 @@
 
 DEFAULT_BASE_URL = "http://www.example.com"
 
+usage = "usage: %prog [options] <content_url>"
+parser = OptionParser(usage=usage)
+parser.add_option("-t","--theme",dest="theme_url",help="url of theme html")
+parser.add_option("-b","--baseurl",dest="base_url",
+                  help="relative urls in the theme will be made absolute relative to this url [default %default]", 
+                  default=DEFAULT_BASE_URL)
+parser.add_option("-r","--rules",dest="rules_file",
+                  help="path to file containing the deliverance rules to apply")
+parser.add_option("-f","--from-file",dest="blend_file",
+                  help="take theme, baseurl and rules parameters from the referenced file")
+parser.add_option("-R","--renderer",dest="renderer_type",
+                  help="(xslt|py) [default %default]", default="xslt", choices=['xslt','py'])
+
+
 
 def grab_url(url):
     f = urllib.urlopen(url)
@@ -65,23 +79,11 @@
     parser.print_usage()
     sys.exit(0)    
     
-if __name__ == '__main__':
-
+def main(args=None):
+    if args is None:
+        args = sys.argv[1:]
 
-    usage = "usage: %prog [options] <content_url>"
-    parser = OptionParser(usage=usage)
-    parser.add_option("-t","--theme",dest="theme_url",help="url of theme html")
-    parser.add_option("-b","--baseurl",dest="base_url",
-                      help="relative urls in the theme will be made absolute relative to this url [default %default]", 
-                      default=DEFAULT_BASE_URL)
-    parser.add_option("-r","--rules",dest="rules_file",
-                      help="path to file containing the deliverance rules to apply")
-    parser.add_option("-f","--from-file",dest="blend_file",
-                      help="take theme, baseurl and rules parameters from the referenced file")
-    parser.add_option("-R","--renderer",dest="renderer_type",
-                      help="(xslt|py) [default %default]", default="xslt", choices=['xslt','py'])
-
-    (options,args) = parser.parse_args()
+    options,args = parser.parse_args(args)
     
     if len(args) == 0:
         die("no content url specified.",parser)
@@ -120,3 +122,6 @@
 
     print tostring(do_transform(options.renderer_type,theme_url,base_url,rules_file,content_url))
     
+
+if __name__ == '__main__':
+    main()

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Thu Nov  2 17:46:18 2006
@@ -34,6 +34,7 @@
       deliverance-proxy = deliverance.proxycommand:main
       deliverance-tests = deliverance.tests:main
       deliverance-speed = deliverance.test_speed:main
+      deliverance-handtransform = deliverance.handtransform:main
       """,
       )
 

From cabraham at codespeak.net  Thu Nov  2 21:44:51 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Thu,  2 Nov 2006 21:44:51 +0100 (CET)
Subject: [z3-checkins] r34077 - z3/deliverance/branches/packaged
Message-ID: <20061102204451.4311A10063@code0.codespeak.net>

Author: cabraham
Date: Thu Nov  2 21:44:49 2006
New Revision: 34077

Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
touched up README

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Thu Nov  2 21:44:49 2006
@@ -5,7 +5,7 @@
 
 
 Contents: 
-* What's Deliverance? 
+* What is Deliverance? 
 * Quick Start to build deliverance 
 * Deliverance Proxy 
 * WSGI Middleware 
@@ -15,7 +15,7 @@
 * Quick Example
 
 ----------------------------------
-What's Deliverance? 
+What is Deliverance? 
 ----------------------------------
 
 Deliverance is a non-invasive mechanism for combining HTML content produced 
@@ -27,95 +27,103 @@
 
 
 -----------------------------------
-Quick Start to build deliverance
+Quick Start to build Deliverance
 -----------------------------------
 
-The easiest way to get started is to checkout the buildout and follow the instructions
-found there. 
+The easiest way to get Deliverance installed is to checkout the
+buildout and follow the instructions found there.
 
-svn co https://svn.openplans.org/svn/deliverance.buildout deliverance.buildout
+$ svn co https://svn.openplans.org/svn/deliverance.buildout deliverance.buildout
 
 
-Otherwise to install manually: 
+Otherwise, to install Deliverance manually, first get workingenv.py
+from http://cheeseshop.python.org/pypi/workingenv.py. Create a working
+environment for Deliverance and its dependencies:
 
-get workingenv.py from
-http://cheeseshop.python.org/pypi/workingenv.py
-
-Create a working enviornment for deliverance and its dependencies:  
-
-$ workingenv.py deliverance_env
+$ workingenv.py deliverance_env 
 $ source deliverance_env/bin/activate
 
-install a recent cvs version of libxml2,libxstl and svn lxml. 
-You are likely to encounter segfaults and other failures if recent versions are not used.
 
-checkout deliverance: 
-$ svn co http://codespeak.net/svn/z3/deliverance/branches/packaged deliverance
-
-$ cd deliverance
-$ python setup.py develop 
+Then install recent versions of libxml2, libxslt and lxml.  You are
+likely to encounter segfaults and other failures if recent versions
+are not used.
+
+Checkout and setup Deliverance, then make sure your installation is
+complete by running the tests:
+
+$ svn co http://codespeak.net/svn/z3/deliverance/branches/packaged deliverance 
+$ cd deliverance 
+$ python setup.py develop  
 $ nosetests
 
-you can also run: 
-deliverance_env/bin/deliverance-tests 
-deliverance_env/bin/deliverance-speed 
 
-from the top level checkout directory
+You can also run the tests like this:
+
+$ deliverance_env/bin/deliverance-tests 
+$ deliverance_env/bin/deliverance-speed 
+
 
 ----------------------------------------------
 Deliverance Proxy
 ----------------------------------------------
 
-The deliverance proxy is a standalone application which serves a "themed" version of some web 
-location given a theme page and a set of rules. 
+The deliverance proxy is a standalone application which serves a
+themed version of some web location using a theme and a set of rules.
 
 eg:
+$ deliverance-proxy --serve=localhost:5001 --proxy=localhost:8080 
+		--theme=http://www.example.org 
+		--rule=file:///some/path/somerulesfile.xml
+
+This example provides a themed version of a local webserver at port
+8080 served on port 5001. The theme page is http://www.example.org and
+the rules are specified in somerulesfile.xml.
+
+For more options, run:
 
-deliverance-proxy --serve=localhost:5001 --proxy=localhost:8080 
-                  --theme=http://www.example.org 
-                  --rule=file:///some/path/somerulesfile.xml
-
-provides a themed version of a local webserver at port 8080 served on port 5001. 
-The theme page is http://www.example.org and somerulesfile.xml describes how to 
-put the content from localhost:8080 together with the look of the webpage at 
-http://www.example.org to produce the "themed" result. 
+$ deliverance-proxy --help 
 
-run deliverance-proxy --help for more options 
 
 ------------------------------------------------
 WSGI Middleware 
 ------------------------------------------------
 
-Deliverance theming can also used directly in a WSGI stack using 
-deliverance.wsgifilter.DeliveranceMiddleware
-
-see deliverance/wsgifilter.py and deliverance/test_wsgi.py for examples. 
+Deliverance can also be used directly in a WSGI stack using the python
+class in deliverance.wsgifilter.DeliveranceMiddleware.  See
+deliverance/wsgifilter.py and deliverance/test_wsgi.py for examples.
+ 
 
 
 -------------------------------------------------
 Command Line Transformations 
 -------------------------------------------------
 
-a command line transformation may also be performed using the 
-handtransform.py script. 
 
-run python handtransform.py --help for instructions. The result of the 
-transform is output to standard out. 
+The command line tool used to execute Deliverance is called
+deliverance-handtransform.  For instructions, run:
+
+$ deliverance-handtransform --help 
 
-To avoid lengthy command lines, the script can accept a file which describes 
-the theme and rules to apply using the -f flag eg: 
+The theme, rules and other parameters are specified using command line
+options -t, -r, etc.  The result of the transform is output to
+standard out.
 
-python handtransform.py -f ./example.theme http://www.example.org
+To avoid lengthy command lines, the tool can accept a "blend" file,
+using the -f flag, which describes the theme and rules to apply.
 
+eg:
+
+$ deliverance-handtransform -f ./blendfile.xml http://www.example.org
 
-The second argument refers to the content and example.theme contains something like: 
+The second argument refers to the content; blendfile.xml contains
+something like:
 
-<blend 
-   theme="http://www.example.org" 
+<blend theme="http://www.example.org" 
    baseurl="http://www.example.org" 
    rules="./example-rules.xml" /> 
 
 
+
 ------------------------------------------------
 Simple Tests
 ------------------------------------------------

From cabraham at codespeak.net  Thu Nov  2 22:11:29 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Thu,  2 Nov 2006 22:11:29 +0100 (CET)
Subject: [z3-checkins] r34078 - z3/deliverance/branches/packaged
Message-ID: <20061102211129.596521006F@code0.codespeak.net>

Author: cabraham
Date: Thu Nov  2 22:11:26 2006
New Revision: 34078

Modified:
   z3/deliverance/branches/packaged/README.txt
Log:
README stuff

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Thu Nov  2 22:11:26 2006
@@ -1,4 +1,6 @@
-
+-----------------------------------
+Deliverance README
+-----------------------------------
 
 See: http://www.openplans.org/projects/deliverance
 for more information
@@ -33,7 +35,7 @@
 The easiest way to get Deliverance installed is to checkout the
 buildout and follow the instructions found there.
 
-$ svn co https://svn.openplans.org/svn/deliverance.buildout deliverance.buildout
+$ svn co https://svn.openplans.org/svn/deliverance.buildout/trunk deliverance.buildout
 
 
 Otherwise, to install Deliverance manually, first get workingenv.py

From cabraham at codespeak.net  Thu Nov  2 22:25:25 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Thu,  2 Nov 2006 22:25:25 +0100 (CET)
Subject: [z3-checkins] r34079 - in z3/deliverance/branches/packaged: attic
	doc
Message-ID: <20061102212525.ABE0D10072@code0.codespeak.net>

Author: cabraham
Date: Thu Nov  2 22:25:23 2006
New Revision: 34079

Added:
   z3/deliverance/branches/packaged/attic/
      - copied from r34078, z3/deliverance/branches/packaged/doc/
Removed:
   z3/deliverance/branches/packaged/doc/
Log:
renamed doc to attic to house out-of-date docs

From cabraham at codespeak.net  Fri Nov  3 21:40:00 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Fri,  3 Nov 2006 21:40:00 +0100 (CET)
Subject: [z3-checkins] r34148 - in z3/deliverance/branches/packaged: Attic
	attic
Message-ID: <20061103204000.F2DB21006F@code0.codespeak.net>

Author: cabraham
Date: Fri Nov  3 21:39:56 2006
New Revision: 34148

Added:
   z3/deliverance/branches/packaged/Attic/
      - copied from r34147, z3/deliverance/branches/packaged/attic/
Removed:
   z3/deliverance/branches/packaged/attic/
Log:
Testing the move command

From cabraham at codespeak.net  Fri Nov  3 21:42:57 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Fri,  3 Nov 2006 21:42:57 +0100 (CET)
Subject: [z3-checkins] r34149 - in z3/deliverance: branches/old trunk
Message-ID: <20061103204257.6AAB51006F@code0.codespeak.net>

Author: cabraham
Date: Fri Nov  3 21:42:54 2006
New Revision: 34149

Added:
   z3/deliverance/branches/old/
      - copied from r34148, z3/deliverance/trunk/
Removed:
   z3/deliverance/trunk/
Log:
Retiring trunk for archival purposes

From cabraham at codespeak.net  Fri Nov  3 21:44:21 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Fri,  3 Nov 2006 21:44:21 +0100 (CET)
Subject: [z3-checkins] r34150 - in z3/deliverance: branches/packaged trunk
Message-ID: <20061103204421.97F741006F@code0.codespeak.net>

Author: cabraham
Date: Fri Nov  3 21:44:19 2006
New Revision: 34150

Added:
   z3/deliverance/trunk/
      - copied from r34149, z3/deliverance/branches/packaged/
Removed:
   z3/deliverance/branches/packaged/
Log:
Making the packaged branch the Deliverance trunk

From cabraham at codespeak.net  Fri Nov  3 21:49:41 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Fri,  3 Nov 2006 21:49:41 +0100 (CET)
Subject: [z3-checkins] r34151 - z3/deliverance/trunk
Message-ID: <20061103204941.30F521006F@code0.codespeak.net>

Author: cabraham
Date: Fri Nov  3 21:49:38 2006
New Revision: 34151

Modified:
   z3/deliverance/trunk/README.txt
Log:
Updated link for checkout directory

Modified: z3/deliverance/trunk/README.txt
==============================================================================
--- z3/deliverance/trunk/README.txt	(original)
+++ z3/deliverance/trunk/README.txt	Fri Nov  3 21:49:38 2006
@@ -53,7 +53,7 @@
 Checkout and setup Deliverance, then make sure your installation is
 complete by running the tests:
 
-$ svn co http://codespeak.net/svn/z3/deliverance/branches/packaged deliverance 
+$ svn co http://codespeak.net/svn/z3/deliverance/trunk/ deliverance
 $ cd deliverance 
 $ python setup.py develop  
 $ nosetests

From ltucker at codespeak.net  Fri Nov  3 22:13:35 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri,  3 Nov 2006 22:13:35 +0100 (CET)
Subject: [z3-checkins] r34152 - z3/deliverance/deliverance.buildout
Message-ID: <20061103211335.E63C31006F@code0.codespeak.net>

Author: ltucker
Date: Fri Nov  3 22:13:33 2006
New Revision: 34152

Added:
   z3/deliverance/deliverance.buildout/
   z3/deliverance/deliverance.buildout/EXTERNALS.txt
   z3/deliverance/deliverance.buildout/README.libraries
   z3/deliverance/deliverance.buildout/README.txt
   z3/deliverance/deliverance.buildout/buildout.cfg
Log:
initial import of deliverance buildout

Added: z3/deliverance/deliverance.buildout/EXTERNALS.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/deliverance.buildout/EXTERNALS.txt	Fri Nov  3 22:13:33 2006
@@ -0,0 +1,4 @@
+bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap
+zc.recipe.cmmi svn://svn.zope.org/repos/main/zc.recipe.cmmi/trunk
+deliverance http://codespeak.net/svn/z3/deliverance/trunk
+

Added: z3/deliverance/deliverance.buildout/README.libraries
==============================================================================
--- (empty file)
+++ z3/deliverance/deliverance.buildout/README.libraries	Fri Nov  3 22:13:33 2006
@@ -0,0 +1,27 @@
+
+if you see output from the compiler during the buildout along the lines of: 
+
+unrecognized option '-R/your/buildout/path/parts/libxml2/lib'
+
+or the message:
+UserWarning: Deliverance requires the CVS HEAD version of libxml2
+
+this indicates the build has not properly built lxml to use the versions of libxml2 and libxslt 
+that are included in this build. 
+
+you should set your LD_LIBRARY_PATH to search the library directories under parts before 
+your normal library paths, eg:
+
+export DELIVERANCE_PATH="/your/buildout/path"
+export LD_LIBRARY_PATH="$DELIVERANCE_PATH/parts/libxml2/lib:$DELIVERANCE_PATH/parts/libxslt/lib:$LD_LIBRARY_PATH"
+
+
+you can check whether lxml is using the correct libraries by running 
+ldd develop-eggs/lxml*egg/lxml/etree.so
+
+libxml2 and libxslt should point within the buildout directory
+
+This issue is noted in distutils bugs: 
+https://sourceforge.net/tracker/?func=detail&atid=305470&aid=1254718&group_id=5470
+https://sourceforge.net/tracker/?func=detail&atid=305470&aid=642019&group_id=5470
+http://sourceforge.net/tracker/?func=detail&atid=105470&aid=445902&group_id=5470

Added: z3/deliverance/deliverance.buildout/README.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/deliverance.buildout/README.txt	Fri Nov  3 22:13:33 2006
@@ -0,0 +1,25 @@
+-----------------------------------
+Deliverance Buildout Instructions
+-----------------------------------
+
+See: http://www.openplans.org/projects/deliverance
+for more information on Deliverance
+
+
+Deliverance is built by running:
+
+$ python ./bootstrap/bootstrap.py 
+$ ./bin/buildout
+
+
+You should then be able to run the deliverance-handtransform and
+deliverance-proxy in bin.
+
+To run tests: 
+cd deliverance
+../bin/deliverance-tests
+
+To run speed test: 
+cd deliverance
+../bin/deliverance-speed
+

Added: z3/deliverance/deliverance.buildout/buildout.cfg
==============================================================================
--- (empty file)
+++ z3/deliverance/deliverance.buildout/buildout.cfg	Fri Nov  3 22:13:33 2006
@@ -0,0 +1,29 @@
+[buildout]
+develop = zc.recipe.cmmi deliverance
+parts = libxml2 libxslt lxml lxml-inst deliverance-inst
+
+[libxml2]
+recipe = zc.recipe.cmmi
+url = ftp://xmlsoft.org/libxml2/libxml2-cvs-snapshot.tar.gz
+extra_options = --without-python
+
+[libxslt]
+recipe = zc.recipe.cmmi
+url = ftp://xmlsoft.org/libxml2/libxslt-cvs-snapshot.tar.gz
+extra_options = --with-libxml-prefix=${buildout:directory}/parts/libxml2/ 
+                --without-python
+
+[lxml]
+recipe = zc.recipe.egg:custom
+eggs = lxml
+include-dirs = ${buildout:directory}/parts/libxml2/include:${buildout:directory}/parts/libxslt/include
+rpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libxslt/lib
+
+[lxml-inst]
+recipe = zc.recipe.egg
+eggs = lxml
+
+[deliverance-inst]
+recipe = zc.recipe.egg
+eggs = deliverance
+

From ltucker at codespeak.net  Fri Nov  3 22:16:03 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri,  3 Nov 2006 22:16:03 +0100 (CET)
Subject: [z3-checkins] r34153 - z3/deliverance/deliverance.buildout
Message-ID: <20061103211603.B01E91006F@code0.codespeak.net>

Author: ltucker
Date: Fri Nov  3 22:16:02 2006
New Revision: 34153

Modified:
   z3/deliverance/deliverance.buildout/   (props changed)
Log:
setting external dependencies

From ltucker at codespeak.net  Fri Nov  3 22:18:29 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri,  3 Nov 2006 22:18:29 +0100 (CET)
Subject: [z3-checkins] r34154 - z3/deliverance/deliverance.buildout
Message-ID: <20061103211829.5E31B1006F@code0.codespeak.net>

Author: ltucker
Date: Fri Nov  3 22:18:27 2006
New Revision: 34154

Modified:
   z3/deliverance/deliverance.buildout/README.txt
Log:
added purpose note to README.txt

Modified: z3/deliverance/deliverance.buildout/README.txt
==============================================================================
--- z3/deliverance/deliverance.buildout/README.txt	(original)
+++ z3/deliverance/deliverance.buildout/README.txt	Fri Nov  3 22:18:27 2006
@@ -2,6 +2,9 @@
 Deliverance Buildout Instructions
 -----------------------------------
 
+This package performs an automated self-contained 
+build of Deliverance and its dependencies. 
+
 See: http://www.openplans.org/projects/deliverance
 for more information on Deliverance
 

From ltucker at codespeak.net  Fri Nov  3 22:24:08 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Fri,  3 Nov 2006 22:24:08 +0100 (CET)
Subject: [z3-checkins] r34155 - z3/deliverance/trunk
Message-ID: <20061103212408.0E6421006F@code0.codespeak.net>

Author: ltucker
Date: Fri Nov  3 22:24:05 2006
New Revision: 34155

Modified:
   z3/deliverance/trunk/README.txt
Log:
changing buildout location in README.txt

Modified: z3/deliverance/trunk/README.txt
==============================================================================
--- z3/deliverance/trunk/README.txt	(original)
+++ z3/deliverance/trunk/README.txt	Fri Nov  3 22:24:05 2006
@@ -35,7 +35,7 @@
 The easiest way to get Deliverance installed is to checkout the
 buildout and follow the instructions found there.
 
-$ svn co https://svn.openplans.org/svn/deliverance.buildout/trunk deliverance.buildout
+$ svn co https://codespeak.net/svn/z3/deliverance/deliverance.buildout 
 
 
 Otherwise, to install Deliverance manually, first get workingenv.py

From philikon at codespeak.net  Sat Nov  4 21:46:13 2006
From: philikon at codespeak.net (philikon at codespeak.net)
Date: Sat,  4 Nov 2006 21:46:13 +0100 (CET)
Subject: [z3-checkins] r34206 - in z3/www/trunk: . text
Message-ID: <20061104204613.5B74B10071@code0.codespeak.net>

Author: philikon
Date: Sat Nov  4 21:46:10 2006
New Revision: 34206

Modified:
   z3/www/trunk/mkwebsite.py
   z3/www/trunk/text/index.txt
Log:
new five releases


Modified: z3/www/trunk/mkwebsite.py
==============================================================================
--- z3/www/trunk/mkwebsite.py	(original)
+++ z3/www/trunk/mkwebsite.py	Sat Nov  4 21:46:10 2006
@@ -144,36 +144,36 @@
          'http://codespeak.net/mailman/listinfo/z3-checkins'),
         ('Five 1.2.6 release',
          'release/Five-1.2.6.tgz'),
-        ('Five 1.3.7 release',
-         'release/Five-1.3.7.tgz'),
-        ('Five 1.4.1 release',
-         'release/Five-1.4.tgz'),
-        ('Five 1.5 release',
-         'release/Five-1.5.tgz'),
+        ('Five 1.3.8 release',
+         'release/Five-1.3.8.tgz'),
+        ('Five 1.4.2 release',
+         'release/Five-1.4.2.tgz'),
+        ('Five 1.5.1 release',
+         'release/Five-1.5.1.tgz'),
         ]
 
     site.registerReleases([
             Z3ReleaseResource(
         'Five', 'svn://svn.zope.org/repos/main/Products.Five/tags/1.2.6'),
             Z3ReleaseResource(
-        'Five', 'svn://svn.zope.org/repos/main/Products.Five/tags/1.3.7'),
+        'Five', 'svn://svn.zope.org/repos/main/Products.Five/tags/1.3.8'),
             Z3ReleaseResource(
-        'Five', 'svn://svn.zope.org/repos/main/Products.Five/tags/1.4.1'),
+        'Five', 'svn://svn.zope.org/repos/main/Products.Five/tags/1.4.2'),
             Z3ReleaseResource(
-        'Five', 'svn://svn.zope.org/repos/main/Products.Five/tags/1.5'),
+        'Five', 'svn://svn.zope.org/repos/main/Products.Five/tags/1.5.1'),
             ], project.getName())
 
     from z3publish import Z3TestPage
     site.registerPages([
-            ZopeOrgPage('Products.Five/tags/1.5', 'doc/main.txt', 'index'),
-            ZopeOrgPage('Products.Five/tags/1.5', 'doc/features.txt'),
-            ZopeOrgPage('Products.Five/tags/1.5', 'doc/directives.txt'), 
-            ZopeOrgPage('Products.Five/tags/1.5', 'doc/manual.txt'),
-            ZopeOrgPage('Products.Five/tags/1.5', 'doc/i18n.txt'),
-            ZopeOrgPage('Products.Five/tags/1.5', 'doc/localsite.txt'),
-            ZopeOrgPage('Products.Five/tags/1.5', 'doc/event.txt'),
-            ZopeOrgPage('Products.Five/tags/1.5', 'CHANGES.txt'),
-            ZopeOrgPage('Products.Five/tags/1.5', 'INSTALL.txt'),],
+            ZopeOrgPage('Products.Five/branches/1.5', 'doc/main.txt', 'index'),
+            ZopeOrgPage('Products.Five/tags/1.5.1', 'doc/features.txt'),
+            ZopeOrgPage('Products.Five/tags/1.5.1', 'doc/directives.txt'), 
+            ZopeOrgPage('Products.Five/tags/1.5.1', 'doc/manual.txt'),
+            ZopeOrgPage('Products.Five/tags/1.5.1', 'doc/i18n.txt'),
+            ZopeOrgPage('Products.Five/tags/1.5.1', 'doc/localsite.txt'),
+            ZopeOrgPage('Products.Five/tags/1.5.1', 'doc/event.txt'),
+            ZopeOrgPage('Products.Five/tags/1.5.1', 'CHANGES.txt'),
+            ZopeOrgPage('Products.Five/tags/1.5.1', 'INSTALL.txt'),],
                        site.getProjectLayouter(project),
                        project.getName(),
                        nav_links=nav_links,
@@ -199,21 +199,18 @@
 
     pages = [Z3Page('CMFonFive/trunk', 'README.txt', 'index'),]
 
-    # You can test the pages before checking them in. Replace the above with the uncommented
-    # code below and rerun. Don't forget to change back!
+    # You can test the pages before checking them in. Replace the
+    # above with the uncommented code below and rerun. Don't forget to
+    # change back!
+
     #from z3publish import Z3TestPage
-    #pages = [Z3TestPage('/the/path/to/the/file/on/disk/CMFonFive/README.txt', 'index'),]
+    #pages = [Z3TestPage('/the/path/to/the/file/on/disk/CMFonFive/README.txt',
+    #                    'index'),]
    
     site.registerReleases([
-            Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.0.0'),
             Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.0.1'),
-            Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.1.0'),
             Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.1.1'),
-            Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.2.0'),
             Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.2.1'),
-            Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.3.0'),
-            Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.3.1'),
-            Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.3.2'),
             Z3ReleaseResource('CMFonFive', 'http://codespeak.net/svn/z3/CMFonFive/tag/CMFonFive-1.3.3'),
 	], project.getName())
 

Modified: z3/www/trunk/text/index.txt
==============================================================================
--- z3/www/trunk/text/index.txt	(original)
+++ z3/www/trunk/text/index.txt	Sat Nov  4 21:46:10 2006
@@ -21,45 +21,16 @@
 News
 ----
 
-* 2005-08-13 `Five`_ 1.2.6, 1.3.7, 1.4.1 and 1.5 released!
+* 2006-11-04 `Five`_ 1.3.8, 1.4.2 and 1.5.1 released!
 
-* 2005-05-29 `Five`_ 1.2.5, 1.3.6, 1.4 and 1.5c released!
+* 2006-08-13 `Five`_ 1.2.6, 1.3.7, 1.4.1 and 1.5 released!
 
-* 2005-05-04 `Five`_ 1.2.4, 1.3.5, 1.4c and 1.5b released!
+* 2006-05-29 `Five`_ 1.2.5, 1.3.6, 1.4 and 1.5c released!
 
-* 2005-02-25 `Five`_ 1.2.1 and 1.3.2 released! Download `Five 1.2.1`_
-  and `Five 1.3.2`_
+* 2006-05-04 `Five`_ 1.2.4, 1.3.5, 1.4c and 1.5b released!
 
-* 2005-01-07 `Five`_ 1.2 and 1.3 released! `Download Five 1.2`_
+* 2006-02-25 `Five`_ 1.2.1 and 1.3.2 released!
 
-* 2005-11-02 `Five`_ 1.2b and 1.3b released! `Download Five 1.2b`_
-
-* 2005-10-04 `Five`_ 1.1 released! `Download Five 1.1`_
-
-* 2005-07-21 `Five`_ 1.1b released! `Download Five 1.1b`_
-
-* 2005-07-21 `Five`_ 1.0.2 released! `Download Five 1.0.2`_
-
-* 2005-05-31 `Five`_ 1.0.1 released! `Download Five 1.0.1`_
-
-* 2005-04-27 `Five`_ 1.0 released! `Download Five 1.0`_
-
-* 2005-03-11 `Five`_ 0.3 released! `Download Five 0.3`_
-
-* 2004-09-24 `Five`_ 0.2b released! `Download Five 0.2b`_
-
-* 2004-07-30 `Five`_ 0.1 released! `Download Five 0.1`_
+* 2006-01-07 `Five`_ 1.2 and 1.3 released!
 
 .. _`Five`: http://codespeak.net/z3/five
-.. _`Download Five 0.1`: http://codespeak.net/z3/five/release/Five-0.1.tgz
-.. _`Download Five 0.2b`: http://codespeak.net/z3/five/release/Five-0.2b.tgz
-.. _`Download Five 0.3`: http://codespeak.net/z3/five/release/Five-0.3.tgz
-.. _`Download Five 1.0`: http://codespeak.net/z3/five/release/Five-1.0.tgz
-.. _`Download Five 1.0.1`: http://codespeak.net/z3/five/release/Five-1.0.1.tgz
-.. _`Download Five 1.0.2`: http://codespeak.net/z3/five/release/Five-1.0.2.tgz
-.. _`Download Five 1.1b`: http://codespeak.net/z3/five/release/Five-1.1b.tgz
-.. _`Download Five 1.1`: http://codespeak.net/z3/five/release/Five-1.1.tgz
-.. _`Download Five 1.2b`: http://codespeak.net/z3/five/release/Five-1.2b.tgz
-.. _`Download Five 1.2`: http://codespeak.net/z3/five/release/Five-1.2.tgz
-.. _`Five 1.2.1`: http://codespeak.net/z3/five/release/Five-1.2.1.tgz
-.. _`Five 1.3.2`: http://codespeak.net/z3/five/release/Five-1.3.2.tgz

From cabraham at codespeak.net  Mon Nov  6 16:35:19 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 16:35:19 +0100 (CET)
Subject: [z3-checkins] r34270 - z3/deliverance/buildout
Message-ID: <20061106153519.02F5A10079@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 16:35:18 2006
New Revision: 34270

Added:
   z3/deliverance/buildout/
Log:
making buildout directories

From cabraham at codespeak.net  Mon Nov  6 16:35:27 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 16:35:27 +0100 (CET)
Subject: [z3-checkins] r34271 - z3/deliverance/buildout/trunk
Message-ID: <20061106153527.3EAB810079@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 16:35:25 2006
New Revision: 34271

Added:
   z3/deliverance/buildout/trunk/
Log:
making buildout directories

From cabraham at codespeak.net  Mon Nov  6 16:35:44 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 16:35:44 +0100 (CET)
Subject: [z3-checkins] r34272 - in z3/deliverance:
	buildout/trunk/deliverance.buildout deliverance.buildout
Message-ID: <20061106153544.16BE71007B@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 16:35:40 2006
New Revision: 34272

Added:
   z3/deliverance/buildout/trunk/deliverance.buildout/
      - copied from r34271, z3/deliverance/deliverance.buildout/
Removed:
   z3/deliverance/deliverance.buildout/
Log:
moving buildout to proper directory

From cabraham at codespeak.net  Mon Nov  6 16:41:19 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 16:41:19 +0100 (CET)
Subject: [z3-checkins] r34275 - in z3/deliverance/buildout: del.b
	trunk/deliverance.buildout
Message-ID: <20061106154119.97D0B1007B@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 16:41:16 2006
New Revision: 34275

Added:
   z3/deliverance/buildout/del.b/
      - copied from r34274, z3/deliverance/buildout/trunk/deliverance.buildout/
Removed:
   z3/deliverance/buildout/trunk/deliverance.buildout/
Log:
moving buildout to proper directory

From cabraham at codespeak.net  Mon Nov  6 16:42:06 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 16:42:06 +0100 (CET)
Subject: [z3-checkins] r34276 - z3/deliverance/buildout/trunk
Message-ID: <20061106154206.205531007B@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 16:42:04 2006
New Revision: 34276

Removed:
   z3/deliverance/buildout/trunk/
Log:
deleting

From cabraham at codespeak.net  Mon Nov  6 16:42:46 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 16:42:46 +0100 (CET)
Subject: [z3-checkins] r34277 - in z3/deliverance/buildout: del.b trunk
Message-ID: <20061106154246.9A8C11007B@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 16:42:44 2006
New Revision: 34277

Added:
   z3/deliverance/buildout/trunk/
      - copied from r34276, z3/deliverance/buildout/del.b/
Removed:
   z3/deliverance/buildout/del.b/
Log:
moving buildout to proper directory

From cabraham at codespeak.net  Mon Nov  6 17:21:09 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:21:09 +0100 (CET)
Subject: [z3-checkins] r34278 - z3/deliverance/trunk
Message-ID: <20061106162109.66B801007D@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:21:06 2006
New Revision: 34278

Modified:
   z3/deliverance/trunk/README.txt
Log:
fixed buildout url

Modified: z3/deliverance/trunk/README.txt
==============================================================================
--- z3/deliverance/trunk/README.txt	(original)
+++ z3/deliverance/trunk/README.txt	Mon Nov  6 17:21:06 2006
@@ -35,7 +35,7 @@
 The easiest way to get Deliverance installed is to checkout the
 buildout and follow the instructions found there.
 
-$ svn co https://codespeak.net/svn/z3/deliverance/deliverance.buildout 
+$ svn co http://codespeak.net/svn/z3/deliverance/buildout/trunk
 
 
 Otherwise, to install Deliverance manually, first get workingenv.py

From cabraham at codespeak.net  Mon Nov  6 17:28:22 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:28:22 +0100 (CET)
Subject: [z3-checkins] r34279 - z3/deliverance/trunk/Attic/doc
Message-ID: <20061106162822.4B38D1007D@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:28:20 2006
New Revision: 34279

Added:
   z3/deliverance/trunk/Attic/doc/
Log:
new dir

From cabraham at codespeak.net  Mon Nov  6 17:31:53 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:31:53 +0100 (CET)
Subject: [z3-checkins] r34280 - z3/deliverance/trunk/Attic/doc
Message-ID: <20061106163153.C835D1007D@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:31:51 2006
New Revision: 34280

Removed:
   z3/deliverance/trunk/Attic/doc/
Log:
removed docs

From cabraham at codespeak.net  Mon Nov  6 17:32:44 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:32:44 +0100 (CET)
Subject: [z3-checkins] r34281 - z3/deliverance/trunk/tmp
Message-ID: <20061106163244.CC0BA1007D@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:32:43 2006
New Revision: 34281

Added:
   z3/deliverance/trunk/tmp/
Log:
new dir

From cabraham at codespeak.net  Mon Nov  6 17:33:01 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:33:01 +0100 (CET)
Subject: [z3-checkins] r34282 - in z3/deliverance/trunk: Attic tmp/Attic
Message-ID: <20061106163301.93D681007E@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:32:59 2006
New Revision: 34282

Added:
   z3/deliverance/trunk/tmp/Attic/
      - copied from r34281, z3/deliverance/trunk/Attic/
Removed:
   z3/deliverance/trunk/Attic/
Log:
moved docs

From cabraham at codespeak.net  Mon Nov  6 17:33:28 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:33:28 +0100 (CET)
Subject: [z3-checkins] r34283 - z3/deliverance/trunk/Attic
Message-ID: <20061106163328.F25771007D@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:33:27 2006
New Revision: 34283

Added:
   z3/deliverance/trunk/Attic/
Log:
new dir

From cabraham at codespeak.net  Mon Nov  6 17:33:34 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:33:34 +0100 (CET)
Subject: [z3-checkins] r34284 - z3/deliverance/trunk/Attic/doc
Message-ID: <20061106163334.F35291007E@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:33:33 2006
New Revision: 34284

Added:
   z3/deliverance/trunk/Attic/doc/
Log:
new dir

From cabraham at codespeak.net  Mon Nov  6 17:34:05 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:34:05 +0100 (CET)
Subject: [z3-checkins] r34285 - z3/deliverance/trunk/Attic/doc
Message-ID: <20061106163405.524151007D@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:34:03 2006
New Revision: 34285

Removed:
   z3/deliverance/trunk/Attic/doc/
Log:
removed docs

From cabraham at codespeak.net  Mon Nov  6 17:34:41 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:34:41 +0100 (CET)
Subject: [z3-checkins] r34286 - in z3/deliverance/trunk: Attic/Attic
	tmp/Attic
Message-ID: <20061106163441.8B8A21007D@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:34:38 2006
New Revision: 34286

Added:
   z3/deliverance/trunk/Attic/Attic/
      - copied from r34285, z3/deliverance/trunk/tmp/Attic/
Removed:
   z3/deliverance/trunk/tmp/Attic/
Log:
moved docs

From cabraham at codespeak.net  Mon Nov  6 17:35:03 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:35:03 +0100 (CET)
Subject: [z3-checkins] r34287 - in z3/deliverance/trunk/Attic: Attic doc
Message-ID: <20061106163503.00B1E1007D@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:35:01 2006
New Revision: 34287

Added:
   z3/deliverance/trunk/Attic/doc/
      - copied from r34286, z3/deliverance/trunk/Attic/Attic/
Removed:
   z3/deliverance/trunk/Attic/Attic/
Log:
moved docs

From cabraham at codespeak.net  Mon Nov  6 17:35:17 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:35:17 +0100 (CET)
Subject: [z3-checkins] r34288 - z3/deliverance/trunk/tmp
Message-ID: <20061106163517.2A8F51007E@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:35:15 2006
New Revision: 34288

Removed:
   z3/deliverance/trunk/tmp/
Log:
removed docs

From cabraham at codespeak.net  Mon Nov  6 17:37:32 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:37:32 +0100 (CET)
Subject: [z3-checkins] r34289 - in z3/deliverance: branches/namespaced
	trunk/Attic
Message-ID: <20061106163732.8E2F310090@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:37:28 2006
New Revision: 34289

Added:
   z3/deliverance/trunk/Attic/mpfilter.conf
      - copied unchanged from r34288, z3/deliverance/branches/namespaced/mpfilter.conf
Removed:
   z3/deliverance/branches/namespaced/mpfilter.conf
Log:
moved old source

Deleted: /z3/deliverance/branches/namespaced/mpfilter.conf
==============================================================================
--- /z3/deliverance/branches/namespaced/mpfilter.conf	Mon Nov  6 17:37:28 2006
+++ (empty file)
@@ -1,11 +0,0 @@
-# This module can be pointed to from your main Apache 
-# configuration file to apply a theme to certain parts of your
-# URL space.
-
-LoadModule python_module modules/mod_python.so
-
-<Directory /Users/paul/sandboxes/z3/deliverance/branches/namespaced>
-  PythonOutputFilter mpfilter DELIVERANCE
-  AddOutputFilter DELIVERANCE .html
-  PythonDebug On
-</Directory>

From cabraham at codespeak.net  Mon Nov  6 17:37:51 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:37:51 +0100 (CET)
Subject: [z3-checkins] r34290 - in z3/deliverance: branches/namespaced
	trunk/Attic
Message-ID: <20061106163751.69ABD10094@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:37:46 2006
New Revision: 34290

Added:
   z3/deliverance/trunk/Attic/mpfilter.py
      - copied unchanged from r34289, z3/deliverance/branches/namespaced/mpfilter.py
Removed:
   z3/deliverance/branches/namespaced/mpfilter.py
Log:
moved old source

Deleted: /z3/deliverance/branches/namespaced/mpfilter.py
==============================================================================
--- /z3/deliverance/branches/namespaced/mpfilter.py	Mon Nov  6 17:37:46 2006
+++ (empty file)
@@ -1,70 +0,0 @@
-"""
-Deliverance theming for mod_python filters
-
-Deliverance applies a theme to content.  This mod_python module acts as an 
-Apache "filter", transforming content as it passes through Apache.
-
-This module gets imported by mod_python during its startup.  Thus, the 
-appmap instance becomes a global, computed only once.  If you need to 
-recompute the theme, for example, restart the Apache.
-"""
-import time
-from cStringIO import StringIO
-
-from mod_python import apache
-from deliverance import AppMap
-appmap = AppMap() # Theme is generated once at module import time
-
-def outputfilter(filter):
-    if not hasattr(filter.req, 'notheme'):
-        # Check for a flag to not apply theme
-        args = filter.req.args
-        if args and args.find("notheme") > -1:
-            filter.req.notheme = True
-        else:
-            filter.req.notheme = False
-            
-    try:
-        streambuffer = filter.req.streambuffer
-    except AttributeError:
-        if filter.req.notheme:
-            # pass on if no theme
-            filter.pass_on()
-            return
-        elif not filter.req.headers_out.has_key("content-type"):
-            # pass on if no content type specified
-            filter.pass_on()
-            return
-        elif not filter.req.headers_out["content-type"].startswith("text/html"):
-            # pass on if not HTML
-            filter.pass_on()
-            return
-
-        filter.req.streambuffer = StringIO()
-        streambuffer = filter.req.streambuffer
-
-    streamlet = filter.readline()
-    while streamlet:
-        streambuffer.write(streamlet)
-        streamlet = filter.readline()
-
-    if streamlet is None:
-        output = appmap.publish(streambuffer.getvalue())
-        filter.req.headers_out["Content-Length"] = str(len(output))
-        filter.write(output)
-        filter.close()
-
-
-def handler(req):
-    """Basic filter applying to all mime types it is registered for"""
-
-    # Get the path, strip off leading slash, and convert to a 
-    # dotted notation for xml:id compatibility
-    path_info = req.path_info[1:]
-    dotted_path = path_info.replace("/", ".")
-
-    response = appmap.publish(dotted_path)
-    req.content_type = "text/html"
-    req.write(response)
-
-    return apache.OK

From cabraham at codespeak.net  Mon Nov  6 17:40:01 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:40:01 +0100 (CET)
Subject: [z3-checkins] r34291 - z3/deliverance/branches/namespaced
Message-ID: <20061106164001.6157E10092@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:39:58 2006
New Revision: 34291

Removed:
   z3/deliverance/branches/namespaced/
Log:
cleanup old code

From cabraham at codespeak.net  Mon Nov  6 17:40:10 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:40:10 +0100 (CET)
Subject: [z3-checkins] r34292 - z3/deliverance/branches/noappmap
Message-ID: <20061106164010.5858D10092@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:40:08 2006
New Revision: 34292

Removed:
   z3/deliverance/branches/noappmap/
Log:
cleanup old code

From cabraham at codespeak.net  Mon Nov  6 17:40:15 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:40:15 +0100 (CET)
Subject: [z3-checkins] r34293 - z3/deliverance/branches/old
Message-ID: <20061106164015.E393610092@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:40:14 2006
New Revision: 34293

Removed:
   z3/deliverance/branches/old/
Log:
cleanup old code

From cabraham at codespeak.net  Mon Nov  6 17:40:25 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 17:40:25 +0100 (CET)
Subject: [z3-checkins] r34294 - z3/deliverance/branches/mphandler
Message-ID: <20061106164025.1007E100A2@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 17:40:23 2006
New Revision: 34294

Removed:
   z3/deliverance/branches/mphandler/
Log:
cleanup old code

From cabraham at codespeak.net  Mon Nov  6 18:14:04 2006
From: cabraham at codespeak.net (cabraham at codespeak.net)
Date: Mon,  6 Nov 2006 18:14:04 +0100 (CET)
Subject: [z3-checkins] r34297 - z3/deliverance/buildout/trunk
Message-ID: <20061106171404.2D1061007F@code0.codespeak.net>

Author: cabraham
Date: Mon Nov  6 18:14:03 2006
New Revision: 34297

Modified:
   z3/deliverance/buildout/trunk/buildout.cfg
Log:
updated libxml2 and libxslt links to latest stable releases

Modified: z3/deliverance/buildout/trunk/buildout.cfg
==============================================================================
--- z3/deliverance/buildout/trunk/buildout.cfg	(original)
+++ z3/deliverance/buildout/trunk/buildout.cfg	Mon Nov  6 18:14:03 2006
@@ -4,12 +4,12 @@
 
 [libxml2]
 recipe = zc.recipe.cmmi
-url = ftp://xmlsoft.org/libxml2/libxml2-cvs-snapshot.tar.gz
+url = ftp://xmlsoft.org/libxml2/libxml2-2.6.27.tar.gz
 extra_options = --without-python
 
 [libxslt]
 recipe = zc.recipe.cmmi
-url = ftp://xmlsoft.org/libxml2/libxslt-cvs-snapshot.tar.gz
+url = ftp://xmlsoft.org/libxml2/libxslt-1.1.18.tar.gz
 extra_options = --with-libxml-prefix=${buildout:directory}/parts/libxml2/ 
                 --without-python
 

From ltucker at codespeak.net  Mon Nov  6 21:22:21 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon,  6 Nov 2006 21:22:21 +0100 (CET)
Subject: [z3-checkins] r34298 - z3/deliverance/trunk/deliverance
Message-ID: <20061106202221.E3C2710075@code0.codespeak.net>

Author: ltucker
Date: Mon Nov  6 21:22:17 2006
New Revision: 34298

Modified:
   z3/deliverance/trunk/deliverance/fixuplinks.py
   z3/deliverance/trunk/deliverance/handtransform.py
   z3/deliverance/trunk/deliverance/htmlserialize.py
   z3/deliverance/trunk/deliverance/interpreter.py
   z3/deliverance/trunk/deliverance/test_wsgi.py
   z3/deliverance/trunk/deliverance/utils.py
   z3/deliverance/trunk/deliverance/wsgifilter.py
   z3/deliverance/trunk/deliverance/xslt.py
Log:
some more rough documentation and cleanup

Modified: z3/deliverance/trunk/deliverance/fixuplinks.py
==============================================================================
--- z3/deliverance/trunk/deliverance/fixuplinks.py	(original)
+++ z3/deliverance/trunk/deliverance/fixuplinks.py	Mon Nov  6 21:22:17 2006
@@ -1,3 +1,8 @@
+"""
+utilities for manipulating html links 
+"""
+
+
 from htmlserialize import decodeAndParseHTML, tostring
 import re
 
@@ -27,11 +32,15 @@
     fixup_css_links(doc, link_repl_func)
 
 def remove_base_tags_from_document(doc):
+    """
+    removes all html <base href=""> tags 
+    from the document given. 
+    """
     basetags = doc.xpath('//base[@href]')
     for b in basetags:
         b.getparent().remove(b)
     
-CSS_URL_PAT = re.compile(r'url\((.*?)\)',re.I)
+CSS_URL_PAT = re.compile(r'url\((.*?)\)', re.I)
 def fixup_css_links(doc, link_repl_func):
     """ 
     prepends url(...) in css style elements to be 

Modified: z3/deliverance/trunk/deliverance/handtransform.py
==============================================================================
--- z3/deliverance/trunk/deliverance/handtransform.py	(original)
+++ z3/deliverance/trunk/deliverance/handtransform.py	Mon Nov  6 21:22:17 2006
@@ -16,9 +16,6 @@
 themeurl, rulesfile and baseurl can be rolled into a file specified with -f 
 it should contain an element like 
 <blend theme="themeurl" baseurl="baseurl" rules="rulesfile" />
-
-
-
 """
 
 
@@ -26,26 +23,37 @@
 
 usage = "usage: %prog [options] <content_url>"
 parser = OptionParser(usage=usage)
-parser.add_option("-t","--theme",dest="theme_url",help="url of theme html")
-parser.add_option("-b","--baseurl",dest="base_url",
+parser.add_option("-t", "--theme", dest="theme_url", help="url of theme html")
+parser.add_option("-b", "--baseurl", dest="base_url",
                   help="relative urls in the theme will be made absolute relative to this url [default %default]", 
                   default=DEFAULT_BASE_URL)
-parser.add_option("-r","--rules",dest="rules_file",
+parser.add_option("-r", "--rules", dest="rules_file",
                   help="path to file containing the deliverance rules to apply")
-parser.add_option("-f","--from-file",dest="blend_file",
+parser.add_option("-f", "--from-file", dest="blend_file",
                   help="take theme, baseurl and rules parameters from the referenced file")
-parser.add_option("-R","--renderer",dest="renderer_type",
+parser.add_option("-R", "--renderer", dest="renderer_type",
                   help="(xslt|py) [default %default]", default="xslt", choices=['xslt','py'])
 
 
 
 def grab_url(url):
+    """
+    returns the data referenced by the url provided. 
+    """
     f = urllib.urlopen(url)
     data = f.read()
     f.close()
     return data
 
 def do_transform(renderer_type, theme_url, base_url, rules_url, content_url):
+    """
+    Perform the deliverance transform using the rules referenced by rules_url
+    on the pages referenced by theme_url and content_url. Renderer type determines
+    which deliverance renderer class is used to perform the transform, which may be 
+    either 'xslt' or 'py'. Relative urls in the theme page will rewritten as 
+    absolute urls relative to the base_url given. returns the result of the 
+    transformation 
+    """
     rules = etree.XML(grab_url(rules_url))
     theme = etree.HTML(grab_url(theme_url))
     content = etree.HTML(grab_url(content_url))
@@ -70,23 +78,37 @@
         
 
 def parse_blend_file(filename):
+    """
+    returns the theme url, base url and rules url 
+    specified in the file given. filename is 
+    expected to contain an xml document containing a 
+    toplevel element with attributes 'theme', 
+    'baseurl' and 'rules'
+    """
     b = etree.XML(open(filename).read())
     return b.get('theme'),b.get('baseurl'),b.get('rules')
 
 
 def die(message,parser):
+    """
+    prints an error message, the usage of the program, 
+    then quits. 
+    """
     print message
     parser.print_usage()
     sys.exit(0)    
     
 def main(args=None):
+    """
+    main function, see usage information 
+    """
     if args is None:
         args = sys.argv[1:]
 
-    options,args = parser.parse_args(args)
+    options, args = parser.parse_args(args)
     
     if len(args) == 0:
-        die("no content url specified.",parser)
+        die("no content url specified.", parser)
 
     content_url = args[0]
     theme_url = None
@@ -99,10 +121,10 @@
             die("cannot specify base url, rules file or theme url when taking parameters from file.",parser)
 
         try:
-            theme_url,base_url,rules_file = parse_blend_file(options.blend_file)            
+            theme_url, base_url, rules_file = parse_blend_file(options.blend_file)            
 
-        except Exception,message:
-            die(message,parser)
+        except Exception, message:
+            die(message, parser)
 
     else:
         theme_url = options.theme_url
@@ -120,7 +142,11 @@
         die("no base url specified",parser)
         
 
-    print tostring(do_transform(options.renderer_type,theme_url,base_url,rules_file,content_url))
+    print tostring(do_transform(options.renderer_type,
+                                theme_url,
+                                base_url,
+                                rules_file,
+                                content_url))
     
 
 if __name__ == '__main__':

Modified: z3/deliverance/trunk/deliverance/htmlserialize.py
==============================================================================
--- z3/deliverance/trunk/deliverance/htmlserialize.py	(original)
+++ z3/deliverance/trunk/deliverance/htmlserialize.py	Mon Nov  6 21:22:17 2006
@@ -24,13 +24,15 @@
 pretty_html_transform = etree.XSLT(etree.XML(pretty_html_xsl))
 
 
-#
-# creates an HTML string representation of the document given 
-# 
-# note: this will create a meta http-equiv="Content" tag in the head
-# and may replace any that are present 
-# 
+
 def tostring(doc,pretty = False):
+    """
+    return HTML string representation of the document given 
+ 
+    note: this will create a meta http-equiv="Content" tag in the head
+    and may replace any that are present 
+    """
+
     if pretty:
         return str(pretty_html_transform(doc))
     else:
@@ -39,19 +41,21 @@
 
 
 
-HTTP_EQUIV_MATCHER_PAT = re.compile(r"\<\s*meta\s+([^\>])*http-equiv\s*=\s*(\'|\")\s*content-type\s*(\'|\")([^\>])*charset\s*=\s*(?P<charset>[\w-]+)([^\>])*\>",re.I|re.M) 
-OTHER_HTTP_EQUIV_MATCHER_PAT = re.compile(r"\<\s*meta\s+([^\>])*charset\s*=\s*(?P<charset>[\w-]+)([^\>])*http-equiv\s*=\s*(\'|\")\s*content-type\s*(\'|\")([^\>])*\>",re.I|re.M) 
+#HTTP_EQUIV_MATCHER_PAT = re.compile(r"\<\s*meta\s+([^\>])*http-equiv\s*=\s*(\'|\")\s*content-type\s*(\'|\")([^\>])*charset\s*=\s*(?P<charset>[\w-]+)([^\>])*\>",re.I|re.M) 
+#OTHER_HTTP_EQUIV_MATCHER_PAT = re.compile(r"\<\s*meta\s+([^\>])*charset\s*=\s*(?P<charset>[\w-]+)([^\>])*http-equiv\s*=\s*(\'|\")\s*content-type\s*(\'|\")([^\>])*\>",re.I|re.M) 
 def decodeAndParseHTML(text):
     """
     if an html meta tag specifying a charset can be matched, 
     decode the text to a python unicode string before parsing
-    """
-    m = HTTP_EQUIV_MATCHER_PAT.search(text)
-    if not m:
-        m = OTHER_HTTP_EQUIV_MATCHER_PAT.search(text)
 
-    if m:
-        charset = m.group('charset')
+    XXX - this is disabled and in camelCase for no good reason 
+    """
+#    m = HTTP_EQUIV_MATCHER_PAT.search(text)
+#    if not m:
+#        m = OTHER_HTTP_EQUIV_MATCHER_PAT.search(text)
+#
+#    if m:
+#        charset = m.group('charset')
 #        text = text.decode(charset)
 
     content = etree.HTML(text)

Modified: z3/deliverance/trunk/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/trunk/deliverance/interpreter.py	(original)
+++ z3/deliverance/trunk/deliverance/interpreter.py	Mon Nov  6 21:22:17 2006
@@ -15,6 +15,24 @@
     def __init__(self, theme, theme_uri,
                  rule, rule_uri,
                  reference_resolver=None):  
+        """
+        initializer. 
+
+        theme: an lxml etree represenatation of the theme page 
+        theme_uri: a uri referring to the theme page, used to 
+                    make relative links in the theme absolute 
+        rule: an lxml etree representation of the deliverance rules
+               performed by this transformation 
+        rule_uri: a uri representing the location of the rules document
+
+        reference_resolver: a function taking a url a parse type and 
+         and an encoding type returning the data referred to by the url 
+         in the manner specified. if parse is set to 'xml', the result 
+         should be an lxml etree structure, otherwise if encoding 
+         is specified, the data should be decoded using this encoding 
+         before being returned. 
+                
+        """
         self.theme = self.fixup_links(theme, theme_uri)
         self.rules = rule
         self.rules_uri = rule_uri
@@ -30,6 +48,12 @@
 
 
     def render(self, content):
+        """
+        content: an lxml etree structure representing the content to render 
+        returns an lxml etree structure representing the result of the 
+                transformation represented by this class performed on the 
+                given content. 
+        """
         result = copy.deepcopy(self.theme)
         input = copy.deepcopy(content)
         self.apply_rules(self.rules, result, input)
@@ -37,7 +61,13 @@
 
 
     def apply_rules(self, rules, theme, content):
-
+        """
+        applies the deliverance rules given on the 
+        theme and content given. drop rules are 
+        run before any other rules. 
+        rules, theme and content should be lxml etree 
+        structures. 
+        """
         drop_rules, other_rules = self.separate_drop_rules(rules)
 
         # process all drop rules first 
@@ -49,6 +79,12 @@
 
 
     def apply_rule(self, rule, theme, content):
+        """
+        calls proper rule application function for 
+        the rule given on the theme and content 
+        given. rule, theme and content should be 
+        lxml etree structures. 
+        """
         if rule.tag == self.APPEND_RULE_TAG:
             self.apply_append(rule, theme, content)
         elif rule.tag == self.PREPEND_RULE_TAG:
@@ -71,6 +107,11 @@
                     rule.tag, etree.tostring(rule)))
 
     def apply_append(self,rule,theme,content):
+        """
+        function that performs the deliverance "append" 
+        rule given by rule on the theme and content given. 
+        see deliverance specification 
+        """
         theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
@@ -113,7 +154,11 @@
         theme_el.extend(non_text_els)
 
     def debug_append(self, theme_el, content_els, rule):
-        
+        """
+        debugging variant of the deliverance "append" 
+        rule (run when the rule has debugging enabled) 
+        see deliverance specification 
+        """
         comment_before,comment_after = self.make_debugging_comments(rule)
         content_els[:0] = [comment_before]
         content_els.append(comment_after)
@@ -127,6 +172,11 @@
 
 
     def apply_prepend(self, rule, theme, content):
+        """
+        function that performs the deliverance "prepend" 
+        rule given by rule on the theme and content given. 
+        see deliverance specification 
+        """
         theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
@@ -179,7 +229,12 @@
                 non_text_els[-1].tail = old_start_text
 
     def debug_prepend(self, theme_el, content_els, rule):        
-        
+        """
+        debugging variant of the deliverance "prepend" 
+        rule (run when the rule has debugging enabled) 
+        see deliverance specification 
+        """
+
         comment_before, comment_after = self.make_debugging_comments(rule)
         content_els[:0] = [comment_before]
         content_els.append(comment_after)
@@ -195,6 +250,11 @@
         theme_el[:0] = non_text_els
 
     def apply_replace(self, rule, theme, content):
+        """
+        function that performs the deliverance "replace" 
+        rule given by rule on the theme and content given. 
+        see deliverance specification 
+        """
         theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
@@ -262,6 +322,11 @@
                 non_text_els[0].tail = preserve_tail
 
     def debug_replace(self,theme_el,content_els,rule):
+        """
+        debugging variant of the deliverance "replace" 
+        rule (run when the rule has debugging enabled) 
+        see deliverance specification 
+        """
         comment_before, comment_after = self.make_debugging_comments(rule)
         content_els[:0] = [comment_before]
         content_els.append(comment_after)
@@ -280,6 +345,12 @@
         parent[i+1:i+1] = non_text_els[1:]
         
     def _xpath_copy(self, source, xpath):
+        """
+        helper function that returns a deep copy of the 
+        element referred to by 'xpath' in the 'source'
+        document given. raises XPathSyntaxError if 
+        xpath is invalid. 
+        """
         try:
             found_element = source.xpath(xpath)
         except etree.XPathSyntaxError, e:
@@ -287,6 +358,11 @@
         return copy.deepcopy(found_element)
 
     def apply_copy(self, rule, theme, content):
+        """
+        function that performs the deliverance "copy" 
+        rule given by rule on the theme and content given. 
+        see deliverance specification 
+        """
         theme_el = self.get_theme_el(rule,theme)
         if theme_el is None:
             return
@@ -323,6 +399,11 @@
             
 
     def apply_append_or_replace(self, rule, theme, content):
+        """
+        function that performs the deliverance "append-or-replace" 
+        rule given by rule on the theme and content given. 
+        see deliverance specification 
+        """
         theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
@@ -358,6 +439,11 @@
 
 
     def apply_drop(self, rule, theme, content):
+        """
+        function that performs the deliverance "drop" 
+        rule given by rule on the theme and content given. 
+        see deliverance specification 
+        """
         for context in ('theme', 'content'):
             if context not in rule.attrib: continue
             document = locals()[context]
@@ -379,6 +465,10 @@
 
 
     def strip_tails(self, els):
+        """
+        for each lxml etree element in the list els, 
+        set the tail of the element to None
+        """
         for el in els:
             el.tail = None
 
@@ -386,7 +476,7 @@
     def attach_tails(self,els):
         """
         whereever an lxml element in the list is followed by 
-        a string, set the tail of the lxml element to the string 
+        a string, set the tail of the lxml element to that string 
         """
         for index,el in enumerate(els): 
             # if we run into a string after the current element, 
@@ -398,6 +488,10 @@
 
 
     def make_debugging_comments(self, rule):
+        """
+        returns a pair of comments for insertion before and 
+        after work done by the rule given during debugging. 
+        """
         comment_before = etree.Comment("Deliverance: applying rule %s" % etree.tostring(rule))
         comment_after = etree.Comment("Deliverance: done applying rule %s" % etree.tostring(rule))
         return comment_before, comment_after

Modified: z3/deliverance/trunk/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/trunk/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/trunk/deliverance/test_wsgi.py	Mon Nov  6 21:22:17 2006
@@ -25,6 +25,12 @@
 
 
 def html_string_compare(astr, bstr):
+    """
+    compare to strings containing html based on html 
+    equivalence. Raises ValueError if the strings are 
+    not equivalent. 
+    """
+
     def reporter(x):
         print x
 

Modified: z3/deliverance/trunk/deliverance/utils.py
==============================================================================
--- z3/deliverance/trunk/deliverance/utils.py	(original)
+++ z3/deliverance/trunk/deliverance/utils.py	Mon Nov  6 21:22:17 2006
@@ -67,6 +67,11 @@
     NOCONTENT_KEY = "nocontent"
 
     def get_theme_el(self,rule,theme):
+        """
+        get the element referred to by the "theme" attribute of the 
+        rule given in the theme document given. theme and rule 
+        should be lxml etree structures. 
+        """
         theme_els = theme.xpath(rule.attrib[self.RULE_THEME_KEY])
         if len(theme_els)== 0:
             e = self.format_error("no element found in theme", rule)

Modified: z3/deliverance/trunk/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgifilter.py	Mon Nov  6 21:22:17 2006
@@ -1,20 +1,15 @@
 """
 Deliverance theming as WSGI middleware
-
-Deliverance applies a theme to content.
 """
 
 import re
 import urlparse
 import urllib
 from lxml import etree
-#from lxml.etree import HTML as parseHTML 
 from htmlserialize import decodeAndParseHTML as parseHTML
 from paste.wsgilib import intercept_output
 from paste.request import construct_url
 from paste.response import header_value, replace_header
-#from interpreter import Renderer
-#from xslt import Renderer
 from htmlserialize import tostring
 from utils import DeliveranceError
 from utils import DELIVERANCE_ERROR_PAGE
@@ -28,8 +23,21 @@
 
 
 class DeliveranceMiddleware(object):
+    """
+    a DeliveranceMiddleware object exposes a single deliverance 
+    tranformation as a WSGI middleware component. 
+    """
 
     def __init__(self, app, theme_uri, rule_uri, renderer='py'):
+        """
+        initializer
+        
+        app: wsgi application which this middleware wraps. 
+        theme_uri: uri referring the the theme document 
+        rule_uri: uri referring to the deliverance rules document 
+        renderer: selects deliverance render class to utilize when 
+          performing transformations, may be 'py' or 'xslt'
+        """
         self.app = app
         self.theme_uri = theme_uri
         self.rule_uri = rule_uri
@@ -48,6 +56,10 @@
             raise ValueError("Unknown Renderer: %s - Expecting 'py' or 'xslt'" % renderer)
 
     def get_renderer(self,environ):
+        """
+        retrieve the deliverance Renderer representing the transformation this 
+        middlware represents. Renderer may change according to caching rules. 
+        """
         try:
             self._lock.acquire()
             if not self._renderer or self.cache_expired():
@@ -58,6 +70,11 @@
             self._lock.release()
 
     def create_renderer(self,environ):
+        """
+        construct a new deliverance Renderer from the 
+        information passed to the initializer.  A new copy 
+        of the theme and rules is retrieved. 
+        """
         theme = self.theme(environ)
         rule = self.rule(environ)
         full_theme_uri = urlparse.urljoin(
@@ -96,9 +113,16 @@
 
         
     def cache_expired(self):
+        """
+        returns true if the stored Renderer should be refreshed 
+        """
         return self._cache_time + self._timeout < datetime.datetime.now()
 
     def rule(self, environ):
+        """
+        retrieves the data referred to by the rule_uri passed to the 
+        initializer. 
+        """
         try:
             return self.get_resource(environ,self.rule_uri)
         except Exception, message:
@@ -109,6 +133,10 @@
             raise DeliveranceError(newmessage)
 
     def theme(self, environ):
+        """
+        retrieves the data referred to by the theme_uri passed to the 
+        initializer. 
+        """
         try:
             return self.get_resource(environ,self.theme_uri)
         except Exception, message:
@@ -119,6 +147,13 @@
 
 
     def __call__(self, environ, start_response):
+        """
+        WSGI entrypoint, responds to the request in 
+        environ. responses from the wrapped WSGI 
+        application of type text/html are themed 
+        using the transformation specified in the 
+        initializer. 
+        """
         try:
             qs = environ.get('QUERY_STRING', '')
             environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False, with_query_string=False)
@@ -159,16 +194,28 @@
             return [ errpage ]
 
     def should_intercept(self, status, headers):
+        """
+        returns true if the status and headers given 
+        specify a response from the wrapped middleware 
+        which deliverance may need to theme. 
+        """
         type = header_value(headers, 'content-type')
         if type is None:
             return False
         return type.startswith('text/html') or type.startswith('application/xhtml+xml')
 
     def filter_body(self, environ, body):
+        """
+        returns the result of the deliverance transformation on the string 'body' 
+        in the context of environ. The result is a string containing HTML. 
+        """
         content = self.get_renderer(environ).render(parseHTML(body))
         return tostring(content)
 
     def get_resource(self, environ, uri):
+        """
+        retrieve the data referred to by the uri given. 
+        """
         internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)
         uri = urlparse.urljoin(internalBaseURL, uri)
         
@@ -178,18 +225,30 @@
             return self.get_external_resource(uri)
 
     def relative_uri(self, uri):
+        """
+        returns true if uri is relative, false if 
+        the uri is absolute. 
+        """
         if re.search(r'^[a-zA-Z]+:', uri):
             return False
         else:
             return True
 
     def get_external_resource(self, uri):
+        """
+        get the data referred to by the uri given 
+        using urllib (not through the wrapped app)
+        """
         f = urllib.urlopen(uri)
         content = f.read()
         f.close()
         return content
 
     def get_internal_resource(self, environ, uri):
+        """
+        get the data referred to by the uri given 
+        by using the wrapped WSGI application 
+        """
         environ = environ.copy()
         if not uri.startswith('/'):
             uri = '/' + uri

Modified: z3/deliverance/trunk/deliverance/xslt.py
==============================================================================
--- z3/deliverance/trunk/deliverance/xslt.py	(original)
+++ z3/deliverance/trunk/deliverance/xslt.py	Mon Nov  6 21:22:17 2006
@@ -41,12 +41,30 @@
     content at render time
     """
 
-    def __init__(self,theme,theme_uri,rule, rule_uri, reference_resolver=None):
+    def __init__(self, theme, theme_uri, rule, rule_uri, reference_resolver=None):
+        """
+        initializer. 
+
+        theme: an lxml etree represenatation of the theme page 
+        theme_uri: a uri referring to the theme page, used to 
+                    make relative links in the theme absolute 
+        rule: an lxml etree representation of the deliverance rules
+               performed by this transformation 
+        rule_uri: a uri representing the location of the rules document
+
+        reference_resolver: a function taking a url a parse type and 
+         and an encoding type returning the data referred to by the url 
+         in the manner specified. if parse is set to 'xml', the result 
+         should be an lxml etree structure, otherwise if encoding 
+         is specified, the data should be decoded using this encoding 
+         before being returned. 
+                
+        """
         theme_copy = copy.deepcopy(theme)
         self.rules = rule
         self.rules_uri = rule_uri
 
-        self.fixup_links(theme_copy,theme_uri)
+        self.fixup_links(theme_copy, theme_uri)
         self.xsl_escape_comments(theme_copy)
 
         if reference_resolver:
@@ -70,7 +88,13 @@
     
         
 
-    def render(self,content):
+    def render(self, content):
+        """
+        content: an lxml etree structure representing the content to render 
+        returns an lxml etree structure representing the result of the 
+                transformation represented by this class performed on the 
+                given content. 
+        """
         if content:
             if self.transform_drop:
                 content = self.transform_drop(content)
@@ -81,8 +105,12 @@
             return self.transform(etree.Element("dummy")).getroot()
 
 
-    def apply_rules(self,rules,theme):
-
+    def apply_rules(self, rules, theme):
+        """
+        prepares an xslt transforms which accpet a content document. 
+        The transforms represent the application of 
+        the rules given in the context of the theme given. 
+        """
         drop_rules, other_rules = self.separate_drop_rules(rules)
 
         if len(drop_rules):
@@ -92,10 +120,14 @@
             self.transform_drop = etree.XSLT(self.xslt_dropper)
 
         for rule in other_rules:
-            self.apply_rule(rule,theme)
+            self.apply_rule(rule, theme)
 
 
-    def apply_rule(self,rule,theme):
+    def apply_rule(self, rule, theme):
+        """
+        dispatch to proper rule handling function for 
+        the rule given. 
+        """
         if rule.tag == self.APPEND_RULE_TAG:
             self.apply_append(rule,theme)
         elif rule.tag == self.PREPEND_RULE_TAG:
@@ -117,14 +149,17 @@
                 "Rule %s (%s) not understood" % (
                     rule.tag, etree.tostring(rule)))
 
-    def apply_append(self,rule,theme):
-        theme_el = self.get_theme_el(rule,theme)
+    def apply_append(self, rule, theme):
+        """
+        prepare transform elements for "append" rule 
+        """
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
 
         # add an element that produces an error in the theme if 
         # no content is matched 
-        self.add_conditional_missing_content_error(theme,rule)
+        self.add_conditional_missing_content_error(theme, rule)
 
 
         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
@@ -133,14 +168,17 @@
         self.debug_append(theme_el, copier, rule)
 
 
-    def apply_prepend(self,rule,theme):
-        theme_el = self.get_theme_el(rule,theme)
+    def apply_prepend(self, rule, theme):
+        """
+        prepare transform elements for "prepend" rule 
+        """
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
 
         # add an element that produces an error in the theme if 
         # no content is matched 
-        self.add_conditional_missing_content_error(theme,rule)
+        self.add_conditional_missing_content_error(theme, rule)
 
         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
 
@@ -149,8 +187,11 @@
         self.debug_prepend(theme_el, copier, rule)
 
 
-    def apply_replace(self,rule,theme):
-        theme_el = self.get_theme_el(rule,theme)
+    def apply_replace(self, rule, theme):
+        """
+        prepare transform elements for "replace" rule 
+        """
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
 
@@ -159,7 +200,7 @@
                 theme, self.format_error("cannot replace whole theme", rule))            
             return
 
-        self.add_conditional_missing_content_error(theme,rule)      
+        self.add_conditional_missing_content_error(theme, rule)      
 
         copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
         copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
@@ -175,8 +216,12 @@
         self.debug_replace(theme_el,choose,rule)
 
 
-    def apply_copy(self,rule,theme):
-        theme_el = self.get_theme_el(rule,theme)
+    def apply_copy(self, rule, theme):
+        """
+        prepare transform elements for "prepend" rule 
+        """
+
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
 
@@ -203,14 +248,17 @@
                                           rule.attrib[self.RULE_CONTENT_KEY], 
                                           normal_theme_el, 
                                           copy_theme_el)
-        self.debug_replace(theme_el,choose,rule)
+        self.debug_replace(theme_el, choose,rule)
         copy_theme_el.tail = None
         normal_theme_el.tail = None
         
 
    
-    def apply_append_or_replace(self,rule,theme):
-        theme_el = self.get_theme_el(rule,theme)
+    def apply_append_or_replace(self, rule, theme):
+        """
+        prepare transform elements for "append-or-replace" rule 
+        """
+        theme_el = self.get_theme_el(rule, theme)
         if theme_el is None:
             return 
         remove_tag = self.get_tag_from_xpath(rule.attrib[self.RULE_CONTENT_KEY])
@@ -220,7 +268,7 @@
 
         # add an element that produces an error in the theme if 
         # no content is matched 
-        self.add_conditional_missing_content_error(theme,rule)
+        self.add_conditional_missing_content_error(theme, rule)
 
         for el in theme_el:
             if el.tag == remove_tag:
@@ -236,8 +284,10 @@
         self.debug_append(theme_el, copier, rule)
 
 
-    def apply_drop(self,rule,theme):
-        
+    def apply_drop(self, rule, theme):
+        """
+        prepare transform elements for "drop" rule 
+        """
         if self.RULE_THEME_KEY in rule.attrib:
             if len(theme.xpath(rule.attrib[self.RULE_THEME_KEY])) == 0:
                 if rule.get(self.NOCONTENT_KEY) == 'ignore':
@@ -265,7 +315,7 @@
 
 
 
-    def xsl_escape_comments(self,doc):
+    def xsl_escape_comments(self, doc):
         """
         replaces comment nodes with xsl:comment nodes so they will 
         appear in the result of a transform rather than being 
@@ -275,7 +325,7 @@
         for c in comment_nodes:
             escaped = etree.Element("{%s}comment" % nsmap["xsl"])
             escaped.text = c.text 
-            self.replace_element(c,escaped)
+            self.replace_element(c, escaped)
     
     def add_conditional_missing_content_error(self,theme,rule):
         """
@@ -292,7 +342,7 @@
             conditional = etree.Element("{%s}if" % nsmap["xsl"])
             conditional.set("test", "count(%s)=0" % rule.attrib[self.RULE_CONTENT_KEY])
             conditional.append(err)
-            self.add_to_body_start(theme,conditional)
+            self.add_to_body_start(theme, conditional)
         
 
     def make_when_otherwise(self, test, whenbody, otherwisebody):

From ltucker at codespeak.net  Tue Nov  7 23:43:22 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue,  7 Nov 2006 23:43:22 +0100 (CET)
Subject: [z3-checkins] r34351 - in z3/deliverance/buildout/trunk: .
	fixlibsearch fixlibsearch/topp
	fixlibsearch/topp.fixlibsearch.egg-info
	fixlibsearch/topp/fixlibsearch
Message-ID: <20061107224322.DC35010075@code0.codespeak.net>

Author: ltucker
Date: Tue Nov  7 23:43:19 2006
New Revision: 34351

Added:
   z3/deliverance/buildout/trunk/fixlibsearch/
   z3/deliverance/buildout/trunk/fixlibsearch/README.txt
   z3/deliverance/buildout/trunk/fixlibsearch/setup.py
   z3/deliverance/buildout/trunk/fixlibsearch/topp/
   z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/
   z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/PKG-INFO
   z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/SOURCES.txt
   z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/dependency_links.txt
   z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/entry_points.txt
   z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/requires.txt
   z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/top_level.txt
   z3/deliverance/buildout/trunk/fixlibsearch/topp/__init__.py
   z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/
   z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py
Modified:
   z3/deliverance/buildout/trunk/README.libraries
   z3/deliverance/buildout/trunk/buildout.cfg
Log:
wraps distutils scripts to set LD_LIBRARY_PATH when using buildout binaries

Modified: z3/deliverance/buildout/trunk/README.libraries
==============================================================================
--- z3/deliverance/buildout/trunk/README.libraries	(original)
+++ z3/deliverance/buildout/trunk/README.libraries	Tue Nov  7 23:43:19 2006
@@ -1,9 +1,6 @@
 
-if you see output from the compiler during the buildout along the lines of: 
 
-unrecognized option '-R/your/buildout/path/parts/libxml2/lib'
-
-or the message:
+if you recieve the message:
 UserWarning: Deliverance requires the CVS HEAD version of libxml2
 
 this indicates the build has not properly built lxml to use the versions of libxml2 and libxslt 

Modified: z3/deliverance/buildout/trunk/buildout.cfg
==============================================================================
--- z3/deliverance/buildout/trunk/buildout.cfg	(original)
+++ z3/deliverance/buildout/trunk/buildout.cfg	Tue Nov  7 23:43:19 2006
@@ -1,6 +1,6 @@
 [buildout]
-develop = zc.recipe.cmmi deliverance
-parts = libxml2 libxslt lxml lxml-inst deliverance-inst
+develop = zc.recipe.cmmi deliverance fixlibsearch
+parts = libxml2 libxslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
 
 [libxml2]
 recipe = zc.recipe.cmmi
@@ -27,3 +27,8 @@
 recipe = zc.recipe.egg
 eggs = deliverance
 
+[fix-deliverance-scripts]
+recipe = topp.fixlibsearch
+eggs = deliverance
+libpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libxslt/lib
+

Added: z3/deliverance/buildout/trunk/fixlibsearch/README.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/README.txt	Tue Nov  7 23:43:19 2006
@@ -0,0 +1,4 @@
+This is a recipe to hack runtime library search paths into 
+the scripts created by distutils. On certain platforms, 
+distutils does not pass the correct library flags to 
+gcc during linking. 

Added: z3/deliverance/buildout/trunk/fixlibsearch/setup.py
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/setup.py	Tue Nov  7 23:43:19 2006
@@ -0,0 +1,23 @@
+from setuptools import setup, find_packages
+
+name = "topp.fixlibsearch"
+setup(
+    name = name,
+    version = "1.0",
+    author = "",
+    author_email = "",
+    description = "ZC Buildout recipe to hack distutils scripts",
+    long_description = open('README.txt').read(),
+    license = "GPL",
+    keywords = "",
+    url='http://svn.zope.org/'+name,
+
+    packages = find_packages(),
+    include_package_data = True,
+    data_files = [('.', ['README.txt'])],
+    install_requires = ['zc.buildout', 'zope.testing', 'zc.recipe.egg',
+                        'setuptools'],
+    dependency_links = ['http://download.zope.org/distribution/'],
+    entry_points = {'zc.buildout':
+                    ['default = %s:Recipe' % name]},
+    )

Added: z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/PKG-INFO
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/PKG-INFO	Tue Nov  7 23:43:19 2006
@@ -0,0 +1,14 @@
+Metadata-Version: 1.0
+Name: topp.fixlibsearch
+Version: 1.0
+Summary: ZC Buildout recipe to hack distutils scripts
+Home-page: http://svn.zope.org/topp.fixlibsearch
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: GPL
+Description: This is a recipe to hack runtime library search paths into
+        the scripts created by distutils. On certain platforms,
+        distutils does not pass the correct library flags to
+        gcc during linking.
+        
+Platform: UNKNOWN

Added: z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/SOURCES.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/SOURCES.txt	Tue Nov  7 23:43:19 2006
@@ -0,0 +1,10 @@
+README.txt
+setup.py
+topp/__init__.py
+topp.fixlibsearch.egg-info/PKG-INFO
+topp.fixlibsearch.egg-info/SOURCES.txt
+topp.fixlibsearch.egg-info/dependency_links.txt
+topp.fixlibsearch.egg-info/entry_points.txt
+topp.fixlibsearch.egg-info/requires.txt
+topp.fixlibsearch.egg-info/top_level.txt
+topp/fixlibsearch/__init__.py

Added: z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/dependency_links.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/dependency_links.txt	Tue Nov  7 23:43:19 2006
@@ -0,0 +1 @@
+http://download.zope.org/distribution/

Added: z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/entry_points.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/entry_points.txt	Tue Nov  7 23:43:19 2006
@@ -0,0 +1,3 @@
+[zc.buildout]
+default = topp.fixlibsearch:Recipe
+

Added: z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/requires.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/requires.txt	Tue Nov  7 23:43:19 2006
@@ -0,0 +1,4 @@
+zc.buildout
+zope.testing
+zc.recipe.egg
+setuptools
\ No newline at end of file

Added: z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/top_level.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/top_level.txt	Tue Nov  7 23:43:19 2006
@@ -0,0 +1 @@
+topp

Added: z3/deliverance/buildout/trunk/fixlibsearch/topp/__init__.py
==============================================================================

Added: z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py	Tue Nov  7 23:43:19 2006
@@ -0,0 +1,53 @@
+from zc.recipe.egg import Egg
+import pkg_resources
+import os,stat
+
+class Recipe: 
+
+  def __init__(self, buildout, name, options):
+      self.options = options 
+      self.buildout = buildout 
+      self.name = name
+
+  def install(self):
+      options = self.options
+      dists = [
+          r.strip() 
+          for r in options.get('eggs', self.name).split('\n')
+          if r.strip()]
+
+      libpath = options.get('libpath').strip()
+
+      bindir = self.buildout['buildout']['bin-directory']
+
+      for dist in dists: 
+          for script in pkg_resources.get_entry_map(dist, 'console_scripts').keys():
+              self.fixscript(os.path.join(bindir,script), libpath)
+
+
+      return ()
+
+      
+
+  def fixscript(self, script, libpath):
+      """
+      wraps distutils script to set LD_LIBRARY_PATH to libpath
+      """
+      
+      oldscript = script + ".wrapped"
+      interpreter = open(script).readline()[2:].strip()
+
+      os.rename(script,oldscript)
+
+      s = open(script, 'w')
+      s.write(''.join(["#!%s\n\n" % interpreter,  
+                       "import os\n",
+                       "import subprocess\n", 
+                       "os.environ['LD_LIBRARY_PATH'] = '%s'\n\n" % libpath, 
+                       "if __name__ == '__main__':\n", 
+                       "    subprocess.call(['%s', '%s'])" % (interpreter,oldscript)
+                       ]))
+      
+      
+      os.chmod(script,
+               stat.S_IRWXU|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH)

From ltucker at codespeak.net  Tue Nov  7 23:43:58 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue,  7 Nov 2006 23:43:58 +0100 (CET)
Subject: [z3-checkins] r34352 -
	z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info
Message-ID: <20061107224358.9980A10075@code0.codespeak.net>

Author: ltucker
Date: Tue Nov  7 23:43:56 2006
New Revision: 34352

Removed:
   z3/deliverance/buildout/trunk/fixlibsearch/topp.fixlibsearch.egg-info/
Log:
removing generated egg-info

From ltucker at codespeak.net  Tue Nov  7 23:55:10 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue,  7 Nov 2006 23:55:10 +0100 (CET)
Subject: [z3-checkins] r34353 -
	z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch
Message-ID: <20061107225510.1A42710075@code0.codespeak.net>

Author: ltucker
Date: Tue Nov  7 23:55:07 2006
New Revision: 34353

Modified:
   z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py
Log:
right... scripts need command line arguments...

Modified: z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py
==============================================================================
--- z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py	(original)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py	Tue Nov  7 23:55:07 2006
@@ -42,10 +42,11 @@
       s = open(script, 'w')
       s.write(''.join(["#!%s\n\n" % interpreter,  
                        "import os\n",
+                       "import sys\n",
                        "import subprocess\n", 
                        "os.environ['LD_LIBRARY_PATH'] = '%s'\n\n" % libpath, 
                        "if __name__ == '__main__':\n", 
-                       "    subprocess.call(['%s', '%s'])" % (interpreter,oldscript)
+                       "    subprocess.call(['%s', '%s'] + sys.argv)" % (interpreter,oldscript)
                        ]))
       
       

From ltucker at codespeak.net  Wed Nov  8 00:00:03 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed,  8 Nov 2006 00:00:03 +0100 (CET)
Subject: [z3-checkins] r34354 - z3/deliverance/buildout/trunk
Message-ID: <20061107230003.B4EE610075@code0.codespeak.net>

Author: ltucker
Date: Wed Nov  8 00:00:00 2006
New Revision: 34354

Modified:
   z3/deliverance/buildout/trunk/README.txt
Log:
adding brief proxy command line example

Modified: z3/deliverance/buildout/trunk/README.txt
==============================================================================
--- z3/deliverance/buildout/trunk/README.txt	(original)
+++ z3/deliverance/buildout/trunk/README.txt	Wed Nov  8 00:00:00 2006
@@ -16,7 +16,13 @@
 
 
 You should then be able to run the deliverance-handtransform and
-deliverance-proxy in bin.
+deliverance-proxy in bin, eg: 
+
+ ./bin/deliverance-proxy --serve=http://localhost:9999
+     --proxy=http://www.openplans.org --rule=file:///home/ltucker/zcss.xml
+     --theme=http://www.csszengarden.org --rewrite
+
+run ./bin/deliverance-proxy --help for information 
 
 To run tests: 
 cd deliverance

From ltucker at codespeak.net  Wed Nov  8 00:01:46 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed,  8 Nov 2006 00:01:46 +0100 (CET)
Subject: [z3-checkins] r34355 - z3/deliverance/buildout/trunk
Message-ID: <20061107230146.9441410075@code0.codespeak.net>

Author: ltucker
Date: Wed Nov  8 00:01:45 2006
New Revision: 34355

Modified:
   z3/deliverance/buildout/trunk/README.txt
Log:
add pointer do deliverance README.txt

Modified: z3/deliverance/buildout/trunk/README.txt
==============================================================================
--- z3/deliverance/buildout/trunk/README.txt	(original)
+++ z3/deliverance/buildout/trunk/README.txt	Wed Nov  8 00:01:45 2006
@@ -6,6 +6,7 @@
 build of Deliverance and its dependencies. 
 
 See: http://www.openplans.org/projects/deliverance
+and ./deliverance/README.txt
 for more information on Deliverance
 
 
@@ -16,7 +17,7 @@
 
 
 You should then be able to run the deliverance-handtransform and
-deliverance-proxy in bin, eg: 
+deliverance-proxy which are in bin, eg: 
 
  ./bin/deliverance-proxy --serve=http://localhost:9999
      --proxy=http://www.openplans.org --rule=file:///home/ltucker/zcss.xml

From ltucker at codespeak.net  Wed Nov  8 00:36:16 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed,  8 Nov 2006 00:36:16 +0100 (CET)
Subject: [z3-checkins] r34356 -
	z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch
Message-ID: <20061107233616.0584810075@code0.codespeak.net>

Author: ltucker
Date: Wed Nov  8 00:36:12 2006
New Revision: 34356

Modified:
   z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py
Log:
leave off sys.argv[0] when tacking on script arguments

Modified: z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py
==============================================================================
--- z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py	(original)
+++ z3/deliverance/buildout/trunk/fixlibsearch/topp/fixlibsearch/__init__.py	Wed Nov  8 00:36:12 2006
@@ -46,7 +46,9 @@
                        "import subprocess\n", 
                        "os.environ['LD_LIBRARY_PATH'] = '%s'\n\n" % libpath, 
                        "if __name__ == '__main__':\n", 
-                       "    subprocess.call(['%s', '%s'] + sys.argv)" % (interpreter,oldscript)
+                       "    args = ['%s', '%s']\n" % (interpreter,oldscript),
+                       "    args += sys.argv[1:]\n",
+                       "    subprocess.call(args)"
                        ]))
       
       

From ltucker at codespeak.net  Wed Nov  8 00:37:40 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed,  8 Nov 2006 00:37:40 +0100 (CET)
Subject: [z3-checkins] r34357 - z3/deliverance/buildout/trunk
Message-ID: <20061107233740.8CDF210075@code0.codespeak.net>

Author: ltucker
Date: Wed Nov  8 00:37:38 2006
New Revision: 34357

Modified:
   z3/deliverance/buildout/trunk/README.txt
Log:
change example to not point at domain squatters

Modified: z3/deliverance/buildout/trunk/README.txt
==============================================================================
--- z3/deliverance/buildout/trunk/README.txt	(original)
+++ z3/deliverance/buildout/trunk/README.txt	Wed Nov  8 00:37:38 2006
@@ -21,7 +21,7 @@
 
  ./bin/deliverance-proxy --serve=http://localhost:9999
      --proxy=http://www.openplans.org --rule=file:///home/ltucker/zcss.xml
-     --theme=http://www.csszengarden.org --rewrite
+     --theme=http://www.csszengarden.com --rewrite
 
 run ./bin/deliverance-proxy --help for information 
 

From ltucker at codespeak.net  Mon Nov 13 22:53:06 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 13 Nov 2006 22:53:06 +0100 (CET)
Subject: [z3-checkins] r34589 - z3/deliverance/buildout/trunk
Message-ID: <20061113215306.AAAC8101CE@code0.codespeak.net>

Author: ltucker
Date: Mon Nov 13 22:53:05 2006
New Revision: 34589

Modified:
   z3/deliverance/buildout/trunk/buildout.cfg
Log:
include-path change for lxml

Modified: z3/deliverance/buildout/trunk/buildout.cfg
==============================================================================
--- z3/deliverance/buildout/trunk/buildout.cfg	(original)
+++ z3/deliverance/buildout/trunk/buildout.cfg	Mon Nov 13 22:53:05 2006
@@ -16,7 +16,7 @@
 [lxml]
 recipe = zc.recipe.egg:custom
 eggs = lxml
-include-dirs = ${buildout:directory}/parts/libxml2/include:${buildout:directory}/parts/libxslt/include
+include-dirs = ${buildout:directory}/parts/libxml2/include/libxml2:${buildout:directory}/parts/libxslt/include
 rpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libxslt/lib
 
 [lxml-inst]

From ltucker at codespeak.net  Wed Nov 15 06:34:39 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 15 Nov 2006 06:34:39 +0100 (CET)
Subject: [z3-checkins] r34613 - in z3/deliverance/buildout/trunk: .
	fixlibsearch helpers helpers/topp helpers/topp/helpers
Message-ID: <20061115053439.D882610087@code0.codespeak.net>

Author: ltucker
Date: Wed Nov 15 06:34:09 2006
New Revision: 34613

Added:
   z3/deliverance/buildout/trunk/helpers/
   z3/deliverance/buildout/trunk/helpers/README.txt
   z3/deliverance/buildout/trunk/helpers/setup.py
   z3/deliverance/buildout/trunk/helpers/topp/
   z3/deliverance/buildout/trunk/helpers/topp/__init__.py
   z3/deliverance/buildout/trunk/helpers/topp/helpers/
   z3/deliverance/buildout/trunk/helpers/topp/helpers/__init__.py
   z3/deliverance/buildout/trunk/helpers/topp/helpers/addbinpath.py
   z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py
Removed:
   z3/deliverance/buildout/trunk/fixlibsearch/
Modified:
   z3/deliverance/buildout/trunk/buildout.cfg
Log:
partial work to remove dependency on existing libxml2/xslt install

Modified: z3/deliverance/buildout/trunk/buildout.cfg
==============================================================================
--- z3/deliverance/buildout/trunk/buildout.cfg	(original)
+++ z3/deliverance/buildout/trunk/buildout.cfg	Wed Nov 15 06:34:09 2006
@@ -1,11 +1,11 @@
 [buildout]
-develop = zc.recipe.cmmi deliverance fixlibsearch
-parts = libxml2 libxslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
+develop = zc.recipe.cmmi deliverance helpers
+parts = fix-bin-path libxml2 libxslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
 
 [libxml2]
 recipe = zc.recipe.cmmi
 url = ftp://xmlsoft.org/libxml2/libxml2-2.6.27.tar.gz
-extra_options = --without-python
+extra_options = --without-python 
 
 [libxslt]
 recipe = zc.recipe.cmmi
@@ -27,8 +27,11 @@
 recipe = zc.recipe.egg
 eggs = deliverance
 
+[fix-bin-path]
+recipe = topp.helpers:addbinpath
+path = ${buildout:directory}/parts/libxml2/bin:${buildout:directory}/parts/libxslt/bin
+
 [fix-deliverance-scripts]
-recipe = topp.fixlibsearch
+recipe = topp.helpers:fixlibsearch
 eggs = deliverance
 libpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libxslt/lib
-

Added: z3/deliverance/buildout/trunk/helpers/README.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/helpers/README.txt	Wed Nov 15 06:34:09 2006
@@ -0,0 +1,4 @@
+This is a recipe to hack runtime library search paths into 
+the scripts created by distutils. On certain platforms, 
+distutils does not pass the correct library flags to 
+gcc during linking. 

Added: z3/deliverance/buildout/trunk/helpers/setup.py
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/helpers/setup.py	Wed Nov 15 06:34:09 2006
@@ -0,0 +1,24 @@
+from setuptools import setup, find_packages
+
+name = "topp.helpers"
+setup(
+    name = name,
+    version = "1.0",
+    author = "",
+    author_email = "",
+    description = "ZC Buildout recipe to hack distutils scripts",
+    long_description = open('README.txt').read(),
+    license = "GPL",
+    keywords = "",
+    url='http://svn.zope.org/'+name,
+
+    packages = find_packages(),
+    include_package_data = True,
+    data_files = [('.', ['README.txt'])],
+    install_requires = ['zc.buildout', 'zope.testing', 'zc.recipe.egg',
+                        'setuptools'],
+    dependency_links = ['http://download.zope.org/distribution/'],
+    entry_points = {'zc.buildout':
+                    ['addbinpath = topp.helpers.addbinpath:Recipe',
+		     'fixlibsearch = topp.helpers.fixlibsearch:Recipe']},
+    )

Added: z3/deliverance/buildout/trunk/helpers/topp/__init__.py
==============================================================================

Added: z3/deliverance/buildout/trunk/helpers/topp/helpers/__init__.py
==============================================================================

Added: z3/deliverance/buildout/trunk/helpers/topp/helpers/addbinpath.py
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/helpers/topp/helpers/addbinpath.py	Wed Nov 15 06:34:09 2006
@@ -0,0 +1,25 @@
+import os 
+
+class Recipe: 
+
+  def __init__(self, buildout, name, options):
+      self.options = options 
+      self.buildout = buildout 
+      self.name = name
+
+  def install(self):
+      options = self.options
+      path = options.get('path')
+      if path is None:
+        return ()
+
+      oldpath = os.environ.get('PATH','')
+
+      newpathelts = path.split(':')
+      oldpathelts =  oldpath.split(':')
+      os.environ['PATH'] = ':'.join(newpathelts + oldpathelts)
+      print "PATH =", os.environ['PATH']  
+
+      return ()
+
+      

Added: z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py
==============================================================================
--- (empty file)
+++ z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py	Wed Nov 15 06:34:09 2006
@@ -0,0 +1,55 @@
+import pkg_resources
+import os,stat
+
+class Recipe: 
+
+  def __init__(self, buildout, name, options):
+      self.options = options 
+      self.buildout = buildout 
+      self.name = name
+
+  def install(self):
+      options = self.options
+      dists = [
+          r.strip() 
+          for r in options.get('eggs', self.name).split('\n')
+          if r.strip()]
+
+      libpath = options.get('libpath').strip()
+
+      bindir = self.buildout['buildout']['bin-directory']
+
+      for dist in dists: 
+          for script in pkg_resources.get_entry_map(dist, 'console_scripts').keys():
+              self.fixscript(os.path.join(bindir,script), libpath)
+
+
+      return ()
+
+      
+
+  def fixscript(self, script, libpath):
+      """
+      wraps distutils script to set LD_LIBRARY_PATH to libpath
+      """
+      
+      oldscript = script + ".wrapped"
+      interpreter = open(script).readline()[2:].strip()
+
+      os.rename(script,oldscript)
+
+      s = open(script, 'w')
+      s.write(''.join(["#!%s\n\n" % interpreter,  
+                       "import os\n",
+                       "import sys\n",
+                       "import subprocess\n", 
+                       "os.environ['LD_LIBRARY_PATH'] = '%s'\n\n" % libpath, 
+                       "if __name__ == '__main__':\n", 
+                       "    args = ['%s', '%s']\n" % (interpreter,oldscript),
+                       "    args += sys.argv[1:]\n",
+                       "    subprocess.call(args)"
+                       ]))
+      
+      
+      os.chmod(script,
+               stat.S_IRWXU|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH)

From ltucker at codespeak.net  Wed Nov 15 06:52:17 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 15 Nov 2006 06:52:17 +0100 (CET)
Subject: [z3-checkins] r34614 - z3/deliverance/buildout/trunk/helpers
Message-ID: <20061115055217.ED07B10087@code0.codespeak.net>

Author: ltucker
Date: Wed Nov 15 06:52:14 2006
New Revision: 34614

Modified:
   z3/deliverance/buildout/trunk/helpers/README.txt
   z3/deliverance/buildout/trunk/helpers/setup.py
Log:
just documentation updates

Modified: z3/deliverance/buildout/trunk/helpers/README.txt
==============================================================================
--- z3/deliverance/buildout/trunk/helpers/README.txt	(original)
+++ z3/deliverance/buildout/trunk/helpers/README.txt	Wed Nov 15 06:52:14 2006
@@ -1,4 +1,6 @@
-This is a recipe to hack runtime library search paths into 
+addbinpath is a recipe to insert entries into $PATH
+
+fixlibsearch is a recipe to hack runtime library search paths into 
 the scripts created by distutils. On certain platforms, 
 distutils does not pass the correct library flags to 
 gcc during linking. 

Modified: z3/deliverance/buildout/trunk/helpers/setup.py
==============================================================================
--- z3/deliverance/buildout/trunk/helpers/setup.py	(original)
+++ z3/deliverance/buildout/trunk/helpers/setup.py	Wed Nov 15 06:52:14 2006
@@ -6,7 +6,7 @@
     version = "1.0",
     author = "",
     author_email = "",
-    description = "ZC Buildout recipe to hack distutils scripts",
+    description = "ZC Buildout recipe to add entries to PATH and hack distutils scripts",
     long_description = open('README.txt').read(),
     license = "GPL",
     keywords = "",
@@ -15,7 +15,7 @@
     packages = find_packages(),
     include_package_data = True,
     data_files = [('.', ['README.txt'])],
-    install_requires = ['zc.buildout', 'zope.testing', 'zc.recipe.egg',
+    install_requires = ['zc.buildout', 
                         'setuptools'],
     dependency_links = ['http://download.zope.org/distribution/'],
     entry_points = {'zc.buildout':

From ltucker at codespeak.net  Wed Nov 15 07:23:23 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Wed, 15 Nov 2006 07:23:23 +0100 (CET)
Subject: [z3-checkins] r34615 - z3/deliverance/buildout/trunk
Message-ID: <20061115062323.182F310083@code0.codespeak.net>

Author: ltucker
Date: Wed Nov 15 07:23:20 2006
New Revision: 34615

Modified:
   z3/deliverance/buildout/trunk/buildout.cfg
Log:
eliminates need for pre-existing libxml2/xslt by working around a bug in lxml setup.py

Modified: z3/deliverance/buildout/trunk/buildout.cfg
==============================================================================
--- z3/deliverance/buildout/trunk/buildout.cfg	(original)
+++ z3/deliverance/buildout/trunk/buildout.cfg	Wed Nov 15 07:23:20 2006
@@ -1,13 +1,13 @@
 [buildout]
 develop = zc.recipe.cmmi deliverance helpers
-parts = fix-bin-path libxml2 libxslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
+parts = fix-bin-path libxml2 libXslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
 
 [libxml2]
 recipe = zc.recipe.cmmi
 url = ftp://xmlsoft.org/libxml2/libxml2-2.6.27.tar.gz
 extra_options = --without-python 
 
-[libxslt]
+[libXslt]
 recipe = zc.recipe.cmmi
 url = ftp://xmlsoft.org/libxml2/libxslt-1.1.18.tar.gz
 extra_options = --with-libxml-prefix=${buildout:directory}/parts/libxml2/ 
@@ -16,8 +16,8 @@
 [lxml]
 recipe = zc.recipe.egg:custom
 eggs = lxml
-include-dirs = ${buildout:directory}/parts/libxml2/include/libxml2:${buildout:directory}/parts/libxslt/include
-rpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libxslt/lib
+include-dirs = ${buildout:directory}/parts/libxml2/include/libxml2:${buildout:directory}/parts/libXslt/include
+rpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libXslt/lib
 
 [lxml-inst]
 recipe = zc.recipe.egg
@@ -29,9 +29,9 @@
 
 [fix-bin-path]
 recipe = topp.helpers:addbinpath
-path = ${buildout:directory}/parts/libxml2/bin:${buildout:directory}/parts/libxslt/bin
+path = ${buildout:directory}/parts/libxml2/bin:${buildout:directory}/parts/libXslt/bin
 
 [fix-deliverance-scripts]
 recipe = topp.helpers:fixlibsearch
 eggs = deliverance
-libpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libxslt/lib
+libpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libXslt/lib

From ianb at codespeak.net  Thu Nov 16 19:17:43 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 16 Nov 2006 19:17:43 +0100 (CET)
Subject: [z3-checkins] r34686 - z3/deliverance/trunk/deliverance
Message-ID: <20061116181743.1DF2F100F8@code0.codespeak.net>

Author: ianb
Date: Thu Nov 16 19:17:40 2006
New Revision: 34686

Modified:
   z3/deliverance/trunk/deliverance/tests.py
Log:
Add some nose options that I like (also find doctests)

Modified: z3/deliverance/trunk/deliverance/tests.py
==============================================================================
--- z3/deliverance/trunk/deliverance/tests.py	(original)
+++ z3/deliverance/trunk/deliverance/tests.py	Thu Nov 16 19:17:40 2006
@@ -110,6 +110,13 @@
 
 
 def main(args=None):
+    # Kind of a crude way to pass info to nose...
+    os.environ.update(dict(
+        NOSE_WHERE=os.path.dirname(__file__),
+        NOSE_DETAILED_ERRORS='t',
+        NOSE_WITH_DOCTEST='t',
+        NOSE_DOCTEST_EXTENSION='.txt',
+        NOSE_WITH_MISSING_TESTS='t'))
     import nose; nose.main() 
 
 if __name__ == '__main__':

From ianb at codespeak.net  Thu Nov 16 19:18:27 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 16 Nov 2006 19:18:27 +0100 (CET)
Subject: [z3-checkins] r34687 - z3/deliverance/trunk/deliverance
Message-ID: <20061116181827.B3CAE100F8@code0.codespeak.net>

Author: ianb
Date: Thu Nov 16 19:18:24 2006
New Revision: 34687

Added:
   z3/deliverance/trunk/deliverance/test_relocate.txt   (contents, props changed)
Modified:
   z3/deliverance/trunk/deliverance/fixuplinks.py
   z3/deliverance/trunk/deliverance/relocateresponse.py
Log:
Tests for link relocating, and some bug fixes: respect base href, and handling http://foo (with no trailing slash) as identical to http://foo/

Modified: z3/deliverance/trunk/deliverance/fixuplinks.py
==============================================================================
--- z3/deliverance/trunk/deliverance/fixuplinks.py	(original)
+++ z3/deliverance/trunk/deliverance/fixuplinks.py	Thu Nov 16 19:18:24 2006
@@ -4,6 +4,7 @@
 
 
 from htmlserialize import decodeAndParseHTML, tostring
+import urlparse
 import re
 
 def fixup_text_links(doc, link_repl_func, remove_base_tags=True):
@@ -22,7 +23,7 @@
     output of that function replaces the link.
     """
     if remove_base_tags:
-        remove_base_tags_from_document(doc)
+        resolve_base_tags_in_document(doc)
 
     for attrib in 'href', 'src':
         els = doc.xpath('//*[@%s]' % attrib)
@@ -31,14 +32,23 @@
 
     fixup_css_links(doc, link_repl_func)
 
-def remove_base_tags_from_document(doc):
+def resolve_base_tags_in_document(doc):
     """
     removes all html <base href=""> tags 
     from the document given. 
     """
+    base_href = None
     basetags = doc.xpath('//base[@href]')
     for b in basetags:
+        base_href = b.attrib['href']
         b.getparent().remove(b)
+    if base_href is None:
+        return
+    # Now that we have a base_href (blech) we have to fix up all the
+    # links in the document with this new information.
+    def link_repl(href):
+        return urlparse.urljoin(base_href, href)
+    fixup_links(doc, link_repl, remove_base_tags=False)
     
 CSS_URL_PAT = re.compile(r'url\((.*?)\)', re.I)
 def fixup_css_links(doc, link_repl_func):

Modified: z3/deliverance/trunk/deliverance/relocateresponse.py
==============================================================================
--- z3/deliverance/trunk/deliverance/relocateresponse.py	(original)
+++ z3/deliverance/trunk/deliverance/relocateresponse.py	Thu Nov 16 19:18:24 2006
@@ -2,10 +2,11 @@
 Takes a response (headers + content) and relocates it, changing domain
 names and paths.
 """
-import fixuplinks
 import urlparse
+import re
 from paste.request import construct_url
 from paste.response import header_value
+import fixuplinks
 
 def relocate_response(headers, content, base_href, old_href, new_href):
     """
@@ -29,8 +30,14 @@
         return relocate_href(href, base_href, old_href, new_href)
     return fixuplinks.fixup_text_links(content, sub_link)
 
+# This catches the case of http://foo, which is equivalent to
+# http://foo/ :
+_domain_no_slash_re = re.compile(r'^[a-z]+://[^/]+$', re.I)
+
 def relocate_href(href, base_href, old_href, new_href):
     real_href = urlparse.urljoin(base_href, href)
+    if _domain_no_slash_re.search(real_href):
+        real_href += '/'
     if not real_href.startswith(old_href):
         return href
     return new_href + real_href[len(old_href):]

Added: z3/deliverance/trunk/deliverance/test_relocate.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/test_relocate.txt	Thu Nov 16 19:18:24 2006
@@ -0,0 +1,92 @@
+These are tests of relocateresponse::
+
+    >>> from deliverance.relocateresponse import *
+
+In all these examples we'll be using ``http://old`` for the old
+(to-be-replaced) URL and ``https://new`` for the new URL (note the
+scheme change).  Out of laziness we'll define some keywords we use
+with all these transformations::
+
+    >>> kw = dict(base_href='http://old/base/path.html',
+    ...           old_href='http://old/',
+    ...           new_href='https://new/')
+
+Now lets look at simple href rewriting.
+
+Normal rewrite::
+
+    >>> relocate_href('http://old/bar', **kw)
+    'https://new/bar'
+
+Note that the trailing doesn't matter in this one case (since
+``http://old`` and ``http://old/`` are entirely equivalent)::
+
+    >>> relocate_href('http://old', **kw)
+    'https://new/'
+
+It does in other cases::
+
+    >>> relocate_href('http://old-test/foo',
+    ...               base_href='',
+    ...               old_href='http://old-test/foo/',
+    ...               new_href='https://new')
+    'http://old-test/foo'
+    >>> relocate_href('http://old-test/foo/',
+    ...               base_href='',
+    ...               old_href='http://old-test/foo/',
+    ...               new_href='https://new')
+    'https://new'
+
+Rewriting a link that doesn't match old_href is a no-op::
+
+    >>> relocate_href('http://foo/bar', **kw)
+    'http://foo/bar'
+
+Relative links are handled::
+
+    >>> relocate_href('index.html', **kw)
+    'https://new/base/index.html'
+
+Now we look at header rewriting.  Note that Location is rewritten, but
+other headers are not.  (Set-Cookie should also get some rewriting,
+but does not yet)::
+
+    >>> relocate_headers([('X-Unknown', 'http://old'),
+    ...                   ('Location', 'http://old/foo/bar')],
+    ...                  **kw)
+    [('X-Unknown', 'http://old'), ('Location', 'https://new/foo/bar')]
+
+But the location header won't be rewritten if it points to a
+third-party site::
+
+    >>> relocate_headers([('Location', 'http://foo/bar')],
+    ...                  **kw)
+    [('Location', 'http://foo/bar')]
+
+Now for content.  First, to make it easier on us, we need to trim the
+normalized HTML we get from these functions::
+
+    >>> import re
+    >>> def pr_html(html):
+    ...     html = re.sub(r'</?(?:html|head|body)>', '', html)
+    ...     html = re.sub(r'<meta.*?>', '', html)
+    ...     print html.strip()
+
+Some basics::
+
+    >>> pr_html(relocate_content(
+    ...     '<a href="http://old/blah/blah.html">link</a>', **kw))
+    <a href="https://new/blah/blah.html">link</a>
+    >>> pr_html(relocate_content(
+    ...     '<script src="http://old/foo.js"></script>', **kw))
+    <script src="https://new/foo.js"></script>
+    >>> pr_html(relocate_content(
+    ...     '<link href="foo.css">', **kw))
+    <link href="https://new/base/foo.css">
+    >>> pr_html(relocate_content('''\
+    ... <base href="http://blah/stuff/index.html">
+    ... <link href="foo.css">
+    ... <a href="http://old/bar.html">x</a>\
+    ... ''', **kw))
+    <link href="http://blah/stuff/foo.css">
+    <a href="https://new/bar.html">x</a>

From ianb at codespeak.net  Thu Nov 16 19:37:21 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 16 Nov 2006 19:37:21 +0100 (CET)
Subject: [z3-checkins] r34690 - z3/deliverance/trunk/deliverance
Message-ID: <20061116183721.B246E100F8@code0.codespeak.net>

Author: ianb
Date: Thu Nov 16 19:37:17 2006
New Revision: 34690

Modified:
   z3/deliverance/trunk/deliverance/relocateresponse.py
   z3/deliverance/trunk/deliverance/test_relocate.txt
Log:
Added cookie domain rewriting

Modified: z3/deliverance/trunk/deliverance/relocateresponse.py
==============================================================================
--- z3/deliverance/trunk/deliverance/relocateresponse.py	(original)
+++ z3/deliverance/trunk/deliverance/relocateresponse.py	Thu Nov 16 19:37:17 2006
@@ -22,6 +22,16 @@
     for name, value in headers:
         if name.lower() == 'location':
             value = relocate_href(value, base_href, old_href, new_href)
+        if name.lower() == 'set-cookie':
+            if 'domain' in value:
+                # We have to rewrite the domain
+                old_domain = urlparse.urlsplit(old_href)[1].split(':')[0]
+                new_domain = urlparse.urlsplit(new_href)[1].split(':')[0]
+                def repl(match):
+                    return match.group(1)+new_domain
+                value = re.sub(
+                    r'(domain=[^ ",]*)%s' % re.escape(old_domain),
+                    repl, value)
         new_headers.append((name, value))
     return new_headers
 

Modified: z3/deliverance/trunk/deliverance/test_relocate.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/test_relocate.txt	(original)
+++ z3/deliverance/trunk/deliverance/test_relocate.txt	Thu Nov 16 19:37:17 2006
@@ -47,14 +47,23 @@
     >>> relocate_href('index.html', **kw)
     'https://new/base/index.html'
 
-Now we look at header rewriting.  Note that Location is rewritten, but
-other headers are not.  (Set-Cookie should also get some rewriting,
-but does not yet)::
+Now we look at header rewriting.  Note that Location and Set-Cookie is
+rewritten, but other headers are not::
 
-    >>> relocate_headers([('X-Unknown', 'http://old'),
-    ...                   ('Location', 'http://old/foo/bar')],
-    ...                  **kw)
-    [('X-Unknown', 'http://old'), ('Location', 'https://new/foo/bar')]
+    >>> relocate_headers(
+    ...     [('X-Unknown', 'http://old'),
+    ...      ('Location', 'http://old/foo/bar'),
+    ...      ('Set-Cookie', 'foo=bar; domain=old')],
+    ...     **kw)
+    [('X-Unknown', 'http://old'), ('Location', 'https://new/foo/bar'), ('Set-Cookie', 'foo=bar; domain=new')]
+
+We'll even rewrite wildcard domains, though that might not be a good
+idea::
+
+    >>> relocate_headers(
+    ...     [('Set-Cookie', 'foo=bar; domain=*.old')],
+    ...     **kw)
+    [('Set-Cookie', 'foo=bar; domain=*.new')]
 
 But the location header won't be rewritten if it points to a
 third-party site::

From ianb at codespeak.net  Thu Nov 16 23:05:19 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 16 Nov 2006 23:05:19 +0100 (CET)
Subject: [z3-checkins] r34696 - z3/deliverance/trunk/deliverance
Message-ID: <20061116220519.86D8B100AA@code0.codespeak.net>

Author: ianb
Date: Thu Nov 16 23:05:15 2006
New Revision: 34696

Added:
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
      - copied unchanged from r34683, z3/deliverance/trunk/deliverance/wsgifilter.py
Removed:
   z3/deliverance/trunk/deliverance/wsgifilter.py
Modified:
   z3/deliverance/trunk/deliverance/proxyapp.py
   z3/deliverance/trunk/deliverance/test_wsgi.py
Log:
Renamed wsgifilter module to wsgimiddleware, to avoid name conflict with WSGIFilter

Modified: z3/deliverance/trunk/deliverance/proxyapp.py
==============================================================================
--- z3/deliverance/trunk/deliverance/proxyapp.py	(original)
+++ z3/deliverance/trunk/deliverance/proxyapp.py	Thu Nov 16 23:05:15 2006
@@ -4,7 +4,7 @@
 """
 
 from paste.proxy import TransparentProxy
-from deliverance import wsgifilter
+from deliverance.wsgimiddleware import DeliveranceMiddleware
 from deliverance.relocateresponse import RelocateMiddleware
 
 class ProxyDeliveranceApp(object):
@@ -18,7 +18,7 @@
         self.transparent = transparent
         self.debug_headers = debug_headers
         self.subapp = self.make_app()
-        self.deliverance_app = wsgifilter.DeliveranceMiddleware(
+        self.deliverance_app = DeliveranceMiddleware(
             self.subapp, theme_uri, rule_uri, renderer)
         self.relocate_content = relocate_content
 

Modified: z3/deliverance/trunk/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/trunk/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/trunk/deliverance/test_wsgi.py	Thu Nov 16 23:05:15 2006
@@ -3,7 +3,7 @@
 from lxml import etree
 from paste.fixture import TestApp
 from paste.urlparser import StaticURLParser
-from wsgifilter import DeliveranceMiddleware
+from deliverance.wsgimiddleware import DeliveranceMiddleware
 from formencode.doctest_xml_compare import xml_compare
 from htmlserialize import tostring
 

Deleted: /z3/deliverance/trunk/deliverance/wsgifilter.py
==============================================================================
--- /z3/deliverance/trunk/deliverance/wsgifilter.py	Thu Nov 16 23:05:15 2006
+++ (empty file)
@@ -1,294 +0,0 @@
-"""
-Deliverance theming as WSGI middleware
-"""
-
-import re
-import urlparse
-import urllib
-from lxml import etree
-from htmlserialize import decodeAndParseHTML as parseHTML
-from paste.wsgilib import intercept_output
-from paste.request import construct_url
-from paste.response import header_value, replace_header
-from htmlserialize import tostring
-from utils import DeliveranceError
-from utils import DELIVERANCE_ERROR_PAGE
-import sys 
-import datetime
-import threading
-import traceback
-from StringIO import StringIO
-
-DELIVERANCE_BASE_URL = 'deliverance.base-url'
-
-
-class DeliveranceMiddleware(object):
-    """
-    a DeliveranceMiddleware object exposes a single deliverance 
-    tranformation as a WSGI middleware component. 
-    """
-
-    def __init__(self, app, theme_uri, rule_uri, renderer='py'):
-        """
-        initializer
-        
-        app: wsgi application which this middleware wraps. 
-        theme_uri: uri referring the the theme document 
-        rule_uri: uri referring to the deliverance rules document 
-        renderer: selects deliverance render class to utilize when 
-          performing transformations, may be 'py' or 'xslt'
-        """
-        self.app = app
-        self.theme_uri = theme_uri
-        self.rule_uri = rule_uri
-        self._renderer = None
-        self._cache_time = datetime.datetime.now()
-        self._timeout = datetime.timedelta(0,10)
-        self._lock = threading.Lock()
-
-        if renderer == 'py':
-            import interpreter
-            self._rendererType = interpreter.Renderer
-        elif renderer == 'xslt':
-            import xslt
-            self._rendererType = xslt.Renderer
-        else:
-            raise ValueError("Unknown Renderer: %s - Expecting 'py' or 'xslt'" % renderer)
-
-    def get_renderer(self,environ):
-        """
-        retrieve the deliverance Renderer representing the transformation this 
-        middlware represents. Renderer may change according to caching rules. 
-        """
-        try:
-            self._lock.acquire()
-            if not self._renderer or self.cache_expired():
-                self._renderer = self.create_renderer(environ)
-                self._cache_time = datetime.datetime.now()
-            return self._renderer
-        finally:
-            self._lock.release()
-
-    def create_renderer(self,environ):
-        """
-        construct a new deliverance Renderer from the 
-        information passed to the initializer.  A new copy 
-        of the theme and rules is retrieved. 
-        """
-        theme = self.theme(environ)
-        rule = self.rule(environ)
-        full_theme_uri = urlparse.urljoin(
-            construct_url(environ, with_path_info=False),
-            self.theme_uri)
-
-        def reference_resolver(href, parse, encoding=None):
-            text = self.get_resource(environ,href)
-            if parse == "xml":
-                return etree.XML(text)
-            elif encoding:
-                return text.decode(encoding)
-
-        try:
-            parsedTheme = parseHTML(theme)
-        except Exception, message:
-            newmessage = "Unable to parse theme page (" + self.theme_uri + ")"
-            if message:
-                newmessage += ":" + str(message)
-            raise DeliveranceError(newmessage)
-
-        try:
-            parsedRule = etree.XML(rule)
-        except Exception, message:
-            newmessage = "Unable to parse rules (" + self.rule_uri + ")"
-            if message:
-                newmessage += ":" + str(message)
-            raise DeliveranceError(newmessage)
-
-        return self._rendererType(
-            theme=parsedTheme,
-            theme_uri=full_theme_uri,
-            rule=parsedRule, 
-            rule_uri=self.rule_uri,
-            reference_resolver=reference_resolver)
-
-        
-    def cache_expired(self):
-        """
-        returns true if the stored Renderer should be refreshed 
-        """
-        return self._cache_time + self._timeout < datetime.datetime.now()
-
-    def rule(self, environ):
-        """
-        retrieves the data referred to by the rule_uri passed to the 
-        initializer. 
-        """
-        try:
-            return self.get_resource(environ,self.rule_uri)
-        except Exception, message:
-            newmessage = "Unable to retrieve rules from " + self.rule_uri 
-            if message:
-                newmessage += ": " + str(message)
-
-            raise DeliveranceError(newmessage)
-
-    def theme(self, environ):
-        """
-        retrieves the data referred to by the theme_uri passed to the 
-        initializer. 
-        """
-        try:
-            return self.get_resource(environ,self.theme_uri)
-        except Exception, message:
-            newmessage = "Unable to retrieve theme page from " + self.theme_uri 
-            if message:
-                newmessage += ": " + str(message)
-            raise DeliveranceError(newmessage)
-
-
-    def __call__(self, environ, start_response):
-        """
-        WSGI entrypoint, responds to the request in 
-        environ. responses from the wrapped WSGI 
-        application of type text/html are themed 
-        using the transformation specified in the 
-        initializer. 
-        """
-        try:
-            qs = environ.get('QUERY_STRING', '')
-            environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False, with_query_string=False)
-            notheme = 'notheme' in qs
-            if notheme:
-                return self.app(environ, start_response)
-            if 'HTTP_ACCEPT_ENCODING' in environ:
-                del environ['HTTP_ACCEPT_ENCODING']
-
-            status, headers, body = intercept_output(
-                environ, self.app,
-                self.should_intercept,
-                start_response)
-
-            # ignore non-html responses 
-            if status is None:
-                return body
-
-            # don't theme html snippets 
-            if self.hasHTMLTag(body):
-                body = self.filter_body(environ, body)
-
-            replace_header(headers, 'content-length', str(len(body)))
-            replace_header(headers, 'content-type', 'text/html; charset=utf-8')
-            start_response(status, headers)
-            return [body]
-        
-        except DeliveranceError, message:            
-            stack = StringIO()
-            traceback.print_exception(sys.exc_info()[0],
-                                      sys.exc_info()[1],
-                                      sys.exc_info()[2],
-                                      file=stack)
-            status = "500 Internal Server Error"
-            headers = [('Content-type','text/html')]
-            start_response(status,headers)
-            errpage = DELIVERANCE_ERROR_PAGE % (message,stack.getvalue())
-            return [ errpage ]
-
-    def should_intercept(self, status, headers):
-        """
-        returns true if the status and headers given 
-        specify a response from the wrapped middleware 
-        which deliverance may need to theme. 
-        """
-        type = header_value(headers, 'content-type')
-        if type is None:
-            return False
-        return type.startswith('text/html') or type.startswith('application/xhtml+xml')
-
-    def filter_body(self, environ, body):
-        """
-        returns the result of the deliverance transformation on the string 'body' 
-        in the context of environ. The result is a string containing HTML. 
-        """
-        content = self.get_renderer(environ).render(parseHTML(body))
-        return tostring(content)
-
-    def get_resource(self, environ, uri):
-        """
-        retrieve the data referred to by the uri given. 
-        """
-        internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)
-        uri = urlparse.urljoin(internalBaseURL, uri)
-        
-        if  internalBaseURL and uri.startswith(internalBaseURL):
-            return self.get_internal_resource(environ, uri[len(internalBaseURL):])
-        else:
-            return self.get_external_resource(uri)
-
-    def relative_uri(self, uri):
-        """
-        returns true if uri is relative, false if 
-        the uri is absolute. 
-        """
-        if re.search(r'^[a-zA-Z]+:', uri):
-            return False
-        else:
-            return True
-
-    def get_external_resource(self, uri):
-        """
-        get the data referred to by the uri given 
-        using urllib (not through the wrapped app)
-        """
-        f = urllib.urlopen(uri)
-        content = f.read()
-        f.close()
-        return content
-
-    def get_internal_resource(self, environ, uri):
-        """
-        get the data referred to by the uri given 
-        by using the wrapped WSGI application 
-        """
-        environ = environ.copy()
-        if not uri.startswith('/'):
-            uri = '/' + uri
-        environ['PATH_INFO'] = uri
-        environ['SCRIPT_NAME'] = environ[DELIVERANCE_BASE_URL]
-        if environ['QUERY_STRING']:
-            environ['QUERY_STRING'] += '&notheme'
-        else:
-            environ['QUERY_STRING'] = 'notheme'
-
-        path_info = environ['PATH_INFO']
-        status, headers, body = intercept_output(environ, self.app)
-        if not status.startswith('200'):
-            loc = header_value(headers, 'location')
-            if loc:
-                loc = ' location=%r' % loc
-            else:
-                loc = ''
-            raise DeliveranceError(
-                "Request for internal resource at %s (%r) failed with status code %r%s"
-                % (construct_url(environ), path_info, status,
-                   loc))
-        return body
-
-    HTML_DOC_PAT = re.compile(r"^.*<\s*html(\s*|>).*$",re.I|re.M)
-    def hasHTMLTag(self, body):
-        """
-        a quick and dirty check to see if some text contains 
-        anything that looks like an html tag. This could 
-        certainly be improved if needed or there are 
-        ambiguous tags 
-        """
-        return self.HTML_DOC_PAT.search(body) is not None
-
-def make_filter(app, global_conf,
-                theme_uri=None, rule_uri=None):
-    assert theme_uri is not None, (
-        "You must give a theme_uri")
-    assert rule_uri is not None, (
-        "You must give a rule_uri")
-    return DeliveranceMiddleware(
-        app, theme_uri, rule_uri)
-

From ianb at codespeak.net  Thu Nov 16 23:06:54 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 16 Nov 2006 23:06:54 +0100 (CET)
Subject: [z3-checkins] r34697 - z3/deliverance/trunk/deliverance
Message-ID: <20061116220654.EA7E5100AA@code0.codespeak.net>

Author: ianb
Date: Thu Nov 16 23:06:52 2006
New Revision: 34697

Added:
   z3/deliverance/trunk/deliverance/exp_proxycommand.py   (contents, props changed)
Log:
Added frontend like deliverance-proxy, but using WSGIFilter.  Not quite ready to actually use it yet, though; hence putting it in its own module instead of replacing proxycommand and proxyapp

Added: z3/deliverance/trunk/deliverance/exp_proxycommand.py
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/exp_proxycommand.py	Thu Nov 16 23:06:52 2006
@@ -0,0 +1,48 @@
+"""
+Experimental proxy command using WSGIFilter
+"""
+
+import sys
+import pkg_resources
+pkg_resources.require('WSGIFilter')
+from wsgifilter.proxycommand import *
+from deliverance.wsgimiddleware import DeliveranceMiddleware
+
+def make_middleware_factory(theme_uri, rule_uri, renderer='py'):
+    def make_middleware(app):
+        return DeliveranceMiddleware(
+            app, theme_uri=theme_uri, rule_uri=rule_uri,
+            renderer=renderer)
+    return make_middleware
+
+def main(args=None):
+    if args is None:
+        args = sys.argv[1:]
+    parser = make_basic_optparser(
+        'Deliverance')
+    parser.add_option(
+        '--theme',
+        help="The URI of the theme to use",
+        dest="theme_uri")
+    parser.add_option(
+        '--rule',
+        help="The URI of the ruleset to use",
+        dest="rule_uri")
+    parser.add_option(
+        '--renderer',
+        help="Select which renderer to use: 'py' or 'xslt'",
+        default='py')
+    options, args = parser.parse_args(args)
+    middleware = make_middleware_factory(
+        theme_uri=options.theme_uri,
+        rule_uri=options.rule_uri,
+        renderer=options.renderer)
+    run_proxy_command(
+        options, args, middleware, parser)
+    
+if __name__ == '__main__':
+    import pkg_resources
+    pkg_resources.require('Deliverance')
+    from deliverance.exp_proxycommand import main as exp_main
+    exp_main()
+    

From ianb at codespeak.net  Fri Nov 17 21:28:19 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Fri, 17 Nov 2006 21:28:19 +0100 (CET)
Subject: [z3-checkins] r34722 - in z3/deliverance/DeliveranceDemo: .
	branches tags trunk
Message-ID: <20061117202819.34067100B7@code0.codespeak.net>

Author: ianb
Date: Fri Nov 17 21:28:16 2006
New Revision: 34722

Added:
   z3/deliverance/DeliveranceDemo/
   z3/deliverance/DeliveranceDemo/branches/
   z3/deliverance/DeliveranceDemo/tags/
   z3/deliverance/DeliveranceDemo/trunk/
Log:
New project DeliveranceDemo

From ianb at codespeak.net  Fri Nov 17 21:30:19 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Fri, 17 Nov 2006 21:30:19 +0100 (CET)
Subject: [z3-checkins] r34723 - in z3/deliverance/DeliveranceDemo/trunk: .
	DeliveranceDemo.egg-info ddemo ddemo/config ddemo/controllers
	ddemo/docs ddemo/i18n ddemo/lib ddemo/models ddemo/public
	ddemo/templates ddemo/tests ddemo/tests/functional
Message-ID: <20061117203019.A362C100A6@code0.codespeak.net>

Author: ianb
Date: Fri Nov 17 21:30:05 2006
New Revision: 34723

Added:
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/   (props changed)
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paste_deploy_config.ini_tmpl
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paster_plugins.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/README.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/config/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/config/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/config/environment.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/config/middleware.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/config/routing.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/error.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/template.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/docs/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/docs/index.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/i18n/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/i18n/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/app_globals.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/base.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/helpers.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/models/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/models/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/public/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/autohandler
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/test_models.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/websetup.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/development.ini
   z3/deliverance/DeliveranceDemo/trunk/setup.cfg
   z3/deliverance/DeliveranceDemo/trunk/setup.py   (contents, props changed)
Log:
New project layout

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paste_deploy_config.ini_tmpl
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paste_deploy_config.ini_tmpl	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,40 @@
+#
+# DeliveranceDemo - Pylons configuration
+#
+# The %(here)s variable will be replaced with the parent directory of this file
+#
+[DEFAULT]
+debug = true
+email_to = you at yourdomain.com
+smtp_server = localhost
+error_email_from = paste at localhost
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 5000
+
+[app:main]
+use = egg:DeliveranceDemo
+cache_dir = %(here)s/data
+session_key = ddemo
+session_secret = ${app_instance_secret}
+app_instance_uuid = ${app_instance_uuid}
+
+# 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.
+set debug = false

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paster_plugins.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paster_plugins.txt	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,3 @@
+Pylons
+WebHelpers
+PasteScript

Added: z3/deliverance/DeliveranceDemo/trunk/README.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/README.txt	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,19 @@
+This file is for you to describe the DeliveranceDemo application. Typically
+you would include information such as the information below:
+
+Installation and Setup
+======================
+
+Install ``DeliveranceDemo`` using easy_install::
+
+    easy_install DeliveranceDemo
+
+Make a config file as follows::
+
+    paster make-config DeliveranceDemo config.ini
+    
+Tweak the config file as appropriate and then setup the application::
+
+    paster setup-app config.ini
+    
+Then you are ready to go.

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,8 @@
+"""
+ddemo
+
+This file loads the finished app from ddemo.config.middleware.
+
+"""
+
+from ddemo.config.middleware import make_app

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/config/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/config/__init__.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1 @@
+#

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/config/environment.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/config/environment.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,29 @@
+import os
+
+import pylons.config
+import webhelpers
+
+from ddemo.config.routing import make_map
+
+def load_environment(global_conf={}, app_conf={}):
+    map = make_map(global_conf, app_conf)
+    # Setup our paths
+    root_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    paths = {'root_path': root_path,
+             'controllers': os.path.join(root_path, 'controllers'),
+             'templates': [os.path.join(root_path, path) for path in \
+                           ('components', 'templates')],
+             'static_files': os.path.join(root_path, 'public')
+             }
+    
+    # The following options are passed directly into Myghty, so all configuration options
+    # available to the Myghty handler are available for your use here
+    myghty = {}
+    myghty['log_errors'] = True
+    myghty['escapes'] = dict(l=webhelpers.auto_link, s=webhelpers.simple_format)
+    
+    # Add your own Myghty config options here, note that all config options will override
+    # any Pylons config options
+    
+    # Return our loaded config object
+    return pylons.config.Config(myghty, map, paths)

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/config/middleware.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/config/middleware.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,59 @@
+from paste import httpexceptions
+from paste.cascade import Cascade
+from paste.urlparser import StaticURLParser
+from paste.registry import RegistryManager
+from paste.deploy.config import ConfigMiddleware
+from paste.deploy.converters import asbool
+
+from pylons.error import error_template
+from pylons.middleware import ErrorHandler, ErrorDocuments, StaticJavascripts, error_mapper
+import pylons.wsgiapp
+
+from ddemo.config.environment import load_environment
+import ddemo.lib.helpers
+import ddemo.lib.app_globals as app_globals
+
+def make_app(global_conf, full_stack=True, **app_conf):
+    """Create a WSGI application and return it
+    
+    global_conf is a dict representing the Paste configuration options, the
+    paste.deploy.converters should be used when parsing Paste config options
+    to ensure they're treated properly.
+    
+    """
+    # Load our Pylons configuration defaults
+    config = load_environment(global_conf, app_conf)
+    config.init_app(global_conf, app_conf, package='ddemo')
+        
+    # Load our default Pylons WSGI app and make g available
+    app = pylons.wsgiapp.PylonsApp(config, helpers=ddemo.lib.helpers,
+                                   g=app_globals.Globals)
+    g = app.globals
+    app = ConfigMiddleware(app, {'app_conf':app_conf,
+        'global_conf':global_conf})
+    
+    # YOUR MIDDLEWARE
+    # Put your own middleware here, so that any problems are caught by the error
+    # handling middleware underneath
+    
+    # If errror handling and exception catching will be handled by middleware
+    # for multiple apps, you will want to set full_stack = False in your config
+    # file so that it can catch the problems.
+    if asbool(full_stack):
+        # Change HTTPExceptions to HTTP responses
+        app = httpexceptions.make_middleware(app, global_conf)
+    
+        # Error Handling
+        app = ErrorHandler(app, global_conf, error_template=error_template, **config.errorware)
+    
+        # Display error documents for 401, 403, 404 status codes (if debug is disabled also
+        # intercepts 500)
+        app = ErrorDocuments(app, global_conf, mapper=error_mapper, **app_conf)
+    
+    # Establish the Registry for this application
+    app = RegistryManager(app)
+    
+    static_app = StaticURLParser(config.paths['static_files'])
+    javascripts_app = StaticJavascripts()
+    app = Cascade([static_app, javascripts_app, app])
+    return app

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/config/routing.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/config/routing.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,23 @@
+"""
+Setup your Routes options here
+"""
+import sys, os
+from routes import Mapper
+
+def make_map(global_conf={}, app_conf={}):
+    root_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+    map = Mapper(directory=os.path.join(root_path, 'controllers'))
+    
+    # This route handles displaying the error page and graphics used in the 404/500
+    # error pages. It should likely stay at the top to ensure that the error page is
+    # displayed properly.
+    map.connect('error/:action/:id', controller='error')
+    
+    # Define your routes. The more specific and detailed routes should be defined first,
+    # so they may take precedent over the more generic routes. For more information, refer
+    # to the routes manual @ http://routes.groovie.org/docs/
+    map.connect(':controller/:action/:id')
+    map.connect('*url', controller='template', action='view')
+
+    return map

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py
==============================================================================

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/error.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/error.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,33 @@
+import os.path
+from paste import fileapp
+from pylons.middleware import media_path, error_document_template
+from pylons.util import get_prefix
+from ddemo.lib.base import *
+
+class ErrorController(BaseController):
+    """
+    Class to generate error documents as and when they are required. This behaviour of this
+    class can be altered by changing the parameters to the ErrorDocuments middleware in 
+    your config/middleware.py file.
+    """
+
+    def document(self):
+        """
+        Change this method to change how error documents are displayed
+        """
+        page = error_document_template % {
+            'prefix': get_prefix(request.environ),
+            'code': request.params.get('code', ''),
+            'message': request.params.get('message', ''),
+        }
+        return Response(page)
+
+    def img(self, id):
+        return self._serve_file(os.path.join(media_path, 'img', id))
+        
+    def style(self, id):
+        return self._serve_file(os.path.join(media_path, 'style', id))
+
+    def _serve_file(self, path):
+        fapp = fileapp.FileApp(path)
+        return fapp(request.environ, self.start_response)

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/template.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/template.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,28 @@
+from ddemo.lib.base import *
+
+class TemplateController(BaseController):
+    def view(self, url):
+        """
+        This is the last place which is tried during a request to try to find a 
+        file to serve. It could be used for example to display a template::
+        
+            def view(self, url):
+                return render_response(url)
+        
+        Or, if you're using Myghty and would like to catch the component not
+        found error which will occur when the template doesn't exist; you
+        can use the following version which will provide a 404 if the template
+        doesn't exist::
+        
+            import myghty.exception
+            
+            def view(self, url):
+                try:
+                    return render_response('/'+url)
+                except myghty.exception.ComponentNotFound:
+                    return Response(code=404)
+        
+        The default is just to abort the request with a 404 File not found
+        status message.
+        """
+        abort(404)

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/docs/index.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/docs/index.txt	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,11 @@
+ddemo
++++++
+
+This is the main index page of your documentation. It should be written in reStructuredText format.
+
+You can generate your documentation in HTML format by running this command::
+
+    setup.py pudge
+    
+For this to work you will need to download and install ``buildutils`` and ``pudge``.
+

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/i18n/__init__.py
==============================================================================

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/__init__.py
==============================================================================

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/app_globals.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/app_globals.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,33 @@
+class Globals(object):
+
+    def __init__(self, global_conf, app_conf, **extra):
+        """
+        You can put any objects which need to be initialised only once
+        here as class attributes and they will be available as globals
+        everywhere in your application and will be intialised only once,
+        not on every request.
+        
+        ``global_conf``
+            The same as variable used throughout ``config/middleware.py``
+            namely, the variables from the ``[DEFAULT]`` section of the
+            configuration file.
+            
+        ``app_conf``
+            The same as the ``kw`` dictionary used throughout 
+            ``config/middleware.py`` namely, the variables the section 
+            in the config file for your application.
+            
+        ``extra``
+            The configuration returned from ``load_config`` in 
+            ``config/middleware.py`` which may be of use in the setup of 
+            your global variables.
+            
+        """
+        pass
+        
+    def __del__(self):
+        """
+        Put any cleanup code to be run when the application finally exits 
+        here.
+        """
+        pass

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/base.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/base.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,14 @@
+from pylons import Response, c, g, cache, request, session
+from pylons.controllers import WSGIController
+from pylons.decorators import jsonify, validate
+from pylons.templating import render, render_response
+from pylons.helpers import abort, redirect_to, etag_cache, _
+import ddemo.models as model
+import ddemo.lib.helpers as h
+
+class BaseController(WSGIController):
+    def __call__(self, environ, start_response):
+        # Insert any code to be run per request here. The Routes match
+        # is under environ['pylons.routes_dict'] should you want to check
+        # the action or route vars here
+        return WSGIController.__call__(self, environ, start_response)

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/helpers.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/lib/helpers.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,7 @@
+"""
+Helper functions
+
+All names available in this module will be available under the Pylons h object.
+"""
+from webhelpers import *
+from pylons.helpers import _, log, set_lang, get_lang

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/models/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/models/__init__.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,11 @@
+## NOTE
+##   If you plan on using SQLObject, the following should be un-commented and provides
+##   a starting point for setting up your schema
+
+#from sqlobject import *
+#from pylons.database import PackageHub
+#hub = PackageHub("ddemo")
+#__connection__ = hub
+
+# You should then import your SQLObject classes
+# from myclass import MyDataClass

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Pylons Default Page</title>
+  <style>
+    body { background-color: #fff; color: #333; }
+
+    body, p {
+      font-family: verdana, arial, helvetica, sans-serif;
+      font-size:   12px;
+      line-height: 18px;
+    }
+    pre {
+      background-color: #eee;
+      padding: 10px;
+      font-size: 11px;
+      line-height: 13px;
+    }
+
+    a { color: #000; }
+    a:visited { color: #666; }
+    a:hover { color: #fff; background-color:#000; }
+  </style>
+</head>
+<body>
+
+<h1>Welcome to your Pylons Web Application</h1>
+
+<h2>Weren't expecting to see this page?</h2>
+
+<p>The ddemo/public/ directory is searched for static files
+ <i>before</i> your controllers are run. Remove this file (ddemo/public/index.html) and edit
+  the routes in <tt>ddemo/config/routing.py</tt> like so:
+  <pre> map.connect('', controller='hello', action='index')</pre>
+</p>
+
+<h2>Getting Started</h2>
+<p>You're now ready to start creating your own web application. Here's what a basic controller looks
+like to print out 'Hello World' and respond to http://127.0.0.1:5000/hello:
+<pre>
+# ddemo/controllers/hello.py
+# Note that the line above is the file you should create and put the following into...
+
+from ddemo.lib.base import *
+
+class HelloController(BaseController):
+    def index(self):
+        return Response('Hello World')
+        
+</pre>
+</p>
+
+<h3>Using a template</h3>
+<p>If you want to call a template and do something a little more complex, here's an example printing out some
+request information from a Myghty template.
+<pre>
+# ddemo/templates/serverinfo.myt
+
+&lt;p>Hi, here's the server environment: &lt;br />
+&lt;% str(request.environ) %>&lt;/p>
+
+&lt;p>
+here's the URL you called: &lt;% h.url_for() %>
+&lt;/p>
+
+&lt;p>
+and here's the name you set: &lt;% c.name %>
+&lt;/p>
+
+</pre>
+
+Then add this to your hello controller class:
+<pre>
+    def serverinfo(self):
+        c.name = 'The Black Knight'
+        return render_response('/serverinfo.myt')
+</pre>
+
+You can now view the page at: <tt>http://127.0.0.1:5000/hello/serverinfo</tt>
+</p>
+</body>
+</html>

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/autohandler
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/autohandler	Fri Nov 17 21:30:05 2006
@@ -0,0 +1 @@
+% m.call_next()
\ No newline at end of file

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/__init__.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,28 @@
+import os, sys
+from unittest import TestCase
+
+here_dir = os.path.dirname(__file__)
+conf_dir = os.path.dirname(os.path.dirname(here_dir))
+
+sys.path.insert(0, conf_dir)
+
+import pkg_resources
+
+pkg_resources.working_set.add_entry(conf_dir)
+
+pkg_resources.require('Paste')
+pkg_resources.require('PasteScript')
+
+from paste.deploy import loadapp
+import paste.fixture
+
+from ddemo.config.routing import *
+from routes import request_config, url_for
+
+class TestController(TestCase):
+    def __init__(self, *args):
+        wsgiapp = loadapp('config:development.ini', relative_to=conf_dir)
+        self.app = paste.fixture.TestApp(wsgiapp)
+        TestCase.__init__(self, *args)
+
+__all__ = ['url_for', 'TestController']

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/__init__.py
==============================================================================

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/test_models.py
==============================================================================

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/websetup.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/websetup.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,5 @@
+def setup_config(command, filename, section, vars):
+    """
+    Place any commands to setup ddemo here.
+    """
+    pass
\ No newline at end of file

Added: z3/deliverance/DeliveranceDemo/trunk/development.ini
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/development.ini	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,39 @@
+#
+# DeliveranceDemo - Pylons development environment configuration
+#
+# The %(here)s variable will be replaced with the parent directory of this file
+#
+[DEFAULT]
+debug = true
+email_to = you at yourdomain.com
+smtp_server = localhost
+error_email_from = paste at localhost
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 5000
+
+[app:main]
+use = egg:DeliveranceDemo
+cache_dir = %(here)s/data
+session_key = ddemo
+session_secret = somesecret
+
+# 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.
+#set debug = false

Added: z3/deliverance/DeliveranceDemo/trunk/setup.cfg
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/setup.cfg	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,34 @@
+[egg_info]
+tag_build = dev
+tag_svn_revision = true
+
+[easy_install]
+find_links = http://www.pylonshq.com/download/
+
+[pudge]
+theme = pythonpaste.org
+
+# Add extra doc files here with spaces between them
+docs = ddemo/docs/index.txt 
+
+# Doc Settings
+doc_base = ddemo/docs/
+dest = ddemo/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 
+#           link1=/community/ Community
+#           link2=/download/ Download
+ 
+[publish]
+doc-dir=ddemo/docs/html
+make-dirs=1

Added: z3/deliverance/DeliveranceDemo/trunk/setup.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/setup.py	Fri Nov 17 21:30:05 2006
@@ -0,0 +1,21 @@
+from setuptools import setup, find_packages
+
+setup(
+    name='DeliveranceDemo',
+    version="",
+    #description="",
+    #author="",
+    #author_email="",
+    #url="",
+    install_requires=["Pylons>=0.9.3"],
+    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
+    [paste.app_install]
+    main=paste.script.appinstall:Installer
+    """,
+)
\ No newline at end of file

From ianb at codespeak.net  Fri Nov 17 23:30:12 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Fri, 17 Nov 2006 23:30:12 +0100 (CET)
Subject: [z3-checkins] r34724 - z3/deliverance/DeliveranceDemo/trunk
Message-ID: <20061117223012.1DE79100B3@code0.codespeak.net>

Author: ianb
Date: Fri Nov 17 23:30:09 2006
New Revision: 34724

Removed:
   z3/deliverance/DeliveranceDemo/trunk/
Log:
Decided to start over on layout

From ianb at codespeak.net  Mon Nov 20 18:46:10 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 20 Nov 2006 18:46:10 +0100 (CET)
Subject: [z3-checkins] r34802 - in z3/deliverance/DeliveranceDemo/trunk: .
	DeliveranceDemo.egg-info cache_data cache_data/templates
	cache_data/templates/lock cache_data/templates/obj data
	data/x.colorstudy.com ddemo ddemo/controllers ddemo/public
	ddemo/templates ddemo/tests
Message-ID: <20061120174610.C658510077@code0.codespeak.net>

Author: ianb
Date: Mon Nov 20 18:45:57 2006
New Revision: 34802

Added:
   z3/deliverance/DeliveranceDemo/trunk/
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/PKG-INFO
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/SOURCES.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/dependency_links.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/entry_points.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paste_deploy_config.ini_tmpl
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paster_plugins.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/requires.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/top_level.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/README.txt   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/cache_data/
   z3/deliverance/DeliveranceDemo/trunk/cache_data/templates/
   z3/deliverance/DeliveranceDemo/trunk/cache_data/templates/lock/
   z3/deliverance/DeliveranceDemo/trunk/cache_data/templates/obj/
   z3/deliverance/DeliveranceDemo/trunk/data/
   z3/deliverance/DeliveranceDemo/trunk/data/x.colorstudy.com/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/public/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/routing.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/autohandler
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/development.ini
   z3/deliverance/DeliveranceDemo/trunk/setup.cfg
   z3/deliverance/DeliveranceDemo/trunk/setup.py   (contents, props changed)
Log:
Added project (new layout)



Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/PKG-INFO
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/PKG-INFO	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: DeliveranceDemo
+Version: 0.0.0dev
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/SOURCES.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/SOURCES.txt	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,16 @@
+README.txt
+setup.cfg
+setup.py
+DeliveranceDemo.egg-info/PKG-INFO
+DeliveranceDemo.egg-info/SOURCES.txt
+DeliveranceDemo.egg-info/dependency_links.txt
+DeliveranceDemo.egg-info/entry_points.txt
+DeliveranceDemo.egg-info/paste_deploy_config.ini_tmpl
+DeliveranceDemo.egg-info/requires.txt
+DeliveranceDemo.egg-info/top_level.txt
+ddemo/__init__.py
+ddemo/helpers.py
+ddemo/routing.py
+ddemo/wsgiapp.py
+ddemo/controllers/__init__.py
+ddemo/tests/__init__.py

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/dependency_links.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/dependency_links.txt	Mon Nov 20 18:45:57 2006
@@ -0,0 +1 @@
+

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/entry_points.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/entry_points.txt	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,6 @@
+
+    [paste.app_factory]
+    main=ddemo:make_app
+    [paste.app_install]
+    main=paste.script.appinstall:Installer
+    
\ No newline at end of file

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paste_deploy_config.ini_tmpl
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paste_deploy_config.ini_tmpl	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,40 @@
+#
+# DeliveranceDemo - Pylons configuration
+#
+# The %(here)s variable will be replaced with the parent directory of this file
+#
+[DEFAULT]
+debug = true
+email_to = you at yourdomain.com
+smtp_server = localhost
+error_email_from = paste at localhost
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 5000
+
+[app:main]
+use = egg:DeliveranceDemo
+cache_dir = %(here)s/data
+session_key = ddemo
+session_secret = ${app_instance_secret}
+app_instance_uuid = ${app_instance_uuid}
+
+# 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.
+set debug = false

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paster_plugins.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/paster_plugins.txt	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,3 @@
+Pylons
+WebHelpers
+PasteScript

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/requires.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/requires.txt	Mon Nov 20 18:45:57 2006
@@ -0,0 +1 @@
+Pylons>=0.9.3
\ No newline at end of file

Added: z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/top_level.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/top_level.txt	Mon Nov 20 18:45:57 2006
@@ -0,0 +1 @@
+ddemo

Added: z3/deliverance/DeliveranceDemo/trunk/README.txt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/README.txt	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,19 @@
+This file is for you to describe the DeliveranceDemo application. Typically
+you would include information such as the information below:
+
+Installation and Setup
+======================
+
+Install ``DeliveranceDemo`` using easy_install::
+
+    easy_install DeliveranceDemo
+
+Make a config file as follows::
+
+    paster make-config DeliveranceDemo config.ini
+    
+Tweak the config file as appropriate and then setup the application::
+
+    paster setup-app config.ini
+    
+Then you are ready to go.

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,8 @@
+"""
+ddemo
+
+This file loads the finished app from ddemo.config.middleware.
+
+"""
+
+from ddemo.wsgiapp import make_app

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,13 @@
+from pylons import Response, c, g, cache, request, session
+from pylons.controllers import WSGIController
+from pylons.decorators import jsonify, validate
+from pylons.templating import render, render_response
+from pylons.helpers import abort, redirect_to, etag_cache
+import ddemo.helpers as h
+
+class BaseController(WSGIController):
+    def __call__(self, environ, start_response):
+        # Insert any code to be run per request here. The Routes match
+        # is under environ['pylons.routes_dict'] should you want to check
+        # the action or route vars here
+        return WSGIController.__call__(self, environ, start_response)

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,90 @@
+import re
+import os
+
+domain_re = re.compile(r'^[a-z][a-z0-9.\-]+\.[a-z]+$', re.I)
+
+class DataProvider(object):
+
+    def __init__(self, dir):
+        self.dir = dir
+        if not os.path.exists(self.dir):
+            print 'Creating data directory %s' % self.dir
+            os.makedirs(self.dir)
+
+    def domain(self, domain_name):
+        domain_name = self.normalize(domain_name)
+        dir = os.path.join(self.dir, domain_name)
+        if not os.path.exists(dir):
+            os.mkdir(dir)
+        return DomainDataProvider(domain_name, dir)
+
+    def normalize(self, domain_name):
+        domain_name = domain_name.strip().lower()
+        if not domain_re.search(domain_name):
+            raise ValueError(
+                'Bad domain name: %r' % domain_name)
+        return domain_name
+
+class file_property(object):
+
+    def __init__(self, basename):
+        self.basename = basename
+
+    def filename(self, obj):
+        return os.path.join(obj.dir, self.basename)
+
+    def __get__(self, obj, type=None):
+        if obj is None:
+            return self
+        if not os.path.exists(self.filename(obj)):
+            return None
+        f = open(filename, 'rb')
+        c = f.read()
+        f.close()
+
+    def __set__(self, obj, value):
+        f = open(self.filename(obj), 'wb')
+        f.write(value)
+        f.close()
+
+    def __del__(self, obj):
+        os.unlink(self.filename(obj))
+
+    def __repr__(self):
+        return '%s(%r)' % (
+            self.__class__.__name__, self.basename)
+
+class DomainDataProvider(object):
+
+    def __init__(self, domain_name, dir):
+        self.domain_name = domain_name
+        self.dir = dir
+
+    def __repr__(self):
+        return '<%s %s for %s in %r>' % (
+            self.__class__.__name__,
+            hex(id(self)),
+            self.domain_name,
+            self.dir)
+
+    def initialize(self):
+        for dir in [self.dir, self.rule_dir,
+                    self.static_dir]:
+            if not os.path.exists(dir):
+                os.mkdir(dir)
+
+    @property
+    def initialized(self):
+        return os.path.exists(
+            os.path.join(self.dir, 'remote.txt'))
+
+    @property
+    def rule_dir(self):
+        return os.path.join(self.dir, 'rules')
+
+    @property
+    def static_dir(self):
+        return os.path.join(self.dir, 'static')
+    
+    remote = file_property('remote.txt')
+    theme_uri = file_property('theme_uri.txt')

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,65 @@
+import posixpath
+import os
+from paste.request import path_info_pop, construct_url
+from paste import httpexceptions
+from paste.urlparser import StaticURLParser
+from paste.fileapp import FileApp
+from wsgifilter import proxyapp
+from deliverance.wsgimiddleware import DeliveranceMiddleware
+from ddemo.dataprovider import DataProvider
+
+def norm_path(urlpath):
+    if not urlpath:
+        urlpath = '/'
+    assert urlpath.startswith('/')
+    urlpath = posixpath.normpath(posixpath.abspath(urlpath))
+    return urlpath
+
+class DeliveranceDispatcher(object):
+
+    def __init__(self, pylons_app, app_conf):
+        self.pylons_app = pylons_app
+        data_dir = app_conf['data_dir']
+        self.provider = DataProvider(data_dir)
+
+    def __call__(self, environ, start_response):
+        domain = environ['HTTP_HOST']
+        if ':' in domain:
+            domain = domain.split(':', 1)[0]
+        domain_info = self.provider.domain(domain)
+        environ['ddemo.domain_info'] = domain_info
+        path_info = norm_path(environ.get('PATH_INFO', ''))
+        if path_info.startswith('/_deliverance'):
+            path_info_pop(environ)
+            return self.pylons_app(environ, start_response)
+        if not domain_info.initialized:
+            new_url = construct_url(
+                environ, with_query_string=False,
+                path_info='/_deliverance')
+            exc = httpexceptions.HTTPTemporaryRedirect(
+                headers=[('location', new_url)])
+            return exc(environ, start_response)
+        if path_info.startswith('/_rules'):
+            path_info_pop(environ)
+            subapp = StaticURLParser(
+                domain_info.rule_dir)
+            return subapp(environ, start_response)
+        static_path = os.path.join(domain_info.static_dir,
+                                   path_info.lstrip('/'))
+        if os.path.exists(static_path):
+            # Explicit override of a file
+            app = FileApp(static_path)
+            return app(environ, start_response)
+        app = proxyapp.ForcedProxy(
+            remote=domain_info.remote,
+            force_host=True)
+        app = proxyapp.RelocateMiddleware(
+            app, old_href=domain_info.remote)
+        rule_uri = construct_url(
+            environ, with_query_string=False,
+            path_info='/_rules')
+        app = DeliveranceMiddleware(
+            app,
+            theme_uri=domain_info.theme_uri,
+            rule_uri=rule_uri)
+        return app(environ, start_response)

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,7 @@
+"""
+Helper functions
+
+All names available in this module will be available under the Pylons h object.
+"""
+from webhelpers import *
+from pylons.helpers import _, log, set_lang, get_lang

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Pylons Default Page</title>
+  <style>
+    body { background-color: #fff; color: #333; }
+
+    body, p {
+      font-family: verdana, arial, helvetica, sans-serif;
+      font-size:   12px;
+      line-height: 18px;
+    }
+    pre {
+      background-color: #eee;
+      padding: 10px;
+      font-size: 11px;
+      line-height: 13px;
+    }
+
+    a { color: #000; }
+    a:visited { color: #666; }
+    a:hover { color: #fff; background-color:#000; }
+  </style>
+</head>
+<body>
+
+<h1>Welcome to your Pylons Web Application</h1>
+
+<h2>Weren't expecting to see this page?</h2>
+
+<p>The ddemo/public/ directory is searched for static files
+ <i>before</i> your controllers are run. Remove this file (ddemo/public/index.html) and edit
+  the routes in <tt>ddemo/config/routing.py</tt> like so:
+  <pre> map.connect('', controller='hello', action='index')</pre>
+</p>
+
+<h2>Getting Started</h2>
+<p>You're now ready to start creating your own web application. Here's what a basic controller looks
+like to print out 'Hello World' and respond to http://127.0.0.1:5000/hello:
+<pre>
+# ddemo/controllers/hello.py
+# Note that the line above is the file you should create and put the following into...
+
+from ddemo.lib.base import *
+
+class HelloController(BaseController):
+    def index(self):
+        return Response('Hello World')
+        
+</pre>
+</p>
+
+<h3>Using a template</h3>
+<p>If you want to call a template and do something a little more complex, here's an example printing out some
+request information from a Myghty template.
+<pre>
+# ddemo/templates/serverinfo.myt
+
+&lt;p>Hi, here's the server environment: &lt;br />
+&lt;% str(request.environ) %>&lt;/p>
+
+&lt;p>
+here's the URL you called: &lt;% h.url_for() %>
+&lt;/p>
+
+&lt;p>
+and here's the name you set: &lt;% c.name %>
+&lt;/p>
+
+</pre>
+
+Then add this to your hello controller class:
+<pre>
+    def serverinfo(self):
+        c.name = 'The Black Knight'
+        return render_response('/serverinfo.myt')
+</pre>
+
+You can now view the page at: <tt>http://127.0.0.1:5000/hello/serverinfo</tt>
+</p>
+</body>
+</html>

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/routing.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/routing.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,9 @@
+"""Setup your Routes options here"""
+import os
+from routes import Mapper
+
+def make_map(global_conf={}, app_conf={}):
+    root_path = os.path.dirname(os.path.abspath(__file__))
+    map = Mapper(directory=os.path.join(root_path, 'controllers'))
+    map.connect(':controller/:action/:id')
+    return map

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/autohandler
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/autohandler	Mon Nov 20 18:45:57 2006
@@ -0,0 +1 @@
+% m.call_next()
\ No newline at end of file

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/__init__.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,28 @@
+import os, sys
+from unittest import TestCase
+
+here_dir = os.path.dirname(__file__)
+conf_dir = os.path.dirname(os.path.dirname(here_dir))
+
+sys.path.insert(0, conf_dir)
+
+import pkg_resources
+
+pkg_resources.working_set.add_entry(conf_dir)
+
+pkg_resources.require('Paste')
+pkg_resources.require('PasteScript')
+
+from paste.deploy import loadapp
+import paste.fixture
+
+from ddemo.config.routing import *
+from routes import request_config, url_for
+
+class TestController(TestCase):
+    def __init__(self, *args):
+        wsgiapp = loadapp('config:development.ini', relative_to=conf_dir)
+        self.app = paste.fixture.TestApp(wsgiapp)
+        TestCase.__init__(self, *args)
+
+__all__ = ['url_for', 'TestController']

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,61 @@
+import os
+
+from paste import httpexceptions
+from paste.cascade import Cascade
+from paste.urlparser import StaticURLParser
+from paste.registry import RegistryManager
+from paste.deploy.config import ConfigMiddleware
+from paste.deploy.converters import asbool
+
+import pylons.wsgiapp
+import pylons.config
+from pylons.error import error_template
+from pylons.middleware import ErrorHandler, ErrorDocuments, StaticJavascripts, error_mapper
+
+import ddemo.helpers
+from ddemo.routing import make_map
+
+from ddemo.dispatcher import DeliveranceDispatcher
+
+def load_environment(global_conf={}, app_conf={}):
+    map = make_map(global_conf, app_conf)
+    root_path = os.path.dirname(os.path.abspath(__file__))
+    paths = {'root_path': root_path,
+             'controllers': os.path.join(root_path, 'controllers'),
+             'templates': [os.path.join(root_path, 'templates')],
+             'static_files': os.path.join(root_path, 'public')
+             }
+    myghty = dict(log_errors=True)
+    return pylons.config.Config(myghty, map, paths)
+
+class Globals(object):
+    def __init__(self, global_conf, app_conf, **extra):
+        pass
+
+def make_app(global_conf, full_stack=True, **app_conf):
+    """Create a WSGI application and return it"""
+    # Load our Pylons configuration defaults
+    config = load_environment(global_conf, app_conf)
+    config.init_app(global_conf, app_conf, package='ddemo')
+        
+    # Load our default Pylons WSGI app and make g available
+    app = pylons.wsgiapp.PylonsApp(config, helpers=ddemo.helpers, g=Globals)
+    g = app.globals
+    app = ConfigMiddleware(app, {'app_conf':app_conf,
+        'global_conf':global_conf})
+    
+    # <-- YOUR MIDDLEWARE HERE
+        
+    # Build the rest of the stack, see a full template for more details
+    if asbool(full_stack):
+        app = httpexceptions.make_middleware(app, global_conf)
+    
+    app = RegistryManager(app)
+    
+    static_app = StaticURLParser(config.paths['static_files'])
+    javascripts_app = StaticJavascripts()
+    app = Cascade([static_app, javascripts_app, app])
+    app = DeliveranceDispatcher(app, app_conf)
+    if asbool(full_stack):
+        app = ErrorHandler(app, global_conf, error_template=error_template, **config.errorware)
+    return app

Added: z3/deliverance/DeliveranceDemo/trunk/development.ini
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/development.ini	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,41 @@
+#
+# DeliveranceDemo - Pylons development environment configuration
+#
+# The %(here)s variable will be replaced with the parent directory of this file
+#
+[DEFAULT]
+debug = true
+email_to = you at yourdomain.com
+smtp_server = localhost
+error_email_from = paste at localhost
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 5000
+
+[app:main]
+use = egg:DeliveranceDemo
+full_stack = True
+cache_dir = %(here)s/cache_data
+data_dir = %(here)s/data
+session_key = ddemo
+session_secret = somesecret
+
+# 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.
+#set debug = false

Added: z3/deliverance/DeliveranceDemo/trunk/setup.cfg
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/setup.cfg	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,34 @@
+[egg_info]
+tag_build = dev
+tag_svn_revision = true
+
+[easy_install]
+find_links = http://www.pylonshq.com/download/
+
+[pudge]
+theme = pythonpaste.org
+
+# Add extra doc files here with spaces between them
+docs = ddemo/docs/index.txt 
+
+# Doc Settings
+doc_base = ddemo/docs/
+dest = ddemo/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 
+#           link1=/community/ Community
+#           link2=/download/ Download
+ 
+[publish]
+doc-dir=ddemo/docs/html
+make-dirs=1

Added: z3/deliverance/DeliveranceDemo/trunk/setup.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/setup.py	Mon Nov 20 18:45:57 2006
@@ -0,0 +1,21 @@
+from setuptools import setup, find_packages
+
+setup(
+    name='DeliveranceDemo',
+    version="",
+    #description="",
+    #author="",
+    #author_email="",
+    #url="",
+    install_requires=["Pylons>=0.9.3"],
+    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
+    [paste.app_install]
+    main=paste.script.appinstall:Installer
+    """,
+)
\ No newline at end of file

From ianb at codespeak.net  Mon Nov 20 18:48:00 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 20 Nov 2006 18:48:00 +0100 (CET)
Subject: [z3-checkins] r34803 - in z3/deliverance/DeliveranceDemo/trunk: .
	DeliveranceDemo.egg-info cache_data data
Message-ID: <20061120174800.D97E910077@code0.codespeak.net>

Author: ianb
Date: Mon Nov 20 18:47:57 2006
New Revision: 34803

Removed:
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/PKG-INFO
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/SOURCES.txt
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/dependency_links.txt
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/entry_points.txt
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/requires.txt
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/top_level.txt
   z3/deliverance/DeliveranceDemo/trunk/cache_data/
   z3/deliverance/DeliveranceDemo/trunk/data/
Modified:
   z3/deliverance/DeliveranceDemo/trunk/   (props changed)
   z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/   (props changed)
Log:
Cleaned out accidental committed files

Deleted: /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/PKG-INFO
==============================================================================
--- /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/PKG-INFO	Mon Nov 20 18:47:57 2006
+++ (empty file)
@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: DeliveranceDemo
-Version: 0.0.0dev
-Summary: UNKNOWN
-Home-page: UNKNOWN
-Author: UNKNOWN
-Author-email: UNKNOWN
-License: UNKNOWN
-Description: UNKNOWN
-Platform: UNKNOWN

Deleted: /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/SOURCES.txt
==============================================================================
--- /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/SOURCES.txt	Mon Nov 20 18:47:57 2006
+++ (empty file)
@@ -1,16 +0,0 @@
-README.txt
-setup.cfg
-setup.py
-DeliveranceDemo.egg-info/PKG-INFO
-DeliveranceDemo.egg-info/SOURCES.txt
-DeliveranceDemo.egg-info/dependency_links.txt
-DeliveranceDemo.egg-info/entry_points.txt
-DeliveranceDemo.egg-info/paste_deploy_config.ini_tmpl
-DeliveranceDemo.egg-info/requires.txt
-DeliveranceDemo.egg-info/top_level.txt
-ddemo/__init__.py
-ddemo/helpers.py
-ddemo/routing.py
-ddemo/wsgiapp.py
-ddemo/controllers/__init__.py
-ddemo/tests/__init__.py

Deleted: /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/dependency_links.txt
==============================================================================
--- /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/dependency_links.txt	Mon Nov 20 18:47:57 2006
+++ (empty file)
@@ -1 +0,0 @@
-

Deleted: /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/entry_points.txt
==============================================================================
--- /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/entry_points.txt	Mon Nov 20 18:47:57 2006
+++ (empty file)
@@ -1,6 +0,0 @@
-
-    [paste.app_factory]
-    main=ddemo:make_app
-    [paste.app_install]
-    main=paste.script.appinstall:Installer
-    
\ No newline at end of file

Deleted: /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/requires.txt
==============================================================================
--- /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/requires.txt	Mon Nov 20 18:47:57 2006
+++ (empty file)
@@ -1 +0,0 @@
-Pylons>=0.9.3
\ No newline at end of file

Deleted: /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/top_level.txt
==============================================================================
--- /z3/deliverance/DeliveranceDemo/trunk/DeliveranceDemo.egg-info/top_level.txt	Mon Nov 20 18:47:57 2006
+++ (empty file)
@@ -1 +0,0 @@
-ddemo

From ianb at codespeak.net  Mon Nov 20 22:10:16 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 20 Nov 2006 22:10:16 +0100 (CET)
Subject: [z3-checkins] r34811 - z3/deliverance/trunk/deliverance
Message-ID: <20061120211016.E139410072@code0.codespeak.net>

Author: ianb
Date: Mon Nov 20 22:10:14 2006
New Revision: 34811

Modified:
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
Log:
Added support for paste.recursive internal redirects

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Mon Nov 20 22:10:14 2006
@@ -249,6 +249,11 @@
         get the data referred to by the uri given 
         by using the wrapped WSGI application 
         """
+        if 'paste.recursive.include' in environ:
+            # Try to do the redirect this way...
+            includer = environ['paste.recursive.include']
+            res = includer(uri)
+            return res.body
         environ = environ.copy()
         if not uri.startswith('/'):
             uri = '/' + uri

From ianb at codespeak.net  Mon Nov 20 22:12:30 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 20 Nov 2006 22:12:30 +0100 (CET)
Subject: [z3-checkins] r34812 - in z3/deliverance/DeliveranceDemo/trunk: .
	ddemo ddemo/controllers ddemo/public ddemo/templates
	ddemo/tests/functional
Message-ID: <20061120211230.CEF5210072@code0.codespeak.net>

Author: ianb
Date: Mon Nov 20 22:12:22 2006
New Revision: 34812

Added:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/index.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/index.myt
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/__init__.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/test_index.py   (contents, props changed)
Removed:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html
Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/routing.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
   z3/deliverance/DeliveranceDemo/trunk/setup.py
Log:
Implemented the dispatching and admin portions

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py	Mon Nov 20 22:12:22 2006
@@ -10,4 +10,7 @@
         # Insert any code to be run per request here. The Routes match
         # is under environ['pylons.routes_dict'] should you want to check
         # the action or route vars here
+        di = c.domain_info = environ['ddemo.domain_info']
+        if not di.initialized:
+            di.initialize()
         return WSGIController.__call__(self, environ, start_response)

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/index.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/index.py	Mon Nov 20 22:12:22 2006
@@ -0,0 +1,18 @@
+from ddemo.controllers import *
+import os
+
+class IndexController(BaseController):
+    def index(self):
+        if request.method == 'POST':
+            return self.update()
+        rule_fn = os.path.join(c.domain_info.rule_dir, 'rule.xml')
+        c.rule_text = open(rule_fn, 'rb').read()
+        return render_response('index.myt')
+
+    def update(self):
+        params = request.params
+        di = c.domain_info
+        di.theme_uri = params['theme_uri']
+        di.remote = params['remote']
+        di.set_rule_file('rule.xml', params['rule_xml'])
+        redirect_to()

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	Mon Nov 20 22:12:22 2006
@@ -3,6 +3,28 @@
 
 domain_re = re.compile(r'^[a-z][a-z0-9.\-]+\.[a-z]+$', re.I)
 
+default_rule_xml = '''\
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+  <xi:include href="standardrules.xml" />
+
+  <copy theme="//div[@id='container']" content="//*[@id='portal-columns']" />
+</rules>
+'''
+
+default_standardrules = '''\
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
+  <prepend theme="//head" content="//head/link" nocontent="ignore" /> 
+  <prepend theme="//head" content="//head/style" nocontent="ignore" /> 
+  <append theme="//head" content="//head/script" nocontent="ignore" />    
+  <append theme="//head" content="//head/meta" nocontent="ignore" />
+  <append-or-replace theme="//head" content="//head/title"
+  nocontent="ignore" />
+</rules>
+'''
+
 class DataProvider(object):
 
     def __init__(self, dir):
@@ -38,9 +60,10 @@
             return self
         if not os.path.exists(self.filename(obj)):
             return None
-        f = open(filename, 'rb')
+        f = open(self.filename(obj), 'rb')
         c = f.read()
         f.close()
+        return c
 
     def __set__(self, obj, value):
         f = open(self.filename(obj), 'wb')
@@ -72,11 +95,18 @@
                     self.static_dir]:
             if not os.path.exists(dir):
                 os.mkdir(dir)
+        for filename, content in [
+            ('rule.xml', default_rule_xml),
+            ('standardrules.xml', default_standardrules)]:
+            filename = os.path.join(self.rule_dir, filename)
+            if not os.path.exists(filename):
+                f = open(filename, 'w')
+                f.write(content)
+                f.close()
 
     @property
     def initialized(self):
-        return os.path.exists(
-            os.path.join(self.dir, 'remote.txt'))
+        return bool(self.remote)
 
     @property
     def rule_dir(self):
@@ -88,3 +118,10 @@
     
     remote = file_property('remote.txt')
     theme_uri = file_property('theme_uri.txt')
+
+    def set_rule_file(self, filename, content):
+        filename = os.path.join(self.rule_dir, filename)
+        f = open(filename, 'wb')
+        f.write(content)
+        f.close()
+        

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py	Mon Nov 20 22:12:22 2006
@@ -5,6 +5,7 @@
 from paste.urlparser import StaticURLParser
 from paste.fileapp import FileApp
 from wsgifilter import proxyapp
+from wsgifilter import relocateresponse
 from deliverance.wsgimiddleware import DeliveranceMiddleware
 from ddemo.dataprovider import DataProvider
 
@@ -29,10 +30,13 @@
         domain_info = self.provider.domain(domain)
         environ['ddemo.domain_info'] = domain_info
         path_info = norm_path(environ.get('PATH_INFO', ''))
+        print 'request: %r' % path_info
         if path_info.startswith('/_deliverance'):
             path_info_pop(environ)
             return self.pylons_app(environ, start_response)
-        if not domain_info.initialized:
+        if (not domain_info.initialized
+            or not domain_info.remote
+            or not domain_info.theme_uri):
             new_url = construct_url(
                 environ, with_query_string=False,
                 path_info='/_deliverance')
@@ -46,20 +50,28 @@
             return subapp(environ, start_response)
         static_path = os.path.join(domain_info.static_dir,
                                    path_info.lstrip('/'))
-        if os.path.exists(static_path):
+        static_fn = self.find_file(static_path)
+        if static_fn is not None:
             # Explicit override of a file
-            app = FileApp(static_path)
+            app = FileApp(static_fn)
             return app(environ, start_response)
         app = proxyapp.ForcedProxy(
             remote=domain_info.remote,
             force_host=True)
-        app = proxyapp.RelocateMiddleware(
+        app = relocateresponse.RelocateMiddleware(
             app, old_href=domain_info.remote)
         rule_uri = construct_url(
             environ, with_query_string=False,
-            path_info='/_rules')
+            path_info='/_rules/rule.xml')
         app = DeliveranceMiddleware(
             app,
             theme_uri=domain_info.theme_uri,
             rule_uri=rule_uri)
         return app(environ, start_response)
+
+    def find_file(self, path):
+        if os.path.isdir(path):
+            path = os.path.join(path, 'index.html')
+        if os.path.exists(path):
+            return path
+        return None

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py	Mon Nov 20 22:12:22 2006
@@ -4,4 +4,5 @@
 All names available in this module will be available under the Pylons h object.
 """
 from webhelpers import *
+from webhelpers.util import *
 from pylons.helpers import _, log, set_lang, get_lang

Deleted: /z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html
==============================================================================
--- /z3/deliverance/DeliveranceDemo/trunk/ddemo/public/index.html	Mon Nov 20 22:12:22 2006
+++ (empty file)
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <title>Pylons Default Page</title>
-  <style>
-    body { background-color: #fff; color: #333; }
-
-    body, p {
-      font-family: verdana, arial, helvetica, sans-serif;
-      font-size:   12px;
-      line-height: 18px;
-    }
-    pre {
-      background-color: #eee;
-      padding: 10px;
-      font-size: 11px;
-      line-height: 13px;
-    }
-
-    a { color: #000; }
-    a:visited { color: #666; }
-    a:hover { color: #fff; background-color:#000; }
-  </style>
-</head>
-<body>
-
-<h1>Welcome to your Pylons Web Application</h1>
-
-<h2>Weren't expecting to see this page?</h2>
-
-<p>The ddemo/public/ directory is searched for static files
- <i>before</i> your controllers are run. Remove this file (ddemo/public/index.html) and edit
-  the routes in <tt>ddemo/config/routing.py</tt> like so:
-  <pre> map.connect('', controller='hello', action='index')</pre>
-</p>
-
-<h2>Getting Started</h2>
-<p>You're now ready to start creating your own web application. Here's what a basic controller looks
-like to print out 'Hello World' and respond to http://127.0.0.1:5000/hello:
-<pre>
-# ddemo/controllers/hello.py
-# Note that the line above is the file you should create and put the following into...
-
-from ddemo.lib.base import *
-
-class HelloController(BaseController):
-    def index(self):
-        return Response('Hello World')
-        
-</pre>
-</p>
-
-<h3>Using a template</h3>
-<p>If you want to call a template and do something a little more complex, here's an example printing out some
-request information from a Myghty template.
-<pre>
-# ddemo/templates/serverinfo.myt
-
-&lt;p>Hi, here's the server environment: &lt;br />
-&lt;% str(request.environ) %>&lt;/p>
-
-&lt;p>
-here's the URL you called: &lt;% h.url_for() %>
-&lt;/p>
-
-&lt;p>
-and here's the name you set: &lt;% c.name %>
-&lt;/p>
-
-</pre>
-
-Then add this to your hello controller class:
-<pre>
-    def serverinfo(self):
-        c.name = 'The Black Knight'
-        return render_response('/serverinfo.myt')
-</pre>
-
-You can now view the page at: <tt>http://127.0.0.1:5000/hello/serverinfo</tt>
-</p>
-</body>
-</html>

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/routing.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/routing.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/routing.py	Mon Nov 20 22:12:22 2006
@@ -6,4 +6,5 @@
     root_path = os.path.dirname(os.path.abspath(__file__))
     map = Mapper(directory=os.path.join(root_path, 'controllers'))
     map.connect(':controller/:action/:id')
+    map.connect('', controller='index')
     return map

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/index.myt
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/index.myt	Mon Nov 20 22:12:22 2006
@@ -0,0 +1,28 @@
+<html>
+ <head>
+  <title>Administration for <% c.domain_info.domain_name | h %></title>
+ </head>
+ <body>
+
+<h1>Administration for <% c.domain_info.domain_name | h %></h1>
+
+<p><a href="/">Visit the site</a></p>
+
+<form action="<% h.url_for(controller='index') %>" method="POST">
+  Remote URL:<br>
+   <input type="text" name="remote"
+    value="<% c.domain_info.remote | h %>"
+    style="width: 100%"><br>
+  Theme URL:<br>
+   <input type="text" name="theme_uri"
+    value="<% c.domain_info.theme_uri | h %>"
+    style="width: 100%"><br>
+  Rule:<br>
+   <textarea name="rule_xml" rows=10
+    style="width: 100%"><% c.rule_text | h %></textarea><br>
+  <button type="submit">Save</button>
+</form>
+
+
+ </body>
+</html>

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/__init__.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/__init__.py	Mon Nov 20 22:12:22 2006
@@ -0,0 +1 @@
+#

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/test_index.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/test_index.py	Mon Nov 20 22:12:22 2006
@@ -0,0 +1,6 @@
+from ddemo.tests import *
+
+class TestIndexController(TestController):
+    def test_index(self):
+        response = self.app.get(url_for(controller='index'))
+        # Test response...
\ No newline at end of file

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	Mon Nov 20 22:12:22 2006
@@ -6,6 +6,7 @@
 from paste.registry import RegistryManager
 from paste.deploy.config import ConfigMiddleware
 from paste.deploy.converters import asbool
+from paste.recursive import RecursiveMiddleware
 
 import pylons.wsgiapp
 import pylons.config
@@ -49,6 +50,7 @@
     # Build the rest of the stack, see a full template for more details
     if asbool(full_stack):
         app = httpexceptions.make_middleware(app, global_conf)
+        app = ErrorHandler(app, global_conf, error_template=error_template, **config.errorware)
     
     app = RegistryManager(app)
     
@@ -56,6 +58,9 @@
     javascripts_app = StaticJavascripts()
     app = Cascade([static_app, javascripts_app, app])
     app = DeliveranceDispatcher(app, app_conf)
-    if asbool(full_stack):
-        app = ErrorHandler(app, global_conf, error_template=error_template, **config.errorware)
+    app = RecursiveMiddleware(app)
+    if (asbool(full_stack)
+        and asbool(app_conf.get('debug', global_conf.get('debug')))):
+        from paste.evalexception import EvalException
+        app = EvalException(app)
     return app

Modified: z3/deliverance/DeliveranceDemo/trunk/setup.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/setup.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/setup.py	Mon Nov 20 22:12:22 2006
@@ -2,12 +2,16 @@
 
 setup(
     name='DeliveranceDemo',
-    version="",
-    #description="",
+    version="0.1",
+    description="A demo setup of Deliverance, self-configuring",
     #author="",
     #author_email="",
     #url="",
-    install_requires=["Pylons>=0.9.3"],
+    install_requires=[
+      "Pylons>=0.9.3",
+      'Deliverance',
+      'WSGIFilter',
+      ],
     packages=find_packages(),
     include_package_data=True,
     test_suite = 'nose.collector',
@@ -18,4 +22,4 @@
     [paste.app_install]
     main=paste.script.appinstall:Installer
     """,
-)
\ No newline at end of file
+)

From ianb at codespeak.net  Mon Nov 20 23:25:47 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 20 Nov 2006 23:25:47 +0100 (CET)
Subject: [z3-checkins] r34815 - in z3/deliverance/DeliveranceDemo/trunk: .
	ddemo
Message-ID: <20061120222547.5FFEC10070@code0.codespeak.net>

Author: ianb
Date: Mon Nov 20 23:25:44 2006
New Revision: 34815

Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
   z3/deliverance/DeliveranceDemo/trunk/development.ini
Log:
Option to debug the request/response headers

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	Mon Nov 20 23:25:44 2006
@@ -7,6 +7,7 @@
 from paste.deploy.config import ConfigMiddleware
 from paste.deploy.converters import asbool
 from paste.recursive import RecursiveMiddleware
+from wsgifilter import proxyapp
 
 import pylons.wsgiapp
 import pylons.config
@@ -59,6 +60,8 @@
     app = Cascade([static_app, javascripts_app, app])
     app = DeliveranceDispatcher(app, app_conf)
     app = RecursiveMiddleware(app)
+    if asbool(app_conf.get('debug_headers')):
+        app = proxyapp.DebugHeaders(app)
     if (asbool(full_stack)
         and asbool(app_conf.get('debug', global_conf.get('debug')))):
         from paste.evalexception import EvalException

Modified: z3/deliverance/DeliveranceDemo/trunk/development.ini
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/development.ini	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/development.ini	Mon Nov 20 23:25:44 2006
@@ -21,6 +21,7 @@
 data_dir = %(here)s/data
 session_key = ddemo
 session_secret = somesecret
+debug_headers = true
 
 # 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

From rocky at codespeak.net  Mon Nov 27 13:30:21 2006
From: rocky at codespeak.net (rocky at codespeak.net)
Date: Mon, 27 Nov 2006 13:30:21 +0100 (CET)
Subject: [z3-checkins] r35026 - z3/CMFonFive/trunk
Message-ID: <20061127123021.D024E1007B@code0.codespeak.net>

Author: rocky
Date: Mon Nov 27 13:30:17 2006
New Revision: 35026

Modified:
   z3/CMFonFive/trunk/CHANGES.txt
   z3/CMFonFive/trunk/fiveactionstool.py
   z3/CMFonFive/trunk/version.txt
Log:
Browser menu items now have their filter expressions checked manually
using CMF Expressions instead of testing item.available() which in
turn would use the Zope 3 TALES engine.  This only happens if a portal
is available in the object's acquisition chain.


Modified: z3/CMFonFive/trunk/CHANGES.txt
==============================================================================
--- z3/CMFonFive/trunk/CHANGES.txt	(original)
+++ z3/CMFonFive/trunk/CHANGES.txt	Mon Nov 27 13:30:17 2006
@@ -1,6 +1,12 @@
 CMFonFive Product Changelog
 
-  CMFonFive 1.3.3 (unreleased)
+  CMFonFive 1.3.4 (unreleased)
+
+    - Browser menu items now have their filter expressions checked manually
+      using CMF Expressions instead of testing item.available() which in
+      turn would use the Zope 3 TALES engine.
+
+  CMFonFive 1.3.3 (2006-05-15)
 
     - Got rid of some i18n warnings.
     

Modified: z3/CMFonFive/trunk/fiveactionstool.py
==============================================================================
--- z3/CMFonFive/trunk/fiveactionstool.py	(original)
+++ z3/CMFonFive/trunk/fiveactionstool.py	Mon Nov 27 13:30:17 2006
@@ -12,17 +12,18 @@
 """
 
 from AccessControl import ClassSecurityInfo
-from Acquisition import aq_base
+from Acquisition import aq_base, aq_inner, aq_parent
 from Globals import InitializeClass
 from OFS.SimpleItem import SimpleItem
 
 from Products.CMFCore.ActionInformation import ActionInformation
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
-from Products.CMFCore.Expression import Expression
-from Products.CMFCore.utils import UniqueObject
+from Products.CMFCore.Expression import createExprContext, Expression
+from Products.CMFCore.utils import UniqueObject, getToolByName
 
 from zope.interface import providedBy
 from zope.app import zapi
+from zope.app.pagetemplate import engine
 from zope.app.publisher.interfaces.browser import IBrowserMenu
 from zope.app.publisher.interfaces.browser import IBrowserSubMenuItem
 from zope.security.proxy import removeSecurityProxy
@@ -30,15 +31,56 @@
 def _listMenuIds():
     return [id for id, utility in zapi.getUtilitiesFor(IBrowserMenu)]
 
-def getMenu(id, object, request):
-    """Return menu item entries in a TAL-friendly form."""
-    menu = zapi.getUtility(IBrowserMenu, id)
-
+def _getItemsWithCMFFilter(portal, object, request, menu):
     result = []
+    folder = aq_parent(aq_inner(object))
+    econtext = createExprContext(folder, portal, object)
+
+    # Originally the code simply tested item.available() which is a standard
+    # Zope 3 technique.  The problem was that this in turn evaluated
+    # the filter TAL expression with the Zope 3 TALES engine.  This needed
+    # to be changed to instead using the CMF expression mechanism so that
+    # property security (among other things) was taken into account. - Rocky
     for name, item in zapi.getAdapters((object, request),
                                         menu.getMenuItemType()):
-        if item.available():
+
+        filter_ = item.filter
+        if filter_ is None:
             result.append(item)
+        else:
+            exprtext = None
+            if hasattr(filter_, 'text'):
+                # python TAL expr
+                exprtext = 'python:' + filter_.text
+            elif hasattr(filter_, '_s'):
+                # standard path TAL expr
+                exprtext = filter_._s
+
+            if exprtext is not None:
+                expr = Expression(text=exprtext)
+                if expr(econtext):
+                    result.append(item)
+            elif item.available():
+                result.append(item)
+    return result
+
+def getMenu(id, object, request):
+    """Return menu item entries in a TAL-friendly form."""
+    menu = zapi.getUtility(IBrowserMenu, id)
+
+    try:
+        portal = getToolByName(object, 'portal_url').getPortalObject()
+    except AttributeError:
+        # there is no accessible portal in the aq chain, fall back to
+        # previous behaviour
+        result = []
+        for name, item in zapi.getAdapters((object, request),
+                                           menu.getMenuItemType()):
+            if item.available():
+                result.append(item)
+    else:
+        # use CMF / Zope 2 TAL expression filtering
+        result = _getItemsWithCMFFilter(portal, object, request, menu)
 
     # Now order the result. This is not as easy as it seems.
     #

Modified: z3/CMFonFive/trunk/version.txt
==============================================================================
--- z3/CMFonFive/trunk/version.txt	(original)
+++ z3/CMFonFive/trunk/version.txt	Mon Nov 27 13:30:17 2006
@@ -1 +1 @@
-CMFonFive-1.3.3
+CMFonFive-1.3.4 (svn/unreleased)

From ianb at codespeak.net  Wed Nov 29 09:33:42 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Wed, 29 Nov 2006 09:33:42 +0100 (CET)
Subject: [z3-checkins] r35099 - z3/deliverance/trunk/deliverance
Message-ID: <20061129083342.6626E1006F@code0.codespeak.net>

Author: ianb
Date: Wed Nov 29 09:33:26 2006
New Revision: 35099

Modified:
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
Log:
Allow for a Renderer class to be passed into the middleware

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Wed Nov 29 09:33:26 2006
@@ -36,7 +36,8 @@
         theme_uri: uri referring the the theme document 
         rule_uri: uri referring to the deliverance rules document 
         renderer: selects deliverance render class to utilize when 
-          performing transformations, may be 'py' or 'xslt'
+          performing transformations, may be 'py' or 'xslt' or a
+          Renderer class
         """
         self.app = app
         self.theme_uri = theme_uri
@@ -52,8 +53,10 @@
         elif renderer == 'xslt':
             import xslt
             self._rendererType = xslt.Renderer
-        else:
+        elif renderer is None or isinstance(renderer, basestring):
             raise ValueError("Unknown Renderer: %s - Expecting 'py' or 'xslt'" % renderer)
+        else:
+            self._rendererType = renderer
 
     def get_renderer(self,environ):
         """

From ianb at codespeak.net  Wed Nov 29 09:34:26 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Wed, 29 Nov 2006 09:34:26 +0100 (CET)
Subject: [z3-checkins] r35100 - in z3/deliverance/DeliveranceDemo/trunk: .
	ddemo ddemo/controllers ddemo/public ddemo/templates
	ddemo/tests/functional
Message-ID: <20061129083426.95CF71006F@code0.codespeak.net>

Author: ianb
Date: Wed Nov 29 09:34:07 2006
New Revision: 35100

Added:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/remote_getter.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/debuginterp.py   (contents, props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/public/selector.js
   z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/test_remote_getter.py   (contents, props changed)
Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/index.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py
   z3/deliverance/DeliveranceDemo/trunk/ddemo/public/   (props changed)
   z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/index.myt
   z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
   z3/deliverance/DeliveranceDemo/trunk/development.ini
   z3/deliverance/DeliveranceDemo/trunk/setup.py
Log:
Updates to make it more automated, especially with the #openplans app

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/__init__.py	Wed Nov 29 09:34:07 2006
@@ -5,4 +5,11 @@
 
 """
 
+__all__ = ['current_environ', 'make_app']
+
+from paste import registry
+
+current_environ = registry.StackedObjectProxy(
+    name='environ')
+
 from ddemo.wsgiapp import make_app

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/__init__.py	Wed Nov 29 09:34:07 2006
@@ -3,6 +3,7 @@
 from pylons.decorators import jsonify, validate
 from pylons.templating import render, render_response
 from pylons.helpers import abort, redirect_to, etag_cache
+from paste.deploy import CONFIG
 import ddemo.helpers as h
 
 class BaseController(WSGIController):

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/index.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/index.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/index.py	Wed Nov 29 09:34:07 2006
@@ -1,18 +1,98 @@
 from ddemo.controllers import *
 import os
+import re
+import urlparse
+from paste.request import construct_url
+
+var_re = re.compile(r'[{](.*?)[}]')
+
+def find_template_values(template, value):
+    """
+    Parses the name/value out of a value, based on the template
+    """
+    if not value:
+        value = ''
+    regex = '^'
+    last_match = 0
+    for match in var_re.finditer(template):
+        regex += re.escape(template[last_match:match.start()])
+        regex += '(?P<%s>.*?)' % match.group(1)
+        last_match = match.end()
+    regex += re.escape(template[last_match:]) + '$'
+    result = {}
+    for match in var_re.finditer(template):
+        result[match.group(1)] = None
+    print 'regex: %r' % regex
+    match = re.search(regex, value)
+    if match:
+        result.update(match.groupdict())
+    return result
+
+def sub_template(template, vars):
+    def repl(match):
+        return vars[match.group(1)]
+    return var_re.sub(repl, template)
 
 class IndexController(BaseController):
+
+    builtin_vars = ['scheme', 'domain', 'port']
+    
     def index(self):
         if request.method == 'POST':
             return self.update()
         rule_fn = os.path.join(c.domain_info.rule_dir, 'rule.xml')
         c.rule_text = open(rule_fn, 'rb').read()
+        conf = CONFIG['app_conf']
+        if conf.get('remote_template'):
+            c.remote_template = find_template_values(
+                conf['remote_template'], c.domain_info.remote)
+            for key in self.builtin_vars:
+                c.remote_template.pop(key, None)
+        if conf.get('rule_template'):
+            c.rule_template = find_template_values(
+                conf['rule_template'], c.rule_text)
+        print c.rule_template, c.remote_template
         return render_response('index.myt')
 
     def update(self):
         params = request.params
+        conf = CONFIG['app_conf']
+        base = request.environ['ddemo.base_url']
         di = c.domain_info
+        base_parts = urlparse.urlsplit(base)
+        scheme, netloc, path, query, fragment = base_parts
+        if ':' in netloc:
+            domain, port = netloc.split(':', 1)
+        else:
+            domain = netloc
+            if scheme == 'http':
+                port = '80'
+            else:
+                port = '443'
+        if conf.get('remote_template'):
+            vars = {}
+            for name, value in params.items():
+                if not name.startswith('remote.'):
+                    continue
+                vars[name[len('remote.'):]] = value
+            vars['scheme'] = scheme
+            vars['netloc'] = netloc
+            vars['path'] = path
+            vars['domain'] = domain
+            vars['port'] = port
+            di.remote = sub_template(conf['remote_template'], vars)
+        else:
+            di.remote = params['remote']
         di.theme_uri = params['theme_uri']
-        di.remote = params['remote']
-        di.set_rule_file('rule.xml', params['rule_xml'])
+        if conf.get('rule_template'):
+            vars = {}
+            for name, value in params.items():
+                if not name.startswith('rule.'):
+                    continue
+                vars[name[len('rule.'):]] = value
+            text = sub_template(conf['rule_template'], vars)
+        else:
+            text = params['rule_xml']
+        text = text.strip()
+        di.set_rule_file('rule.xml', text)
         redirect_to()

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/remote_getter.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/controllers/remote_getter.py	Wed Nov 29 09:34:07 2006
@@ -0,0 +1,28 @@
+from ddemo.controllers import *
+from wsgiremote.lxmlformat import xml as lxml_format
+from wsgiremote.json import json as json_format
+from wsgiremote import BadRequestError
+
+class RemoteGetterController(BaseController):
+
+    good_tags = 'body div td'.split()
+    
+    def index(self):
+        url = request.params['url']
+        print 'getting', url
+        try:
+            data = lxml_format.GET(url)
+        except BadRequestError, e:
+            result = {'error': 'Bad request to %s: %s' % (url, e)}
+        else:
+            result = []
+            for el in data.xpath('//*[@id]'):
+                if el.tag.lower() not in self.good_tags:
+                    continue
+                if not len(el):
+                    # Empty elements aren't good candidates
+                    continue
+                result.append(el.attrib['id'])
+        app = json_format.responder(result)
+        return app(request.environ, self.start_response)
+

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	Wed Nov 29 09:34:07 2006
@@ -5,7 +5,6 @@
 
 default_rule_xml = '''\
 <?xml version="1.0" encoding="UTF-8"?>
- 
 <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
   <xi:include href="standardrules.xml" />
 
@@ -13,6 +12,17 @@
 </rules>
 '''
 
+marker = '<!-- Generated, do not edit! -->'
+abstract_rule_xml = '''\
+<?xml version="1.0" encoding="UTF-8"?>
+MARKER
+<rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+  <xi:include href="standardrules.xml" />
+
+  <copy theme="//*[%(theme_expr)s]" content="//*[%(content_expr)s]" />
+</rules>
+'''.replace('MARKER', marker)
+
 default_standardrules = '''\
 <?xml version="1.0" encoding="UTF-8"?>
 <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance">
@@ -118,6 +128,8 @@
     
     remote = file_property('remote.txt')
     theme_uri = file_property('theme_uri.txt')
+    theme_id = file_property('theme_id.txt')
+    rule_ids = file_property('rule_ids.txt')
 
     def set_rule_file(self, filename, content):
         filename = os.path.join(self.rule_dir, filename)
@@ -125,3 +137,4 @@
         f.write(content)
         f.close()
         
+

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/debuginterp.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/debuginterp.py	Wed Nov 29 09:34:07 2006
@@ -0,0 +1,31 @@
+from deliverance.interpreter import Renderer as PyRenderer
+from lxml import etree
+from paste.request import construct_url
+from ddemo import current_environ
+
+class Renderer(PyRenderer):
+
+    error_style = "background-color: #ff9; color: #000; border: 1px solid #000;"
+
+    def format_error(self, message, rule, elts=None):
+        error = super(PyRenderer, self).format_error(message, rule, elts)
+        error_container = etree.Element('div')
+        error_container.attrib['style'] = self.error_style
+        if not current_environ.get('ddemo.has_errors'):
+            current_environ['ddemo.has_errors'] = True
+            domain_info = current_environ['ddemo.domain_info']
+            remote = domain_info.remote
+            remote += current_environ.get('PATH_INFO', '')
+            if current_environ.get('QUERY_STRING'):
+                remote += '?' + current_environ['QUERY_STRING']
+            link = etree.Element('a')
+            link.attrib['href'] = remote
+            link.attrib['target'] = '_blank'
+            link.text = 'View original content source'
+            container = etree.Element('div')
+            container.append(link)
+            error_container.append(container)
+        error_container.append(error)
+        return error_container
+            
+        

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py	Wed Nov 29 09:34:07 2006
@@ -8,6 +8,8 @@
 from wsgifilter import relocateresponse
 from deliverance.wsgimiddleware import DeliveranceMiddleware
 from ddemo.dataprovider import DataProvider
+from ddemo import current_environ
+from ddemo.debuginterp import Renderer
 
 def norm_path(urlpath):
     if not urlpath:
@@ -24,13 +26,17 @@
         self.provider = DataProvider(data_dir)
 
     def __call__(self, environ, start_response):
+        if 'paste.registry' in environ:
+            environ['paste.registry'].register(current_environ, environ)
         domain = environ['HTTP_HOST']
         if ':' in domain:
             domain = domain.split(':', 1)[0]
         domain_info = self.provider.domain(domain)
         environ['ddemo.domain_info'] = domain_info
+        environ['ddemo.base_url'] = construct_url(
+            environ, with_query_string=False,
+            path_info='')
         path_info = norm_path(environ.get('PATH_INFO', ''))
-        print 'request: %r' % path_info
         if path_info.startswith('/_deliverance'):
             path_info_pop(environ)
             return self.pylons_app(environ, start_response)
@@ -66,7 +72,8 @@
         app = DeliveranceMiddleware(
             app,
             theme_uri=domain_info.theme_uri,
-            rule_uri=rule_uri)
+            rule_uri=rule_uri,
+            renderer=Renderer)
         return app(environ, start_response)
 
     def find_file(self, path):

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/public/selector.js
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/public/selector.js	Wed Nov 29 09:34:07 2006
@@ -0,0 +1,66 @@
+function selectId(button, destName) {
+    var oldHTML = button.innerHTML;
+    button.innerHTML = 'reading...';
+    button.disabled = true;
+    selectIdSafe(destName);
+    button.innerHTML = oldHTML;
+    button.disabled = false;
+    return false;
+}
+
+function selectIdSafe(destName) {
+    var form = document.forms[0];
+    var url = form.elements.theme_uri.value;
+    if (! url) {
+        alert('You must first give a theme URI');
+        return;
+    }
+    var real_url = remote_getter_url + '?url=' + escape(url);
+    req = loadJSONDoc(real_url);
+    req.addCallbacks(function (req) {
+                        selectIdSuccess(req, destName);
+                     },
+                     function (err) {
+                         selectIdFail(err, destName);
+                     });
+}
+
+function selectIdSuccess(ids, destName) {
+    try {
+        selectIdSuccessNoError(ids, destName);
+    } catch (e) {
+        alert('Error: '+e);
+    }
+}
+
+function selectIdSuccessNoError(ids, destName) {
+    if (ids.error) {
+        alert('Error fetching Theme URL: '+ids.error);
+        return;
+    }
+    var form = document.forms[0];
+    var el = form[destName];
+    var selected = el.value;
+    var parent = el.parentNode;
+    var newEl = SELECT({name: destName});
+    for (var i=0; i<ids.length; i++) {
+        var newOp = OPTION({value: ids[i]}, ids[i]);
+        if (ids[i] == selected) {
+            newOp.selected = true;
+        }
+        newEl.appendChild(newOp);
+    }
+    parent.insertBefore(newEl, el);
+    parent.removeChild(el);
+}
+
+function selectIdFail(err, destName) {
+    alert(err);
+}
+
+function visitTheme() {
+    var form = document.forms[0];
+    var url = form.theme_uri.value;
+    window.open(url);
+    return false;
+}
\ No newline at end of file

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/index.myt
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/index.myt	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/templates/index.myt	Wed Nov 29 09:34:07 2006
@@ -1,28 +1,68 @@
 <html>
  <head>
   <title>Administration for <% c.domain_info.domain_name | h %></title>
+  <script type="text/javascript" src="<% h.url_for('MochiKit/MochiKit.js') %>"></script>
+  <script type="text/javascript" src="<% h.url_for('selector.js') %>"></script>
+  <script type="text/javascript">
+    remote_getter_url = '<% h.url_for(controller='remote_getter') %>';
+  </script>
+
  </head>
  <body>
 
 <h1>Administration for <% c.domain_info.domain_name | h %></h1>
 
-<p><a href="/">Visit the site</a></p>
+<p><a href="/" target="_blank">Visit the site</a></p>
 
 <form action="<% h.url_for(controller='index') %>" method="POST">
+
+% if c.remote_template:
+%   for name, value in sorted(c.remote_template.items()):
+     <% name %>:<br>
+     <input type="text" name="remote.<% name | h%>"
+      value="<% value | h %>"
+      style="width: 100%"><br>
+%   #endfor
+% else:
   Remote URL:<br>
    <input type="text" name="remote"
     value="<% c.domain_info.remote | h %>"
     style="width: 100%"><br>
+% #endif
+
   Theme URL:<br>
    <input type="text" name="theme_uri"
     value="<% c.domain_info.theme_uri | h %>"
-    style="width: 100%"><br>
+    style="width: 80%">
+   <a href="#" onclick="return visitTheme()">view</a>
+   <br>
+
+% if c.rule_template:
+%   for name, value in sorted(c.rule_template.items()):
+      <% name %>:<br>
+      <input type="text" name="rule.<% name | h %>"
+       value="<% value | h %>">
+%     if name.endswith('_id'):
+        <a href="#" onclick="return selectId(this, 'rule.<% name | h %>')">
+          read ids
+        </a>
+%     #endif
+      <br>
+%   #endfor
+% else:
   Rule:<br>
    <textarea name="rule_xml" rows=10
     style="width: 100%"><% c.rule_text | h %></textarea><br>
+% #endif
+
   <button type="submit">Save</button>
 </form>
 
+% if c.rule_template:
+<hr noshade>
+Current rules:
+<pre><% c.rule_text | h %></pre>
+% #endif
 
  </body>
 </html>

Added: z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/test_remote_getter.py
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/tests/functional/test_remote_getter.py	Wed Nov 29 09:34:07 2006
@@ -0,0 +1,6 @@
+from ddemo.tests import *
+
+class TestRemoteGetterController(TestController):
+    def test_index(self):
+        response = self.app.get(url_for(controller='remote_getter'))
+        # Test response...
\ No newline at end of file

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	Wed Nov 29 09:34:07 2006
@@ -53,8 +53,6 @@
         app = httpexceptions.make_middleware(app, global_conf)
         app = ErrorHandler(app, global_conf, error_template=error_template, **config.errorware)
     
-    app = RegistryManager(app)
-    
     static_app = StaticURLParser(config.paths['static_files'])
     javascripts_app = StaticJavascripts()
     app = Cascade([static_app, javascripts_app, app])
@@ -62,6 +60,7 @@
     app = RecursiveMiddleware(app)
     if asbool(app_conf.get('debug_headers')):
         app = proxyapp.DebugHeaders(app)
+    app = RegistryManager(app)
     if (asbool(full_stack)
         and asbool(app_conf.get('debug', global_conf.get('debug')))):
         from paste.evalexception import EvalException

Modified: z3/deliverance/DeliveranceDemo/trunk/development.ini
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/development.ini	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/development.ini	Wed Nov 29 09:34:07 2006
@@ -39,4 +39,13 @@
 # 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.
-#set debug = false
+set debug = true
+
+[app:openplans]
+use = main
+remote_template = http://norewrite.openplans.org/VirtualHostBase/{scheme}/{domain}:{port}/openplans/projects/{project}/VirtualHostRoot/
+rule_template = <?xml version="1.0" encoding="UTF-8"?>
+    <rules xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.plone.org/deliverance" >
+      <xi:include href="standardrules.xml" />
+      <copy theme="//*[@id='{theme_id}']" content="//*[@id='content']" />
+    </rules>

Modified: z3/deliverance/DeliveranceDemo/trunk/setup.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/setup.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/setup.py	Wed Nov 29 09:34:07 2006
@@ -11,6 +11,7 @@
       "Pylons>=0.9.3",
       'Deliverance',
       'WSGIFilter',
+      'WSGIRemote',
       ],
     packages=find_packages(),
     include_package_data=True,

From ltucker at codespeak.net  Mon Dec  4 21:42:55 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon,  4 Dec 2006 21:42:55 +0100 (CET)
Subject: [z3-checkins] r35269 - in
	z3/deliverance/trunk/deliverance/test-data: nycsr tasktracker
Message-ID: <20061204204255.83B021007B@code0.codespeak.net>

Author: ltucker
Date: Mon Dec  4 21:42:52 2006
New Revision: 35269

Added:
   z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_theme.html
   z3/deliverance/trunk/deliverance/test-data/tasktracker/nycsr_theme.html
Log:
adding static pages to test

Added: z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_theme.html	Mon Dec  4 21:42:52 2006
@@ -0,0 +1,1155 @@
+
+
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<title>StreetFilms Video Gallery - The New York City Streets Renaissance</title>
+		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<meta name="author" content="New York City Streets Renaissance" />
+
+	<meta name="description" content="" />
+	<meta name="keywords" content="" />
+	<meta name="generator" content="BBEdit 8.2" />
+	<meta name="MSSmartTagsPreventParsing" content="true" />
+	<meta name="robots" content="all" />
+	
+	<style type="text/css" media="screen">@import url(/css/style.css);</style>
+	<style type="text/css" media="screen">@import url(/css/nav.css);</style>
+	
+	<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = function() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	</script>
+
+</head>
+<body id="page-nyc" class="gallery">
+
+		<!-- Header -->
+	<div id="header">
+		<h1 class="logo">
+			<a href="/">
+				<span>The New York City Streets Renaissance</span>
+			</a>
+		</h1>
+
+	</div>
+	<!-- / Header -->
+	
+	<hr />
+	
+	
+<script type="text/javascript"><!--//--><![CDATA[//><!--
+startList = function() {
+	if (document.all&&document.getElementById) {
+		navRoot = document.getElementById("menu");
+		for (i=0; i<navRoot.childNodes.length; i++) {
+			node = navRoot.childNodes[i];
+			if (node.nodeName=="LI") {
+				node.onmouseover=function() {
+					this.className+=" over";
+				}
+				node.onmouseout=function() {
+					this.className=this.className.replace(" over", "");
+				}
+			}
+		}
+	}
+}
+window.onload=startList;
+
+//--><!]]></script>
+	
+	<!-- Top Level Links -->
+	<div id="toplevel">
+		<ul class="links">
+			<li id="top-home">
+
+				<a href="/">
+					<strong>
+						<span>Home Page</span>
+					</strong>
+				</a>
+			</li>
+			<li id="top-join">
+				<a href="/involved/join.php">
+
+					<strong>
+						<span>Join Us</span>
+					</strong>
+				</a>
+			</li>
+		</ul>
+	</div>
+	<!-- / Top Level Links -->
+
+	
+	<!-- Navigation Bar -->
+	<div id="nav">
+		<ul id="menu" class="tabs">
+			<li id="nav-who" >
+				<a href="/who/">
+					<strong>
+						<span>Who We Are</span>
+					</strong>
+
+				</a>
+				<ul class="sub">
+					<li>
+						<a href="/who/supporters.php">
+							<span>Supporters List</span>
+						</a>
+					</li>
+					<li>
+
+						<a href="/who/contact.php">
+							<span>Contact Us</span>
+						</a>
+					</li>
+									</ul>
+			</li>
+			<li id="nav-nyc" class="selected">
+				<a href="/nyc/">
+
+					<strong>
+						<span>New York Streets</span>
+					</strong>
+				</a>
+				<ul class="sub">
+					<li>
+						<a href="/nyc/truth.php">
+							<span>The Truth About Traffic</span>
+
+						</a>
+					</li>
+					<li>
+						<a href="/nyc/broken.php">
+							<span>Broken Streets</span>
+						</a>
+					</li>
+					<li>
+
+						<a href="/nyc/building.php">
+							<span>Building on Progress</span>
+						</a>
+					</li>
+					<li>
+						<a href="/nyc/video.php">
+							<span>StreetFilms Video Gallery</span>
+						</a>
+
+					</li>
+					<li>
+						<a href="/nyc/photo.php">
+							<span>Photo Gallery</span>
+						</a>
+					</li>
+				</ul>
+			</li>
+
+			<li id="nav-lessons" >
+				<a href="/lessons/">
+					<strong>
+						<span>Global Lessons</span>
+					</strong>
+				</a>
+				<ul class="sub">
+					<!--
+					<li>
+						<a href="/lessons/contested.php">
+							<span>Contested Streets</span>
+						</a>
+					</li>
+					-->
+
+					<li>
+						<a href="/lessons/chicago.php">
+							<span>Chicago</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/philadelphia.php">
+							<span>Philadelphia</span>
+
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/london.php">
+							<span>London</span>
+						</a>
+					</li>
+					<li>
+
+						<a href="/lessons/paris.php">
+							<span>Paris</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/copenhagen.php">
+							<span>Copenhagen</span>
+						</a>
+
+					</li>
+					<li>
+						<a href="/lessons/great.php">
+							<span>What Makes a Great Street?</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/benefits.php">
+
+							<span>The Benefits of Great Streets</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/photo.php">
+							<span>Photo Gallery</span>
+						</a>
+					</li>
+
+				</ul>
+			</li>
+			<li id="nav-involved" >
+				<a href="/involved/">
+					<strong>
+						<span>Get Involved</span>
+					</strong>
+				</a>
+
+				<ul class="sub">
+					<li>
+						<a href="/involved/join.php">
+							<span>Join Us</span>
+						</a>
+					</li>
+										<li>
+						<a href="/involved/ways.php">
+
+							<span>Ways to Get Involved</span>
+						</a>
+					</li>
+					<li>
+						<a href="/involved/resources.php">
+							<span>Resources</span>
+						</a>
+					</li>
+
+				</ul>
+			</li>
+			<li id="nav-events" >
+				<a href="/events/">
+					<strong>
+						<span>Events</span>
+					</strong>
+				</a>
+
+							</li>
+		</ul>
+		<div class="clear"></div>
+	</div>
+	<!-- / Navigation Bar -->	
+	<hr />
+	
+	<!-- Container -->
+	<div id="container">
+	
+		<!-- Body -->
+
+		<div id="body">
+		
+				<!-- Breadcrumb -->
+	<div id="breadcrumb">
+		<a href="/"><span>Home Page</span></a> 
+		&raquo; 
+		
+					<a href="/nyc/"><span>
+			New York Streets</span></a>
+			&raquo; 
+				
+				
+			</div>
+
+	<!-- / Breadcrumb -->
+			
+			<h2>StreetFilms Video Gallery</h2>
+			<!--
+			<p>All movies edited and shot by Clarence Eckerson Jr. unless noted.  You must have <a href="http://www.apple.com/quicktime/">Quicktime</a> installed to view them.</p>
+			-->
+			
+			<h3>
+				Recently Added Videos
+			</h3>
+			<ul class="thumbnails">
+				<li>
+					<strong class="title">
+
+						<a href="video-view.php?id=41">
+							Above The Law: Govt. Parking Permit Abuse in NYC
+						</a>
+					</strong>
+					<a href="video-view.php?id=41" class="thumb">
+						<img src="/files/thumbs/above-the-law.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Transportation Alternatives releases a comprehensive study on permit parking abuse.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(3:54 - 15.81 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=42">
+							Car-free Central Park Rally
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=42" class="thumb">
+						<img src="/files/thumbs/car-free-rally.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						A rally on the steps of City Hall demonstrates residents' support for a car-free Central Park.
+					</span>
+					<span class="meta">
+						<span class="flv">(4:24 - 17.59 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=43">
+							Nicole's Journey
+						</a>
+					</strong>
+					<a href="video-view.php?id=43" class="thumb">
+
+						<img src="/files/thumbs/nicoles-journey.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Bronx resident, Nicole Duncan, exposes the dangerous pedestrian conditions while walking her children to school.
+					</span>
+					<span class="meta">
+						<span class="flv">(14:27 - 59.78 MB)</span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=44">
+							The Top Ten Reasons I Shouldn't Get a Ticket
+						</a>
+					</strong>
+					<a href="video-view.php?id=44" class="thumb">
+						<img src="/files/thumbs/ten-no-ticket.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						This short video highlights the number of excuses drivers in New York City make everyday in effort to avoid a ticket while parking illegally.
+					</span>
+					<span class="meta">
+						<span class="flv">(1:08 - 4.16 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=45">
+
+							Portland, OR - Crosswalk Enforcement Actions
+						</a>
+					</strong>
+					<a href="video-view.php?id=45" class="thumb">
+						<img src="/files/thumbs/pdx-crosswalk.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						In Portland, OR, you can get a $242 ticket for failing to yield to a pedestrian in a crosswalk.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(1:36 - 5.77 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=46">
+							Atlantic Avenue
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=46" class="thumb">
+						<img src="/files/thumbs/atlantic-ave.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Residents, business-people and community leaders speak out against the speeding and congestions problems on Brooklyn's Atlantic Avenue that have resulted in a number of recent accident-related fatalities.
+					</span>
+					<span class="meta">
+						<span class="flv">(3:46 - 14.73 MB)</span>
+					</span>
+
+				</li>
+			</ul>
+			<div class="clear"></div>
+			
+			<h3>
+				Previous Videos
+			</h3>
+			<ul class="thumbnails">
+				<li>
+					<strong class="title">
+
+						<a href="video-view.php?id=1">
+							Introduction
+						</a>
+					</strong>
+					<a href="video-view.php?id=1" class="thumb">
+						<img src="/files/videos/thumbs/introduction.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Mark Gorton introduces the goals of the NYC Streets Renaissance project.
+					</span>
+
+					<span class="meta">
+						<span class="mov">(1:00 - 2.71 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=34">
+							Portland, OR - Innovative Bicycle Signal
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=34" class="thumb">
+						<img src="/files/thumbs/pdx-bikesignal.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						This unique bike signal gives Portland cyclists the right of way!
+					</span>
+					<span class="meta">
+						<span class="flv">(1:37 - 5.91 MB) <!-- 320 --></span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=35">
+							Portland, OR - Safe Routes to School
+						</a>
+					</strong>
+					<a href="video-view.php?id=35" class="thumb">
+
+						<img src="/files/thumbs/pdx-sunnyside.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						This Portland institution emphasizes using non-motorized means to get to school.
+					</span>
+					<span class="meta">
+						<span class="flv">(4:14 - 16.40 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=36">
+							Portland, OR - Older Adults Bike Program
+						</a>
+					</strong>
+					<a href="video-view.php?id=36" class="thumb">
+						<img src="/files/thumbs/pdx-older.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						Seniors in Portland ride three-wheeled trikes thanks to a program by the Portland Office of Transportation (PDOT).
+					</span>
+					<span class="meta">
+						<span class="flv">(3:31 - 17.37 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=37">
+
+							Portland, OR - Festival Streets
+						</a>
+					</strong>
+					<a href="video-view.php?id=37" class="thumb">
+						<img src="/files/thumbs/pdx-festival.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Innovative thinking in Portland has produced a new street design which emphasizes community use.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(3:39 - 13.93 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=38">
+							Portland, OR - Traffic Calming: Diagonal Diverter
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=38" class="thumb">
+						<img src="/files/thumbs/pdx-diagonal.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						The use of traffic calming in Portland emphasizes keeping thru traffic out of neighborhoods.
+					</span>
+					<span class="meta">
+						<span class="flv">(1:20 - 5.57 MB) <!-- 320 --></span>
+					</span>
+
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=39">
+							Portland, OR - Bicycle Boulevards
+						</a>
+					</strong>
+					<a href="video-view.php?id=39" class="thumb">
+						<img src="/files/thumbs/pdx-boulevards.jpg" alt="" class="thumb" />
+
+					</a> 
+					<span class="description">
+						Who needs bike lanes on wonderful streets like these when you keep traffic to a minimum?
+					</span>
+					<span class="meta">
+						<span class="flv">(3:08 - 12.12 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+
+					<strong class="title">
+						<a href="video-view.php?id=2">
+							Hell's Kitchen: Neighborhood Under Siege
+						</a>
+					</strong>
+					<a href="video-view.php?id=2" class="thumb">
+						<img src="/files/videos/thumbs/hells-kitchen.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Residents protest the DOT's transformation of 9th Avenue, adding more space for cars and destroying the neighborhood in the process.
+					</span>
+
+					<span class="meta">
+						<span class="mov">(14:37 - 41.49 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=19">
+							Interview with Enrique Pe&ntilde;alosa (Long)
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=19" class="thumb">
+						<img src="/files/thumbs/penalosa-long.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Former Bogot&aacute; mayor Enrique Pe&ntilde;alosa discusses his amazing success transforming Bogot&aacute; into a livable city for cyclists and pedestrians.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(12:07 - 51.26 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=27">
+							Lessons from San Francisco
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=27" class="thumb">
+						<img src="/files/thumbs/embarcadero.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						After an earthquake, the Embarcadero Freeway was replaced with a grand boulevard which has rejuvenated its waterfront.
+					</span>
+					<span class="meta">
+						<span class="flv">(12:04 - 52.45 MB) <!-- 320 --></span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=24">
+							Lessons From Portland
+						</a>
+					</strong>
+					<a href="video-view.php?id=24" class="thumb">
+
+						<img src="/files/thumbs/lessons-from-portland.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						The Mt. Hood Freeway's defeat in the 1970s positively impacted Portland, Oregon's future, creating a more livable city.
+					</span>
+					<span class="meta">
+						<span class="flv">(11:42 - 50.01 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=17">
+							A conversation with Lou Riccio
+						</a>
+					</strong>
+					<a href="video-view.php?id=17" class="thumb">
+						<img src="/files/thumbs/lou-riccio.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						Discussion about the transportation planning with former NYC D.O.T. Commissioner Lou Riccio.
+					</span>
+					<span class="meta">
+						<span class="flv">(10:57 - 44.69 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=25">
+
+							Grand Army Plaza Traffic Survey
+						</a>
+					</strong>
+					<a href="video-view.php?id=25" class="thumb">
+						<img src="/files/thumbs/grand-army-plaza.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Residents and neighborhood leaders of GAPCO evaluate how traffic conditions could be improved for pedestrians.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(9:00 - 41.03 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=3">
+							Jan Gehl in Times Square
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=3" class="thumb">
+						<img src="/files/videos/thumbs/gehl-times-square.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Jan Gehl (<a href="http://www.gehlarchitects.dk/">Gehl Architects</a>) and Mark Gorton discuss the potential for pedestrian-friendly changes in Times Square.
+					</span>
+					<span class="meta">
+						<span class="mov">(8:31 - 28.08 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=4">
+							Lessons From Canal Park
+						</a>
+					</strong>
+					<a href="video-view.php?id=4" class="thumb">
+
+						<img src="/files/thumbs/canal.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Richard Barrett talks about his community's struggle to rebuild Canal Park, a task deemed impossible by New York City's Department of Transportation.
+					</span>
+					<span class="meta">
+						<span class="flv">(8:00 - 36.77 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=33">
+							Park(ing) Day San Francisco
+						</a>
+					</strong>
+					<a href="video-view.php?id=33" class="thumb">
+						<img src="/files/thumbs/parking-day-sf.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						In San Francisco, organizations temporarily liberated over two dozen parking spots, turning them into temporary green spaces for pedestrians.
+					</span>
+					<span class="meta">
+						<span class="flv">(6:51 - 38.24 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=32">
+
+							Greenwich Street
+						</a>
+					</strong>
+					<a href="video-view.php?id=32" class="thumb">
+						<img src="/files/thumbs/greenwich.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						This heavily-used crosswalk on Greenwich Street is constantly ignored by drivers.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(6:07 - 33.49 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=5">
+							Fulton Street
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=5" class="thumb">
+						<img src="/files/thumbs/fulton.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Jeff Prant collects signatures on his petition to maintain Fulton Street's car-free hours.
+					</span>
+					<span class="meta">
+						<span class="flv">(5:48 - 31.04 MB) <!-- 320 --></span>
+					</span>
+
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=26">
+							The Sidewalk Nibblers
+						</a>
+					</strong>
+					<a href="video-view.php?id=26" class="thumb">
+						<img src="/files/thumbs/sidewalk-nibblers.jpg" alt="" class="thumb" />
+
+					</a> 
+					<span class="description">
+						A proposed plan by DOT for a subway station at 96th street will leave pedestrians with 18 ft. less sidewalk space!
+					</span>
+					<span class="meta">
+						<span class="flv">(5:38 - 26.42 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+
+					<strong class="title">
+						<a href="video-view.php?id=28">
+							"Gridlock Sam": Central Park
+						</a>
+					</strong>
+					<a href="video-view.php?id=28" class="thumb">
+						<img src="/files/videos/thumbs/gls-park.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Sam Schwartz, former NYC Commissioner of Traffic, explains how closing Central Park to cars will not result in traffic chaos.
+					</span>
+
+					<span class="meta">
+						<span class="mov">(5:23 - 13.18 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=29">
+							"Gridlock Sam": Parking Permits
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=29" class="thumb">
+						<img src="/files/videos/thumbs/gls-permits.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						In the second part of our interview with "Gridlock Sam" Schwartz, the topic is Government Parking Permits. 
+					</span>
+					<span class="meta">
+						<span class="mov">(5:06 - 13.80 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=18">
+							What About The Children?
+						</a>
+					</strong>
+					<a href="video-view.php?id=18" class="thumb">
+
+						<img src="/files/thumbs/sister-dixon.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Holy Cross School Principal, Sister Mary Teresa Dixon, talks about her many attempts to get the NYC DOT to help with traffic conditions outside of her school.
+					</span>
+					<span class="meta">
+						<span class="flv">(4:56 - 21.92 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=22">
+							Parking Spot Squat
+						</a>
+					</strong>
+					<a href="video-view.php?id=22" class="thumb">
+						<img src="/files/thumbs/parking-spot-squat.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						Volunteers take over a parking spot for a day to reclaim it for public use in Park Slope, Brooklyn.
+					</span>
+					<span class="meta">
+						<span class="flv">(4:46 - 23.15 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=30">
+
+							Car-free Sunday on the Grand Concourse
+						</a>
+					</strong>
+					<a href="video-view.php?id=30" class="thumb">
+						<img src="/files/thumbs/grand-concourse.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Residents of the Bronx take to the streets when part of the Grand Concourse is closed to cars.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(3:58 - 21.59 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=20">
+							Interview with Enrique Pe&ntilde;alosa (Short)
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=20" class="thumb">
+						<img src="/files/thumbs/penalosa-short.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Former Bogot&aacute; mayor Enrique Pe&ntilde;alosa discusses his amazing success transforming Bogot&aacute; into a livable city for cyclists and pedestrians.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(3:08 - 12.75 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=6">
+							Public Space Transformations
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=6" class="thumb">
+						<img src="/files/videos/thumbs/transformations.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						These photo simulations from the Project for Public Spaces show how we can transform some of our misused intersections.
+					</span>
+					<span class="meta">
+						<span class="flv">(2:00 - 3.79 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=7">
+							Broadway &amp; Houston
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=7" class="thumb">
+						<img src="/files/videos/thumbs/houston.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						One of the busiest pedestrian crossings in the city is to become even more car-friendly at the expense of pedestrian safety.
+					</span>
+					<span class="meta">
+						<span class="mov">(1:51 - 7.20 MB)</span>
+					</span>
+
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=8">
+							Psychic Space
+						</a>
+					</strong>
+					<a href="video-view.php?id=8" class="thumb">
+						<img src="/files/thumbs/psychic-space.jpg" alt="" class="thumb" />
+
+					</a> 
+					<span class="description">
+						Mark Gorton points out how parking and street design on two SoHo streets can make a huge impact on pedestrians.
+					</span>
+					<span class="meta">
+						<span class="flv">(1:37 - 8.97 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+
+					<strong class="title">
+						<a href="video-view.php?id=31">
+							Miracle Ticket
+						</a>
+					</strong>
+					<a href="video-view.php?id=31" class="thumb">
+						<img src="/files/thumbs/miracle.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Sometimes when you are armed with a camera in New York City, miracles can happen.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(1:13 - 6.80 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=21">
+							When do we go?
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=21" class="thumb">
+						<img src="/files/videos/thumbs/when-do-we-go.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						A few minutes of condensed footage of pedestrians intrepidly navigating traffic at Broome and Broadway.
+					</span>
+					<span class="meta">
+						<span class="mov">(1:11 - 3.85 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=10">
+							Dirty Little Secret
+						</a>
+					</strong>
+					<a href="video-view.php?id=10" class="thumb">
+
+						<img src="/files/thumbs/dirty-little-secret.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						An inequitable use of parking by government agencies is a dirty little secret in Chinatown.
+					</span>
+					<span class="meta">
+						<span class="flv">(0:56 - 5.07 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=11">
+							Grand Street Redesigned
+						</a>
+					</strong>
+					<a href="video-view.php?id=11" class="thumb">
+						<img src="/files/videos/thumbs/grand.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						Mark Gorton tours Grand Street in Chinatown, pointing out the nonsensical difference in space allotted to cars and pedestrians.
+					</span>
+					<span class="meta">
+						<span class="mov">(0:50 - 2.27 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=12">
+
+							Pedestrian Obstacle Course
+						</a>
+					</strong>
+					<a href="video-view.php?id=12" class="thumb">
+						<img src="/files/thumbs/course.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						A visual example of the hoops through which a pedestrian must jump to cross a street in Times Square.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(0:46 - 4.88 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=40">
+							So Why Are They Driving?
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=37" class="thumb">
+						<img src="/files/thumbs/psa-driving.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Nearly every person who drives into New York City has an alternate means of transportation.
+					</span>
+					<span class="meta">
+						<span class="flv">(0:30 - 3.38 MB) <!-- 320 --></span>
+					</span>
+
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=13">
+							Pedestrian Density
+						</a>
+					</strong>
+					<a href="video-view.php?id=13" class="thumb">
+						<img src="/files/thumbs/density.jpg" alt="" class="thumb" />
+
+					</a> 
+					<span class="description">
+						Cars get more space than pedestrians do on the streets, which leads to overcrowded sidewalks.
+					</span>
+					<span class="meta">
+						<span class="flv">(0:30 - 2.42 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+
+					<strong class="title">
+						<a href="video-view.php?id=14">
+							We're Walking
+						</a>
+					</strong>
+					<a href="video-view.php?id=14" class="thumb">
+						<img src="/files/thumbs/walking.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						While walking around Manhattan, pedestrians might wonder where all the cars come from. After seeing these statistics, it seems obvious.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(0:30 - 1.73 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=15">
+							Cab in a Crosswalk
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=15" class="thumb">
+						<img src="/files/thumbs/crosswalk.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						See how much disruption and danger one taxi cab stuck in a Times Square crosswalk can create.
+					</span>
+					<span class="meta">
+						<span class="flv">(0:28 - 3.25 MB) <!-- 320 --></span>
+
+					</span>
+				</li>
+				
+							</ul>
+			<div class="clear"></div>
+		
+		</div>
+		<!-- / Body -->
+		
+		<div class="clear"></div>
+		
+	</div>
+	<!-- / Container -->
+
+	
+	<hr />
+	
+		<!-- Footer -->
+	<div id="footer">
+		<p class="links">
+		[ 
+		<a href="/">
+			<span>Home</span>
+		</a> 
+		| 
+		<a href="/who/">
+
+			<span>Who We Are</span>
+		</a> 
+		| 
+		<a href="/nyc/">
+			<span>New York Lessons</span>
+		</a> 
+		| 
+		<a href="/lessons/">
+			<span>Global Lessons</span>
+
+		</a> 
+		| 
+		<a href="/involved/">
+			<span>Get Involved</span>
+		</a> 
+		| 
+		<a href="/events/">
+			<span>Events</span>
+		</a> 
+		| 
+		<a href="/involved/join.php">
+
+			<span>Join Us</span>
+		</a> 
+		]
+		</p>
+		<p class="cc">
+			<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/">
+				<img alt="Creative Commons License" border="0" src="/img/logos/cc.png" class="logo" /><br />
+				These works are licensed under a Creative Commons License
+			</a>
+		</p>
+
+		<!--
+		<rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+			<Work rdf:about="">
+				<license rdf:resource="http://creativecommons.org/licenses/by-nc-nd/2.5/" />
+				<dc:type rdf:resource="http://purl.org/dc/dcmitype/Text" />
+			</Work>
+			<License rdf:about="http://creativecommons.org/licenses/by-nc-nd/2.5/">
+				<permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+				<permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+				<requires rdf:resource="http://web.resource.org/cc/Notice"/>
+				<requires rdf:resource="http://web.resource.org/cc/Attribution"/>
+				<prohibits rdf:resource="http://web.resource.org/cc/CommercialUse"/>
+			</License>
+		</rdf:RDF>
+		-->
+	</div>
+	<!-- / Footer -->
+</body>
+</html>

Added: z3/deliverance/trunk/deliverance/test-data/tasktracker/nycsr_theme.html
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/test-data/tasktracker/nycsr_theme.html	Mon Dec  4 21:42:52 2006
@@ -0,0 +1,1155 @@
+
+
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<title>StreetFilms Video Gallery - The New York City Streets Renaissance</title>
+		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<meta name="author" content="New York City Streets Renaissance" />
+
+	<meta name="description" content="" />
+	<meta name="keywords" content="" />
+	<meta name="generator" content="BBEdit 8.2" />
+	<meta name="MSSmartTagsPreventParsing" content="true" />
+	<meta name="robots" content="all" />
+	
+	<style type="text/css" media="screen">@import url(/css/style.css);</style>
+	<style type="text/css" media="screen">@import url(/css/nav.css);</style>
+	
+	<script type="text/javascript"><!--//--><![CDATA[//><!--
+		startList = function() {
+			if (document.all&&document.getElementById) {
+				navRoot = document.getElementById("menu");
+				for (i=0; i<navRoot.childNodes.length; i++) {
+					node = navRoot.childNodes[i];
+					if (node.nodeName=="LI") {
+						node.onmouseover=function() {
+							this.className+=" over";
+						}
+						node.onmouseout=function() {
+							this.className=this.className.replace(" over", "");
+						}
+					}
+				}
+			}
+		}
+		window.onload=startList;
+		
+		//--><!]]>
+	</script>
+
+</head>
+<body id="page-nyc" class="gallery">
+
+		<!-- Header -->
+	<div id="header">
+		<h1 class="logo">
+			<a href="/">
+				<span>The New York City Streets Renaissance</span>
+			</a>
+		</h1>
+
+	</div>
+	<!-- / Header -->
+	
+	<hr />
+	
+	
+<script type="text/javascript"><!--//--><![CDATA[//><!--
+startList = function() {
+	if (document.all&&document.getElementById) {
+		navRoot = document.getElementById("menu");
+		for (i=0; i<navRoot.childNodes.length; i++) {
+			node = navRoot.childNodes[i];
+			if (node.nodeName=="LI") {
+				node.onmouseover=function() {
+					this.className+=" over";
+				}
+				node.onmouseout=function() {
+					this.className=this.className.replace(" over", "");
+				}
+			}
+		}
+	}
+}
+window.onload=startList;
+
+//--><!]]></script>
+	
+	<!-- Top Level Links -->
+	<div id="toplevel">
+		<ul class="links">
+			<li id="top-home">
+
+				<a href="/">
+					<strong>
+						<span>Home Page</span>
+					</strong>
+				</a>
+			</li>
+			<li id="top-join">
+				<a href="/involved/join.php">
+
+					<strong>
+						<span>Join Us</span>
+					</strong>
+				</a>
+			</li>
+		</ul>
+	</div>
+	<!-- / Top Level Links -->
+
+	
+	<!-- Navigation Bar -->
+	<div id="nav">
+		<ul id="menu" class="tabs">
+			<li id="nav-who" >
+				<a href="/who/">
+					<strong>
+						<span>Who We Are</span>
+					</strong>
+
+				</a>
+				<ul class="sub">
+					<li>
+						<a href="/who/supporters.php">
+							<span>Supporters List</span>
+						</a>
+					</li>
+					<li>
+
+						<a href="/who/contact.php">
+							<span>Contact Us</span>
+						</a>
+					</li>
+									</ul>
+			</li>
+			<li id="nav-nyc" class="selected">
+				<a href="/nyc/">
+
+					<strong>
+						<span>New York Streets</span>
+					</strong>
+				</a>
+				<ul class="sub">
+					<li>
+						<a href="/nyc/truth.php">
+							<span>The Truth About Traffic</span>
+
+						</a>
+					</li>
+					<li>
+						<a href="/nyc/broken.php">
+							<span>Broken Streets</span>
+						</a>
+					</li>
+					<li>
+
+						<a href="/nyc/building.php">
+							<span>Building on Progress</span>
+						</a>
+					</li>
+					<li>
+						<a href="/nyc/video.php">
+							<span>StreetFilms Video Gallery</span>
+						</a>
+
+					</li>
+					<li>
+						<a href="/nyc/photo.php">
+							<span>Photo Gallery</span>
+						</a>
+					</li>
+				</ul>
+			</li>
+
+			<li id="nav-lessons" >
+				<a href="/lessons/">
+					<strong>
+						<span>Global Lessons</span>
+					</strong>
+				</a>
+				<ul class="sub">
+					<!--
+					<li>
+						<a href="/lessons/contested.php">
+							<span>Contested Streets</span>
+						</a>
+					</li>
+					-->
+
+					<li>
+						<a href="/lessons/chicago.php">
+							<span>Chicago</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/philadelphia.php">
+							<span>Philadelphia</span>
+
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/london.php">
+							<span>London</span>
+						</a>
+					</li>
+					<li>
+
+						<a href="/lessons/paris.php">
+							<span>Paris</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/copenhagen.php">
+							<span>Copenhagen</span>
+						</a>
+
+					</li>
+					<li>
+						<a href="/lessons/great.php">
+							<span>What Makes a Great Street?</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/benefits.php">
+
+							<span>The Benefits of Great Streets</span>
+						</a>
+					</li>
+					<li>
+						<a href="/lessons/photo.php">
+							<span>Photo Gallery</span>
+						</a>
+					</li>
+
+				</ul>
+			</li>
+			<li id="nav-involved" >
+				<a href="/involved/">
+					<strong>
+						<span>Get Involved</span>
+					</strong>
+				</a>
+
+				<ul class="sub">
+					<li>
+						<a href="/involved/join.php">
+							<span>Join Us</span>
+						</a>
+					</li>
+										<li>
+						<a href="/involved/ways.php">
+
+							<span>Ways to Get Involved</span>
+						</a>
+					</li>
+					<li>
+						<a href="/involved/resources.php">
+							<span>Resources</span>
+						</a>
+					</li>
+
+				</ul>
+			</li>
+			<li id="nav-events" >
+				<a href="/events/">
+					<strong>
+						<span>Events</span>
+					</strong>
+				</a>
+
+							</li>
+		</ul>
+		<div class="clear"></div>
+	</div>
+	<!-- / Navigation Bar -->	
+	<hr />
+	
+	<!-- Container -->
+	<div id="container">
+	
+		<!-- Body -->
+
+		<div id="body">
+		
+				<!-- Breadcrumb -->
+	<div id="breadcrumb">
+		<a href="/"><span>Home Page</span></a> 
+		&raquo; 
+		
+					<a href="/nyc/"><span>
+			New York Streets</span></a>
+			&raquo; 
+				
+				
+			</div>
+
+	<!-- / Breadcrumb -->
+			
+			<h2>StreetFilms Video Gallery</h2>
+			<!--
+			<p>All movies edited and shot by Clarence Eckerson Jr. unless noted.  You must have <a href="http://www.apple.com/quicktime/">Quicktime</a> installed to view them.</p>
+			-->
+			
+			<h3>
+				Recently Added Videos
+			</h3>
+			<ul class="thumbnails">
+				<li>
+					<strong class="title">
+
+						<a href="video-view.php?id=41">
+							Above The Law: Govt. Parking Permit Abuse in NYC
+						</a>
+					</strong>
+					<a href="video-view.php?id=41" class="thumb">
+						<img src="/files/thumbs/above-the-law.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Transportation Alternatives releases a comprehensive study on permit parking abuse.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(3:54 - 15.81 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=42">
+							Car-free Central Park Rally
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=42" class="thumb">
+						<img src="/files/thumbs/car-free-rally.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						A rally on the steps of City Hall demonstrates residents' support for a car-free Central Park.
+					</span>
+					<span class="meta">
+						<span class="flv">(4:24 - 17.59 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=43">
+							Nicole's Journey
+						</a>
+					</strong>
+					<a href="video-view.php?id=43" class="thumb">
+
+						<img src="/files/thumbs/nicoles-journey.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Bronx resident, Nicole Duncan, exposes the dangerous pedestrian conditions while walking her children to school.
+					</span>
+					<span class="meta">
+						<span class="flv">(14:27 - 59.78 MB)</span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=44">
+							The Top Ten Reasons I Shouldn't Get a Ticket
+						</a>
+					</strong>
+					<a href="video-view.php?id=44" class="thumb">
+						<img src="/files/thumbs/ten-no-ticket.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						This short video highlights the number of excuses drivers in New York City make everyday in effort to avoid a ticket while parking illegally.
+					</span>
+					<span class="meta">
+						<span class="flv">(1:08 - 4.16 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=45">
+
+							Portland, OR - Crosswalk Enforcement Actions
+						</a>
+					</strong>
+					<a href="video-view.php?id=45" class="thumb">
+						<img src="/files/thumbs/pdx-crosswalk.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						In Portland, OR, you can get a $242 ticket for failing to yield to a pedestrian in a crosswalk.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(1:36 - 5.77 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=46">
+							Atlantic Avenue
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=46" class="thumb">
+						<img src="/files/thumbs/atlantic-ave.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Residents, business-people and community leaders speak out against the speeding and congestions problems on Brooklyn's Atlantic Avenue that have resulted in a number of recent accident-related fatalities.
+					</span>
+					<span class="meta">
+						<span class="flv">(3:46 - 14.73 MB)</span>
+					</span>
+
+				</li>
+			</ul>
+			<div class="clear"></div>
+			
+			<h3>
+				Previous Videos
+			</h3>
+			<ul class="thumbnails">
+				<li>
+					<strong class="title">
+
+						<a href="video-view.php?id=1">
+							Introduction
+						</a>
+					</strong>
+					<a href="video-view.php?id=1" class="thumb">
+						<img src="/files/videos/thumbs/introduction.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Mark Gorton introduces the goals of the NYC Streets Renaissance project.
+					</span>
+
+					<span class="meta">
+						<span class="mov">(1:00 - 2.71 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=34">
+							Portland, OR - Innovative Bicycle Signal
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=34" class="thumb">
+						<img src="/files/thumbs/pdx-bikesignal.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						This unique bike signal gives Portland cyclists the right of way!
+					</span>
+					<span class="meta">
+						<span class="flv">(1:37 - 5.91 MB) <!-- 320 --></span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=35">
+							Portland, OR - Safe Routes to School
+						</a>
+					</strong>
+					<a href="video-view.php?id=35" class="thumb">
+
+						<img src="/files/thumbs/pdx-sunnyside.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						This Portland institution emphasizes using non-motorized means to get to school.
+					</span>
+					<span class="meta">
+						<span class="flv">(4:14 - 16.40 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=36">
+							Portland, OR - Older Adults Bike Program
+						</a>
+					</strong>
+					<a href="video-view.php?id=36" class="thumb">
+						<img src="/files/thumbs/pdx-older.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						Seniors in Portland ride three-wheeled trikes thanks to a program by the Portland Office of Transportation (PDOT).
+					</span>
+					<span class="meta">
+						<span class="flv">(3:31 - 17.37 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=37">
+
+							Portland, OR - Festival Streets
+						</a>
+					</strong>
+					<a href="video-view.php?id=37" class="thumb">
+						<img src="/files/thumbs/pdx-festival.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Innovative thinking in Portland has produced a new street design which emphasizes community use.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(3:39 - 13.93 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=38">
+							Portland, OR - Traffic Calming: Diagonal Diverter
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=38" class="thumb">
+						<img src="/files/thumbs/pdx-diagonal.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						The use of traffic calming in Portland emphasizes keeping thru traffic out of neighborhoods.
+					</span>
+					<span class="meta">
+						<span class="flv">(1:20 - 5.57 MB) <!-- 320 --></span>
+					</span>
+
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=39">
+							Portland, OR - Bicycle Boulevards
+						</a>
+					</strong>
+					<a href="video-view.php?id=39" class="thumb">
+						<img src="/files/thumbs/pdx-boulevards.jpg" alt="" class="thumb" />
+
+					</a> 
+					<span class="description">
+						Who needs bike lanes on wonderful streets like these when you keep traffic to a minimum?
+					</span>
+					<span class="meta">
+						<span class="flv">(3:08 - 12.12 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+
+					<strong class="title">
+						<a href="video-view.php?id=2">
+							Hell's Kitchen: Neighborhood Under Siege
+						</a>
+					</strong>
+					<a href="video-view.php?id=2" class="thumb">
+						<img src="/files/videos/thumbs/hells-kitchen.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Residents protest the DOT's transformation of 9th Avenue, adding more space for cars and destroying the neighborhood in the process.
+					</span>
+
+					<span class="meta">
+						<span class="mov">(14:37 - 41.49 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=19">
+							Interview with Enrique Pe&ntilde;alosa (Long)
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=19" class="thumb">
+						<img src="/files/thumbs/penalosa-long.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Former Bogot&aacute; mayor Enrique Pe&ntilde;alosa discusses his amazing success transforming Bogot&aacute; into a livable city for cyclists and pedestrians.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(12:07 - 51.26 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=27">
+							Lessons from San Francisco
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=27" class="thumb">
+						<img src="/files/thumbs/embarcadero.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						After an earthquake, the Embarcadero Freeway was replaced with a grand boulevard which has rejuvenated its waterfront.
+					</span>
+					<span class="meta">
+						<span class="flv">(12:04 - 52.45 MB) <!-- 320 --></span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=24">
+							Lessons From Portland
+						</a>
+					</strong>
+					<a href="video-view.php?id=24" class="thumb">
+
+						<img src="/files/thumbs/lessons-from-portland.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						The Mt. Hood Freeway's defeat in the 1970s positively impacted Portland, Oregon's future, creating a more livable city.
+					</span>
+					<span class="meta">
+						<span class="flv">(11:42 - 50.01 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=17">
+							A conversation with Lou Riccio
+						</a>
+					</strong>
+					<a href="video-view.php?id=17" class="thumb">
+						<img src="/files/thumbs/lou-riccio.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						Discussion about the transportation planning with former NYC D.O.T. Commissioner Lou Riccio.
+					</span>
+					<span class="meta">
+						<span class="flv">(10:57 - 44.69 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=25">
+
+							Grand Army Plaza Traffic Survey
+						</a>
+					</strong>
+					<a href="video-view.php?id=25" class="thumb">
+						<img src="/files/thumbs/grand-army-plaza.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Residents and neighborhood leaders of GAPCO evaluate how traffic conditions could be improved for pedestrians.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(9:00 - 41.03 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=3">
+							Jan Gehl in Times Square
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=3" class="thumb">
+						<img src="/files/videos/thumbs/gehl-times-square.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Jan Gehl (<a href="http://www.gehlarchitects.dk/">Gehl Architects</a>) and Mark Gorton discuss the potential for pedestrian-friendly changes in Times Square.
+					</span>
+					<span class="meta">
+						<span class="mov">(8:31 - 28.08 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=4">
+							Lessons From Canal Park
+						</a>
+					</strong>
+					<a href="video-view.php?id=4" class="thumb">
+
+						<img src="/files/thumbs/canal.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Richard Barrett talks about his community's struggle to rebuild Canal Park, a task deemed impossible by New York City's Department of Transportation.
+					</span>
+					<span class="meta">
+						<span class="flv">(8:00 - 36.77 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=33">
+							Park(ing) Day San Francisco
+						</a>
+					</strong>
+					<a href="video-view.php?id=33" class="thumb">
+						<img src="/files/thumbs/parking-day-sf.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						In San Francisco, organizations temporarily liberated over two dozen parking spots, turning them into temporary green spaces for pedestrians.
+					</span>
+					<span class="meta">
+						<span class="flv">(6:51 - 38.24 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=32">
+
+							Greenwich Street
+						</a>
+					</strong>
+					<a href="video-view.php?id=32" class="thumb">
+						<img src="/files/thumbs/greenwich.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						This heavily-used crosswalk on Greenwich Street is constantly ignored by drivers.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(6:07 - 33.49 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=5">
+							Fulton Street
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=5" class="thumb">
+						<img src="/files/thumbs/fulton.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Jeff Prant collects signatures on his petition to maintain Fulton Street's car-free hours.
+					</span>
+					<span class="meta">
+						<span class="flv">(5:48 - 31.04 MB) <!-- 320 --></span>
+					</span>
+
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=26">
+							The Sidewalk Nibblers
+						</a>
+					</strong>
+					<a href="video-view.php?id=26" class="thumb">
+						<img src="/files/thumbs/sidewalk-nibblers.jpg" alt="" class="thumb" />
+
+					</a> 
+					<span class="description">
+						A proposed plan by DOT for a subway station at 96th street will leave pedestrians with 18 ft. less sidewalk space!
+					</span>
+					<span class="meta">
+						<span class="flv">(5:38 - 26.42 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+
+					<strong class="title">
+						<a href="video-view.php?id=28">
+							"Gridlock Sam": Central Park
+						</a>
+					</strong>
+					<a href="video-view.php?id=28" class="thumb">
+						<img src="/files/videos/thumbs/gls-park.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Sam Schwartz, former NYC Commissioner of Traffic, explains how closing Central Park to cars will not result in traffic chaos.
+					</span>
+
+					<span class="meta">
+						<span class="mov">(5:23 - 13.18 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=29">
+							"Gridlock Sam": Parking Permits
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=29" class="thumb">
+						<img src="/files/videos/thumbs/gls-permits.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						In the second part of our interview with "Gridlock Sam" Schwartz, the topic is Government Parking Permits. 
+					</span>
+					<span class="meta">
+						<span class="mov">(5:06 - 13.80 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=18">
+							What About The Children?
+						</a>
+					</strong>
+					<a href="video-view.php?id=18" class="thumb">
+
+						<img src="/files/thumbs/sister-dixon.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Holy Cross School Principal, Sister Mary Teresa Dixon, talks about her many attempts to get the NYC DOT to help with traffic conditions outside of her school.
+					</span>
+					<span class="meta">
+						<span class="flv">(4:56 - 21.92 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=22">
+							Parking Spot Squat
+						</a>
+					</strong>
+					<a href="video-view.php?id=22" class="thumb">
+						<img src="/files/thumbs/parking-spot-squat.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						Volunteers take over a parking spot for a day to reclaim it for public use in Park Slope, Brooklyn.
+					</span>
+					<span class="meta">
+						<span class="flv">(4:46 - 23.15 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=30">
+
+							Car-free Sunday on the Grand Concourse
+						</a>
+					</strong>
+					<a href="video-view.php?id=30" class="thumb">
+						<img src="/files/thumbs/grand-concourse.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Residents of the Bronx take to the streets when part of the Grand Concourse is closed to cars.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(3:58 - 21.59 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=20">
+							Interview with Enrique Pe&ntilde;alosa (Short)
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=20" class="thumb">
+						<img src="/files/thumbs/penalosa-short.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Former Bogot&aacute; mayor Enrique Pe&ntilde;alosa discusses his amazing success transforming Bogot&aacute; into a livable city for cyclists and pedestrians.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(3:08 - 12.75 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=6">
+							Public Space Transformations
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=6" class="thumb">
+						<img src="/files/videos/thumbs/transformations.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						These photo simulations from the Project for Public Spaces show how we can transform some of our misused intersections.
+					</span>
+					<span class="meta">
+						<span class="flv">(2:00 - 3.79 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=7">
+							Broadway &amp; Houston
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=7" class="thumb">
+						<img src="/files/videos/thumbs/houston.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						One of the busiest pedestrian crossings in the city is to become even more car-friendly at the expense of pedestrian safety.
+					</span>
+					<span class="meta">
+						<span class="mov">(1:51 - 7.20 MB)</span>
+					</span>
+
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=8">
+							Psychic Space
+						</a>
+					</strong>
+					<a href="video-view.php?id=8" class="thumb">
+						<img src="/files/thumbs/psychic-space.jpg" alt="" class="thumb" />
+
+					</a> 
+					<span class="description">
+						Mark Gorton points out how parking and street design on two SoHo streets can make a huge impact on pedestrians.
+					</span>
+					<span class="meta">
+						<span class="flv">(1:37 - 8.97 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+
+					<strong class="title">
+						<a href="video-view.php?id=31">
+							Miracle Ticket
+						</a>
+					</strong>
+					<a href="video-view.php?id=31" class="thumb">
+						<img src="/files/thumbs/miracle.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Sometimes when you are armed with a camera in New York City, miracles can happen.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(1:13 - 6.80 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=21">
+							When do we go?
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=21" class="thumb">
+						<img src="/files/videos/thumbs/when-do-we-go.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						A few minutes of condensed footage of pedestrians intrepidly navigating traffic at Broome and Broadway.
+					</span>
+					<span class="meta">
+						<span class="mov">(1:11 - 3.85 MB)</span>
+
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=10">
+							Dirty Little Secret
+						</a>
+					</strong>
+					<a href="video-view.php?id=10" class="thumb">
+
+						<img src="/files/thumbs/dirty-little-secret.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						An inequitable use of parking by government agencies is a dirty little secret in Chinatown.
+					</span>
+					<span class="meta">
+						<span class="flv">(0:56 - 5.07 MB) <!-- 320 --></span>
+					</span>
+				</li>
+
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=11">
+							Grand Street Redesigned
+						</a>
+					</strong>
+					<a href="video-view.php?id=11" class="thumb">
+						<img src="/files/videos/thumbs/grand.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+
+						Mark Gorton tours Grand Street in Chinatown, pointing out the nonsensical difference in space allotted to cars and pedestrians.
+					</span>
+					<span class="meta">
+						<span class="mov">(0:50 - 2.27 MB)</span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=12">
+
+							Pedestrian Obstacle Course
+						</a>
+					</strong>
+					<a href="video-view.php?id=12" class="thumb">
+						<img src="/files/thumbs/course.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						A visual example of the hoops through which a pedestrian must jump to cross a street in Times Square.
+					</span>
+					<span class="meta">
+
+						<span class="flv">(0:46 - 4.88 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=40">
+							So Why Are They Driving?
+						</a>
+					</strong>
+
+					<a href="video-view.php?id=37" class="thumb">
+						<img src="/files/thumbs/psa-driving.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						Nearly every person who drives into New York City has an alternate means of transportation.
+					</span>
+					<span class="meta">
+						<span class="flv">(0:30 - 3.38 MB) <!-- 320 --></span>
+					</span>
+
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=13">
+							Pedestrian Density
+						</a>
+					</strong>
+					<a href="video-view.php?id=13" class="thumb">
+						<img src="/files/thumbs/density.jpg" alt="" class="thumb" />
+
+					</a> 
+					<span class="description">
+						Cars get more space than pedestrians do on the streets, which leads to overcrowded sidewalks.
+					</span>
+					<span class="meta">
+						<span class="flv">(0:30 - 2.42 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+
+					<strong class="title">
+						<a href="video-view.php?id=14">
+							We're Walking
+						</a>
+					</strong>
+					<a href="video-view.php?id=14" class="thumb">
+						<img src="/files/thumbs/walking.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						While walking around Manhattan, pedestrians might wonder where all the cars come from. After seeing these statistics, it seems obvious.
+					</span>
+
+					<span class="meta">
+						<span class="flv">(0:30 - 1.73 MB) <!-- 320 --></span>
+					</span>
+				</li>
+				<li>
+					<strong class="title">
+						<a href="video-view.php?id=15">
+							Cab in a Crosswalk
+						</a>
+
+					</strong>
+					<a href="video-view.php?id=15" class="thumb">
+						<img src="/files/thumbs/crosswalk.jpg" alt="" class="thumb" />
+					</a> 
+					<span class="description">
+						See how much disruption and danger one taxi cab stuck in a Times Square crosswalk can create.
+					</span>
+					<span class="meta">
+						<span class="flv">(0:28 - 3.25 MB) <!-- 320 --></span>
+
+					</span>
+				</li>
+				
+							</ul>
+			<div class="clear"></div>
+		
+		</div>
+		<!-- / Body -->
+		
+		<div class="clear"></div>
+		
+	</div>
+	<!-- / Container -->
+
+	
+	<hr />
+	
+		<!-- Footer -->
+	<div id="footer">
+		<p class="links">
+		[ 
+		<a href="/">
+			<span>Home</span>
+		</a> 
+		| 
+		<a href="/who/">
+
+			<span>Who We Are</span>
+		</a> 
+		| 
+		<a href="/nyc/">
+			<span>New York Lessons</span>
+		</a> 
+		| 
+		<a href="/lessons/">
+			<span>Global Lessons</span>
+
+		</a> 
+		| 
+		<a href="/involved/">
+			<span>Get Involved</span>
+		</a> 
+		| 
+		<a href="/events/">
+			<span>Events</span>
+		</a> 
+		| 
+		<a href="/involved/join.php">
+
+			<span>Join Us</span>
+		</a> 
+		]
+		</p>
+		<p class="cc">
+			<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/">
+				<img alt="Creative Commons License" border="0" src="/img/logos/cc.png" class="logo" /><br />
+				These works are licensed under a Creative Commons License
+			</a>
+		</p>
+
+		<!--
+		<rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+			<Work rdf:about="">
+				<license rdf:resource="http://creativecommons.org/licenses/by-nc-nd/2.5/" />
+				<dc:type rdf:resource="http://purl.org/dc/dcmitype/Text" />
+			</Work>
+			<License rdf:about="http://creativecommons.org/licenses/by-nc-nd/2.5/">
+				<permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+				<permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+				<requires rdf:resource="http://web.resource.org/cc/Notice"/>
+				<requires rdf:resource="http://web.resource.org/cc/Attribution"/>
+				<prohibits rdf:resource="http://web.resource.org/cc/CommercialUse"/>
+			</License>
+		</rdf:RDF>
+		-->
+	</div>
+	<!-- / Footer -->
+</body>
+</html>

From ltucker at codespeak.net  Mon Dec  4 21:45:42 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon,  4 Dec 2006 21:45:42 +0100 (CET)
Subject: [z3-checkins] r35270 -
	z3/deliverance/trunk/deliverance/test-data/tasktracker
Message-ID: <20061204204542.CD0C01007B@code0.codespeak.net>

Author: ltucker
Date: Mon Dec  4 21:45:41 2006
New Revision: 35270

Removed:
   z3/deliverance/trunk/deliverance/test-data/tasktracker/nycsr_theme.html
Log:
only need one of these

Deleted: /z3/deliverance/trunk/deliverance/test-data/tasktracker/nycsr_theme.html
==============================================================================
--- /z3/deliverance/trunk/deliverance/test-data/tasktracker/nycsr_theme.html	Mon Dec  4 21:45:41 2006
+++ (empty file)
@@ -1,1155 +0,0 @@
-
-
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<title>StreetFilms Video Gallery - The New York City Streets Renaissance</title>
-		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-	<meta name="author" content="New York City Streets Renaissance" />
-
-	<meta name="description" content="" />
-	<meta name="keywords" content="" />
-	<meta name="generator" content="BBEdit 8.2" />
-	<meta name="MSSmartTagsPreventParsing" content="true" />
-	<meta name="robots" content="all" />
-	
-	<style type="text/css" media="screen">@import url(/css/style.css);</style>
-	<style type="text/css" media="screen">@import url(/css/nav.css);</style>
-	
-	<script type="text/javascript"><!--//--><![CDATA[//><!--
-		startList = function() {
-			if (document.all&&document.getElementById) {
-				navRoot = document.getElementById("menu");
-				for (i=0; i<navRoot.childNodes.length; i++) {
-					node = navRoot.childNodes[i];
-					if (node.nodeName=="LI") {
-						node.onmouseover=function() {
-							this.className+=" over";
-						}
-						node.onmouseout=function() {
-							this.className=this.className.replace(" over", "");
-						}
-					}
-				}
-			}
-		}
-		window.onload=startList;
-		
-		//--><!]]>
-	</script>
-
-</head>
-<body id="page-nyc" class="gallery">
-
-		<!-- Header -->
-	<div id="header">
-		<h1 class="logo">
-			<a href="/">
-				<span>The New York City Streets Renaissance</span>
-			</a>
-		</h1>
-
-	</div>
-	<!-- / Header -->
-	
-	<hr />
-	
-	
-<script type="text/javascript"><!--//--><![CDATA[//><!--
-startList = function() {
-	if (document.all&&document.getElementById) {
-		navRoot = document.getElementById("menu");
-		for (i=0; i<navRoot.childNodes.length; i++) {
-			node = navRoot.childNodes[i];
-			if (node.nodeName=="LI") {
-				node.onmouseover=function() {
-					this.className+=" over";
-				}
-				node.onmouseout=function() {
-					this.className=this.className.replace(" over", "");
-				}
-			}
-		}
-	}
-}
-window.onload=startList;
-
-//--><!]]></script>
-	
-	<!-- Top Level Links -->
-	<div id="toplevel">
-		<ul class="links">
-			<li id="top-home">
-
-				<a href="/">
-					<strong>
-						<span>Home Page</span>
-					</strong>
-				</a>
-			</li>
-			<li id="top-join">
-				<a href="/involved/join.php">
-
-					<strong>
-						<span>Join Us</span>
-					</strong>
-				</a>
-			</li>
-		</ul>
-	</div>
-	<!-- / Top Level Links -->
-
-	
-	<!-- Navigation Bar -->
-	<div id="nav">
-		<ul id="menu" class="tabs">
-			<li id="nav-who" >
-				<a href="/who/">
-					<strong>
-						<span>Who We Are</span>
-					</strong>
-
-				</a>
-				<ul class="sub">
-					<li>
-						<a href="/who/supporters.php">
-							<span>Supporters List</span>
-						</a>
-					</li>
-					<li>
-
-						<a href="/who/contact.php">
-							<span>Contact Us</span>
-						</a>
-					</li>
-									</ul>
-			</li>
-			<li id="nav-nyc" class="selected">
-				<a href="/nyc/">
-
-					<strong>
-						<span>New York Streets</span>
-					</strong>
-				</a>
-				<ul class="sub">
-					<li>
-						<a href="/nyc/truth.php">
-							<span>The Truth About Traffic</span>
-
-						</a>
-					</li>
-					<li>
-						<a href="/nyc/broken.php">
-							<span>Broken Streets</span>
-						</a>
-					</li>
-					<li>
-
-						<a href="/nyc/building.php">
-							<span>Building on Progress</span>
-						</a>
-					</li>
-					<li>
-						<a href="/nyc/video.php">
-							<span>StreetFilms Video Gallery</span>
-						</a>
-
-					</li>
-					<li>
-						<a href="/nyc/photo.php">
-							<span>Photo Gallery</span>
-						</a>
-					</li>
-				</ul>
-			</li>
-
-			<li id="nav-lessons" >
-				<a href="/lessons/">
-					<strong>
-						<span>Global Lessons</span>
-					</strong>
-				</a>
-				<ul class="sub">
-					<!--
-					<li>
-						<a href="/lessons/contested.php">
-							<span>Contested Streets</span>
-						</a>
-					</li>
-					-->
-
-					<li>
-						<a href="/lessons/chicago.php">
-							<span>Chicago</span>
-						</a>
-					</li>
-					<li>
-						<a href="/lessons/philadelphia.php">
-							<span>Philadelphia</span>
-
-						</a>
-					</li>
-					<li>
-						<a href="/lessons/london.php">
-							<span>London</span>
-						</a>
-					</li>
-					<li>
-
-						<a href="/lessons/paris.php">
-							<span>Paris</span>
-						</a>
-					</li>
-					<li>
-						<a href="/lessons/copenhagen.php">
-							<span>Copenhagen</span>
-						</a>
-
-					</li>
-					<li>
-						<a href="/lessons/great.php">
-							<span>What Makes a Great Street?</span>
-						</a>
-					</li>
-					<li>
-						<a href="/lessons/benefits.php">
-
-							<span>The Benefits of Great Streets</span>
-						</a>
-					</li>
-					<li>
-						<a href="/lessons/photo.php">
-							<span>Photo Gallery</span>
-						</a>
-					</li>
-
-				</ul>
-			</li>
-			<li id="nav-involved" >
-				<a href="/involved/">
-					<strong>
-						<span>Get Involved</span>
-					</strong>
-				</a>
-
-				<ul class="sub">
-					<li>
-						<a href="/involved/join.php">
-							<span>Join Us</span>
-						</a>
-					</li>
-										<li>
-						<a href="/involved/ways.php">
-
-							<span>Ways to Get Involved</span>
-						</a>
-					</li>
-					<li>
-						<a href="/involved/resources.php">
-							<span>Resources</span>
-						</a>
-					</li>
-
-				</ul>
-			</li>
-			<li id="nav-events" >
-				<a href="/events/">
-					<strong>
-						<span>Events</span>
-					</strong>
-				</a>
-
-							</li>
-		</ul>
-		<div class="clear"></div>
-	</div>
-	<!-- / Navigation Bar -->	
-	<hr />
-	
-	<!-- Container -->
-	<div id="container">
-	
-		<!-- Body -->
-
-		<div id="body">
-		
-				<!-- Breadcrumb -->
-	<div id="breadcrumb">
-		<a href="/"><span>Home Page</span></a> 
-		&raquo; 
-		
-					<a href="/nyc/"><span>
-			New York Streets</span></a>
-			&raquo; 
-				
-				
-			</div>
-
-	<!-- / Breadcrumb -->
-			
-			<h2>StreetFilms Video Gallery</h2>
-			<!--
-			<p>All movies edited and shot by Clarence Eckerson Jr. unless noted.  You must have <a href="http://www.apple.com/quicktime/">Quicktime</a> installed to view them.</p>
-			-->
-			
-			<h3>
-				Recently Added Videos
-			</h3>
-			<ul class="thumbnails">
-				<li>
-					<strong class="title">
-
-						<a href="video-view.php?id=41">
-							Above The Law: Govt. Parking Permit Abuse in NYC
-						</a>
-					</strong>
-					<a href="video-view.php?id=41" class="thumb">
-						<img src="/files/thumbs/above-the-law.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Transportation Alternatives releases a comprehensive study on permit parking abuse.
-					</span>
-
-					<span class="meta">
-						<span class="flv">(3:54 - 15.81 MB)</span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=42">
-							Car-free Central Park Rally
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=42" class="thumb">
-						<img src="/files/thumbs/car-free-rally.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						A rally on the steps of City Hall demonstrates residents' support for a car-free Central Park.
-					</span>
-					<span class="meta">
-						<span class="flv">(4:24 - 17.59 MB)</span>
-
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=43">
-							Nicole's Journey
-						</a>
-					</strong>
-					<a href="video-view.php?id=43" class="thumb">
-
-						<img src="/files/thumbs/nicoles-journey.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Bronx resident, Nicole Duncan, exposes the dangerous pedestrian conditions while walking her children to school.
-					</span>
-					<span class="meta">
-						<span class="flv">(14:27 - 59.78 MB)</span>
-					</span>
-				</li>
-
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=44">
-							The Top Ten Reasons I Shouldn't Get a Ticket
-						</a>
-					</strong>
-					<a href="video-view.php?id=44" class="thumb">
-						<img src="/files/thumbs/ten-no-ticket.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-
-						This short video highlights the number of excuses drivers in New York City make everyday in effort to avoid a ticket while parking illegally.
-					</span>
-					<span class="meta">
-						<span class="flv">(1:08 - 4.16 MB)</span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=45">
-
-							Portland, OR - Crosswalk Enforcement Actions
-						</a>
-					</strong>
-					<a href="video-view.php?id=45" class="thumb">
-						<img src="/files/thumbs/pdx-crosswalk.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						In Portland, OR, you can get a $242 ticket for failing to yield to a pedestrian in a crosswalk.
-					</span>
-					<span class="meta">
-
-						<span class="flv">(1:36 - 5.77 MB)</span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=46">
-							Atlantic Avenue
-						</a>
-					</strong>
-
-					<a href="video-view.php?id=46" class="thumb">
-						<img src="/files/thumbs/atlantic-ave.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Residents, business-people and community leaders speak out against the speeding and congestions problems on Brooklyn's Atlantic Avenue that have resulted in a number of recent accident-related fatalities.
-					</span>
-					<span class="meta">
-						<span class="flv">(3:46 - 14.73 MB)</span>
-					</span>
-
-				</li>
-			</ul>
-			<div class="clear"></div>
-			
-			<h3>
-				Previous Videos
-			</h3>
-			<ul class="thumbnails">
-				<li>
-					<strong class="title">
-
-						<a href="video-view.php?id=1">
-							Introduction
-						</a>
-					</strong>
-					<a href="video-view.php?id=1" class="thumb">
-						<img src="/files/videos/thumbs/introduction.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Mark Gorton introduces the goals of the NYC Streets Renaissance project.
-					</span>
-
-					<span class="meta">
-						<span class="mov">(1:00 - 2.71 MB)</span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=34">
-							Portland, OR - Innovative Bicycle Signal
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=34" class="thumb">
-						<img src="/files/thumbs/pdx-bikesignal.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						This unique bike signal gives Portland cyclists the right of way!
-					</span>
-					<span class="meta">
-						<span class="flv">(1:37 - 5.91 MB) <!-- 320 --></span>
-
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=35">
-							Portland, OR - Safe Routes to School
-						</a>
-					</strong>
-					<a href="video-view.php?id=35" class="thumb">
-
-						<img src="/files/thumbs/pdx-sunnyside.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						This Portland institution emphasizes using non-motorized means to get to school.
-					</span>
-					<span class="meta">
-						<span class="flv">(4:14 - 16.40 MB) <!-- 320 --></span>
-					</span>
-				</li>
-
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=36">
-							Portland, OR - Older Adults Bike Program
-						</a>
-					</strong>
-					<a href="video-view.php?id=36" class="thumb">
-						<img src="/files/thumbs/pdx-older.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-
-						Seniors in Portland ride three-wheeled trikes thanks to a program by the Portland Office of Transportation (PDOT).
-					</span>
-					<span class="meta">
-						<span class="flv">(3:31 - 17.37 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=37">
-
-							Portland, OR - Festival Streets
-						</a>
-					</strong>
-					<a href="video-view.php?id=37" class="thumb">
-						<img src="/files/thumbs/pdx-festival.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Innovative thinking in Portland has produced a new street design which emphasizes community use.
-					</span>
-					<span class="meta">
-
-						<span class="flv">(3:39 - 13.93 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=38">
-							Portland, OR - Traffic Calming: Diagonal Diverter
-						</a>
-					</strong>
-
-					<a href="video-view.php?id=38" class="thumb">
-						<img src="/files/thumbs/pdx-diagonal.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						The use of traffic calming in Portland emphasizes keeping thru traffic out of neighborhoods.
-					</span>
-					<span class="meta">
-						<span class="flv">(1:20 - 5.57 MB) <!-- 320 --></span>
-					</span>
-
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=39">
-							Portland, OR - Bicycle Boulevards
-						</a>
-					</strong>
-					<a href="video-view.php?id=39" class="thumb">
-						<img src="/files/thumbs/pdx-boulevards.jpg" alt="" class="thumb" />
-
-					</a> 
-					<span class="description">
-						Who needs bike lanes on wonderful streets like these when you keep traffic to a minimum?
-					</span>
-					<span class="meta">
-						<span class="flv">(3:08 - 12.12 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-
-					<strong class="title">
-						<a href="video-view.php?id=2">
-							Hell's Kitchen: Neighborhood Under Siege
-						</a>
-					</strong>
-					<a href="video-view.php?id=2" class="thumb">
-						<img src="/files/videos/thumbs/hells-kitchen.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Residents protest the DOT's transformation of 9th Avenue, adding more space for cars and destroying the neighborhood in the process.
-					</span>
-
-					<span class="meta">
-						<span class="mov">(14:37 - 41.49 MB)</span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=19">
-							Interview with Enrique Pe&ntilde;alosa (Long)
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=19" class="thumb">
-						<img src="/files/thumbs/penalosa-long.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Former Bogot&aacute; mayor Enrique Pe&ntilde;alosa discusses his amazing success transforming Bogot&aacute; into a livable city for cyclists and pedestrians.
-					</span>
-
-					<span class="meta">
-						<span class="flv">(12:07 - 51.26 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=27">
-							Lessons from San Francisco
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=27" class="thumb">
-						<img src="/files/thumbs/embarcadero.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						After an earthquake, the Embarcadero Freeway was replaced with a grand boulevard which has rejuvenated its waterfront.
-					</span>
-					<span class="meta">
-						<span class="flv">(12:04 - 52.45 MB) <!-- 320 --></span>
-
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=24">
-							Lessons From Portland
-						</a>
-					</strong>
-					<a href="video-view.php?id=24" class="thumb">
-
-						<img src="/files/thumbs/lessons-from-portland.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						The Mt. Hood Freeway's defeat in the 1970s positively impacted Portland, Oregon's future, creating a more livable city.
-					</span>
-					<span class="meta">
-						<span class="flv">(11:42 - 50.01 MB) <!-- 320 --></span>
-					</span>
-				</li>
-
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=17">
-							A conversation with Lou Riccio
-						</a>
-					</strong>
-					<a href="video-view.php?id=17" class="thumb">
-						<img src="/files/thumbs/lou-riccio.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-
-						Discussion about the transportation planning with former NYC D.O.T. Commissioner Lou Riccio.
-					</span>
-					<span class="meta">
-						<span class="flv">(10:57 - 44.69 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=25">
-
-							Grand Army Plaza Traffic Survey
-						</a>
-					</strong>
-					<a href="video-view.php?id=25" class="thumb">
-						<img src="/files/thumbs/grand-army-plaza.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Residents and neighborhood leaders of GAPCO evaluate how traffic conditions could be improved for pedestrians.
-					</span>
-					<span class="meta">
-
-						<span class="flv">(9:00 - 41.03 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=3">
-							Jan Gehl in Times Square
-						</a>
-					</strong>
-
-					<a href="video-view.php?id=3" class="thumb">
-						<img src="/files/videos/thumbs/gehl-times-square.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Jan Gehl (<a href="http://www.gehlarchitects.dk/">Gehl Architects</a>) and Mark Gorton discuss the potential for pedestrian-friendly changes in Times Square.
-					</span>
-					<span class="meta">
-						<span class="mov">(8:31 - 28.08 MB)</span>
-
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=4">
-							Lessons From Canal Park
-						</a>
-					</strong>
-					<a href="video-view.php?id=4" class="thumb">
-
-						<img src="/files/thumbs/canal.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Richard Barrett talks about his community's struggle to rebuild Canal Park, a task deemed impossible by New York City's Department of Transportation.
-					</span>
-					<span class="meta">
-						<span class="flv">(8:00 - 36.77 MB) <!-- 320 --></span>
-					</span>
-				</li>
-
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=33">
-							Park(ing) Day San Francisco
-						</a>
-					</strong>
-					<a href="video-view.php?id=33" class="thumb">
-						<img src="/files/thumbs/parking-day-sf.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-
-						In San Francisco, organizations temporarily liberated over two dozen parking spots, turning them into temporary green spaces for pedestrians.
-					</span>
-					<span class="meta">
-						<span class="flv">(6:51 - 38.24 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=32">
-
-							Greenwich Street
-						</a>
-					</strong>
-					<a href="video-view.php?id=32" class="thumb">
-						<img src="/files/thumbs/greenwich.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						This heavily-used crosswalk on Greenwich Street is constantly ignored by drivers.
-					</span>
-					<span class="meta">
-
-						<span class="flv">(6:07 - 33.49 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=5">
-							Fulton Street
-						</a>
-					</strong>
-
-					<a href="video-view.php?id=5" class="thumb">
-						<img src="/files/thumbs/fulton.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Jeff Prant collects signatures on his petition to maintain Fulton Street's car-free hours.
-					</span>
-					<span class="meta">
-						<span class="flv">(5:48 - 31.04 MB) <!-- 320 --></span>
-					</span>
-
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=26">
-							The Sidewalk Nibblers
-						</a>
-					</strong>
-					<a href="video-view.php?id=26" class="thumb">
-						<img src="/files/thumbs/sidewalk-nibblers.jpg" alt="" class="thumb" />
-
-					</a> 
-					<span class="description">
-						A proposed plan by DOT for a subway station at 96th street will leave pedestrians with 18 ft. less sidewalk space!
-					</span>
-					<span class="meta">
-						<span class="flv">(5:38 - 26.42 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-
-					<strong class="title">
-						<a href="video-view.php?id=28">
-							"Gridlock Sam": Central Park
-						</a>
-					</strong>
-					<a href="video-view.php?id=28" class="thumb">
-						<img src="/files/videos/thumbs/gls-park.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Sam Schwartz, former NYC Commissioner of Traffic, explains how closing Central Park to cars will not result in traffic chaos.
-					</span>
-
-					<span class="meta">
-						<span class="mov">(5:23 - 13.18 MB)</span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=29">
-							"Gridlock Sam": Parking Permits
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=29" class="thumb">
-						<img src="/files/videos/thumbs/gls-permits.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						In the second part of our interview with "Gridlock Sam" Schwartz, the topic is Government Parking Permits. 
-					</span>
-					<span class="meta">
-						<span class="mov">(5:06 - 13.80 MB)</span>
-
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=18">
-							What About The Children?
-						</a>
-					</strong>
-					<a href="video-view.php?id=18" class="thumb">
-
-						<img src="/files/thumbs/sister-dixon.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Holy Cross School Principal, Sister Mary Teresa Dixon, talks about her many attempts to get the NYC DOT to help with traffic conditions outside of her school.
-					</span>
-					<span class="meta">
-						<span class="flv">(4:56 - 21.92 MB) <!-- 320 --></span>
-					</span>
-				</li>
-
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=22">
-							Parking Spot Squat
-						</a>
-					</strong>
-					<a href="video-view.php?id=22" class="thumb">
-						<img src="/files/thumbs/parking-spot-squat.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-
-						Volunteers take over a parking spot for a day to reclaim it for public use in Park Slope, Brooklyn.
-					</span>
-					<span class="meta">
-						<span class="flv">(4:46 - 23.15 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=30">
-
-							Car-free Sunday on the Grand Concourse
-						</a>
-					</strong>
-					<a href="video-view.php?id=30" class="thumb">
-						<img src="/files/thumbs/grand-concourse.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Residents of the Bronx take to the streets when part of the Grand Concourse is closed to cars.
-					</span>
-					<span class="meta">
-
-						<span class="flv">(3:58 - 21.59 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=20">
-							Interview with Enrique Pe&ntilde;alosa (Short)
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=20" class="thumb">
-						<img src="/files/thumbs/penalosa-short.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Former Bogot&aacute; mayor Enrique Pe&ntilde;alosa discusses his amazing success transforming Bogot&aacute; into a livable city for cyclists and pedestrians.
-					</span>
-
-					<span class="meta">
-						<span class="flv">(3:08 - 12.75 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=6">
-							Public Space Transformations
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=6" class="thumb">
-						<img src="/files/videos/thumbs/transformations.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						These photo simulations from the Project for Public Spaces show how we can transform some of our misused intersections.
-					</span>
-					<span class="meta">
-						<span class="flv">(2:00 - 3.79 MB)</span>
-
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=7">
-							Broadway &amp; Houston
-						</a>
-					</strong>
-
-					<a href="video-view.php?id=7" class="thumb">
-						<img src="/files/videos/thumbs/houston.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						One of the busiest pedestrian crossings in the city is to become even more car-friendly at the expense of pedestrian safety.
-					</span>
-					<span class="meta">
-						<span class="mov">(1:51 - 7.20 MB)</span>
-					</span>
-
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=8">
-							Psychic Space
-						</a>
-					</strong>
-					<a href="video-view.php?id=8" class="thumb">
-						<img src="/files/thumbs/psychic-space.jpg" alt="" class="thumb" />
-
-					</a> 
-					<span class="description">
-						Mark Gorton points out how parking and street design on two SoHo streets can make a huge impact on pedestrians.
-					</span>
-					<span class="meta">
-						<span class="flv">(1:37 - 8.97 MB) <!-- 320 --></span>
-					</span>
-				</li>
-
-				<li>
-
-					<strong class="title">
-						<a href="video-view.php?id=31">
-							Miracle Ticket
-						</a>
-					</strong>
-					<a href="video-view.php?id=31" class="thumb">
-						<img src="/files/thumbs/miracle.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Sometimes when you are armed with a camera in New York City, miracles can happen.
-					</span>
-
-					<span class="meta">
-						<span class="flv">(1:13 - 6.80 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=21">
-							When do we go?
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=21" class="thumb">
-						<img src="/files/videos/thumbs/when-do-we-go.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						A few minutes of condensed footage of pedestrians intrepidly navigating traffic at Broome and Broadway.
-					</span>
-					<span class="meta">
-						<span class="mov">(1:11 - 3.85 MB)</span>
-
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=10">
-							Dirty Little Secret
-						</a>
-					</strong>
-					<a href="video-view.php?id=10" class="thumb">
-
-						<img src="/files/thumbs/dirty-little-secret.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						An inequitable use of parking by government agencies is a dirty little secret in Chinatown.
-					</span>
-					<span class="meta">
-						<span class="flv">(0:56 - 5.07 MB) <!-- 320 --></span>
-					</span>
-				</li>
-
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=11">
-							Grand Street Redesigned
-						</a>
-					</strong>
-					<a href="video-view.php?id=11" class="thumb">
-						<img src="/files/videos/thumbs/grand.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-
-						Mark Gorton tours Grand Street in Chinatown, pointing out the nonsensical difference in space allotted to cars and pedestrians.
-					</span>
-					<span class="meta">
-						<span class="mov">(0:50 - 2.27 MB)</span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=12">
-
-							Pedestrian Obstacle Course
-						</a>
-					</strong>
-					<a href="video-view.php?id=12" class="thumb">
-						<img src="/files/thumbs/course.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						A visual example of the hoops through which a pedestrian must jump to cross a street in Times Square.
-					</span>
-					<span class="meta">
-
-						<span class="flv">(0:46 - 4.88 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=40">
-							So Why Are They Driving?
-						</a>
-					</strong>
-
-					<a href="video-view.php?id=37" class="thumb">
-						<img src="/files/thumbs/psa-driving.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						Nearly every person who drives into New York City has an alternate means of transportation.
-					</span>
-					<span class="meta">
-						<span class="flv">(0:30 - 3.38 MB) <!-- 320 --></span>
-					</span>
-
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=13">
-							Pedestrian Density
-						</a>
-					</strong>
-					<a href="video-view.php?id=13" class="thumb">
-						<img src="/files/thumbs/density.jpg" alt="" class="thumb" />
-
-					</a> 
-					<span class="description">
-						Cars get more space than pedestrians do on the streets, which leads to overcrowded sidewalks.
-					</span>
-					<span class="meta">
-						<span class="flv">(0:30 - 2.42 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-
-					<strong class="title">
-						<a href="video-view.php?id=14">
-							We're Walking
-						</a>
-					</strong>
-					<a href="video-view.php?id=14" class="thumb">
-						<img src="/files/thumbs/walking.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						While walking around Manhattan, pedestrians might wonder where all the cars come from. After seeing these statistics, it seems obvious.
-					</span>
-
-					<span class="meta">
-						<span class="flv">(0:30 - 1.73 MB) <!-- 320 --></span>
-					</span>
-				</li>
-				<li>
-					<strong class="title">
-						<a href="video-view.php?id=15">
-							Cab in a Crosswalk
-						</a>
-
-					</strong>
-					<a href="video-view.php?id=15" class="thumb">
-						<img src="/files/thumbs/crosswalk.jpg" alt="" class="thumb" />
-					</a> 
-					<span class="description">
-						See how much disruption and danger one taxi cab stuck in a Times Square crosswalk can create.
-					</span>
-					<span class="meta">
-						<span class="flv">(0:28 - 3.25 MB) <!-- 320 --></span>
-
-					</span>
-				</li>
-				
-							</ul>
-			<div class="clear"></div>
-		
-		</div>
-		<!-- / Body -->
-		
-		<div class="clear"></div>
-		
-	</div>
-	<!-- / Container -->
-
-	
-	<hr />
-	
-		<!-- Footer -->
-	<div id="footer">
-		<p class="links">
-		[ 
-		<a href="/">
-			<span>Home</span>
-		</a> 
-		| 
-		<a href="/who/">
-
-			<span>Who We Are</span>
-		</a> 
-		| 
-		<a href="/nyc/">
-			<span>New York Lessons</span>
-		</a> 
-		| 
-		<a href="/lessons/">
-			<span>Global Lessons</span>
-
-		</a> 
-		| 
-		<a href="/involved/">
-			<span>Get Involved</span>
-		</a> 
-		| 
-		<a href="/events/">
-			<span>Events</span>
-		</a> 
-		| 
-		<a href="/involved/join.php">
-
-			<span>Join Us</span>
-		</a> 
-		]
-		</p>
-		<p class="cc">
-			<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/">
-				<img alt="Creative Commons License" border="0" src="/img/logos/cc.png" class="logo" /><br />
-				These works are licensed under a Creative Commons License
-			</a>
-		</p>
-
-		<!--
-		<rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-			<Work rdf:about="">
-				<license rdf:resource="http://creativecommons.org/licenses/by-nc-nd/2.5/" />
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/Text" />
-			</Work>
-			<License rdf:about="http://creativecommons.org/licenses/by-nc-nd/2.5/">
-				<permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
-				<permits rdf:resource="http://web.resource.org/cc/Distribution"/>
-				<requires rdf:resource="http://web.resource.org/cc/Notice"/>
-				<requires rdf:resource="http://web.resource.org/cc/Attribution"/>
-				<prohibits rdf:resource="http://web.resource.org/cc/CommercialUse"/>
-			</License>
-		</rdf:RDF>
-		-->
-	</div>
-	<!-- / Footer -->
-</body>
-</html>

From ltucker at codespeak.net  Mon Dec  4 21:57:59 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon,  4 Dec 2006 21:57:59 +0100 (CET)
Subject: [z3-checkins] r35271 - in z3/deliverance/trunk: . deliverance
	deliverance/test-data/nycsr deliverance/test-data/tasktracker
Message-ID: <20061204205759.5A67D10077@code0.codespeak.net>

Author: ltucker
Date: Mon Dec  4 21:57:54 2006
New Revision: 35271

Modified:
   z3/deliverance/trunk/deliverance/fixuplinks.py
   z3/deliverance/trunk/deliverance/handtransform.py
   z3/deliverance/trunk/deliverance/interpreter.py
   z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_expected.html
   z3/deliverance/trunk/deliverance/test-data/tasktracker/expected.html
   z3/deliverance/trunk/deliverance/test_speed.py
   z3/deliverance/trunk/deliverance/test_wsgi.py
   z3/deliverance/trunk/deliverance/tests.py
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
   z3/deliverance/trunk/deliverance/xslt.py
   z3/deliverance/trunk/setup.py
Log:
test few things remotely using svn, make certain imports specific to deliverance

Modified: z3/deliverance/trunk/deliverance/fixuplinks.py
==============================================================================
--- z3/deliverance/trunk/deliverance/fixuplinks.py	(original)
+++ z3/deliverance/trunk/deliverance/fixuplinks.py	Mon Dec  4 21:57:54 2006
@@ -3,7 +3,7 @@
 """
 
 
-from htmlserialize import decodeAndParseHTML, tostring
+from deliverance.htmlserialize import decodeAndParseHTML, tostring
 import urlparse
 import re
 

Modified: z3/deliverance/trunk/deliverance/handtransform.py
==============================================================================
--- z3/deliverance/trunk/deliverance/handtransform.py	(original)
+++ z3/deliverance/trunk/deliverance/handtransform.py	Mon Dec  4 21:57:54 2006
@@ -1,9 +1,9 @@
 import sys 
 from lxml import etree
-from htmlserialize import tostring
+from deliverance.htmlserialize import tostring
 import urllib
-from interpreter import Renderer as PythonRenderer
-from xslt import Renderer as XSLTRenderer
+from deliverance.interpreter import Renderer as PythonRenderer
+from deliverance.xslt import Renderer as XSLTRenderer
 from optparse import OptionParser
 import re
 import os 

Modified: z3/deliverance/trunk/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/trunk/deliverance/interpreter.py	(original)
+++ z3/deliverance/trunk/deliverance/interpreter.py	Mon Dec  4 21:57:54 2006
@@ -1,9 +1,9 @@
 from lxml import etree
-import xinclude 
+from deliverance import xinclude 
 import copy
-import utils
-from utils import RuleSyntaxError
-from utils import RendererBase
+from deliverance import utils
+from deliverance.utils import RuleSyntaxError
+from deliverance.utils import RendererBase
 
 class Renderer(RendererBase):
     """

Modified: z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_expected.html
==============================================================================
--- z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_expected.html	(original)
+++ z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_expected.html	Mon Dec  4 21:57:54 2006
@@ -20,8 +20,8 @@
 <meta name="generator" content="BBEdit 8.2">
 <meta name="MSSmartTagsPreventParsing" content="true">
 <meta name="robots" content="all">
-<style type="text/css" media="screen">@import url(http://www.nycsr.org/css/style.css);</style>
-<style type="text/css" media="screen">@import url(http://www.nycsr.org/css/nav.css);</style>
+<style type="text/css" media="screen">@import url(http://codespeak.net/css/style.css);</style>
+<style type="text/css" media="screen">@import url(http://codespeak.net/css/nav.css);</style>
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 		startList = function() {
 			if (document.all&&document.getElementById) {
@@ -42,7 +42,7 @@
 		window.onload=startList;
 		
 		//--><!]]>
-	</script><script src="http://www.nycsr.org/js/gallery.js" type="text/javascript" language="javascript"></script><!-- image fade: http://www.dynamicdrive.com/dynamicindex14/fadeinslideshow.htm --><script type="text/javascript" src="http://www.openplans.org/projects/nycstreets/openplans.js"></script><script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts6565.js">
+	</script><script type="text/javascript" src="http://www.openplans.org/projects/nycstreets/openplans.js"></script><script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts6565.js">
                 </script><script type="text/javascript" src="http://www.openplans.org/portal_javascripts/Plone%20Default/ploneScripts0569.js">
                 </script><meta name="generator" content="Plone - http://plone.org">
 <meta http-equiv="imagetoolbar" content="no">
@@ -52,8 +52,8 @@
         OpenPlans
     </title>
 </head>
-<body id="page-home" class="index">
-<!-- Header --><div id="header"><h1 class="logo"><a href="http://www.nycsr.org/"><span>The New York City Streets Renaissance</span></a></h1></div>
+<body id="page-nyc" class="gallery">
+<!-- Header --><div id="header"><h1 class="logo"><a href="http://codespeak.net/"><span>The New York City Streets Renaissance</span></a></h1></div>
 <!-- / Header --><hr>
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 startList = function() {
@@ -75,46 +75,52 @@
 window.onload=startList;
 
 //--><!]]></script><!-- Top Level Links --><div id="toplevel"><ul class="links">
-<li id="top-home"><a href="http://www.nycsr.org/"><strong><span>Home Page</span></strong></a></li>
-<li id="top-join"><a href="http://www.nycsr.org/involved/join.php"><strong><span>Join Us</span></strong></a></li>
+<li id="top-home"><a href="http://codespeak.net/"><strong><span>Home Page</span></strong></a></li>
+<li id="top-join"><a href="http://codespeak.net/involved/join.php"><strong><span>Join Us</span></strong></a></li>
 </ul></div>
 <!-- / Top Level Links --><!-- Navigation Bar --><div id="nav">
 <ul id="menu" class="tabs">
 <li id="nav-who">
-<a href="http://www.nycsr.org/who/"><strong><span>Who We Are</span></strong></a><ul class="sub">
-<li><a href="http://www.nycsr.org/who/supporters.php"><span>Supporters List</span></a></li>
-<li><a href="http://www.nycsr.org/who/contact.php"><span>Contact Us</span></a></li>
+<a href="http://codespeak.net/who/"><strong><span>Who We Are</span></strong></a><ul class="sub">
+<li><a href="http://codespeak.net/who/supporters.php"><span>Supporters List</span></a></li>
+<li><a href="http://codespeak.net/who/contact.php"><span>Contact Us</span></a></li>
 </ul>
 </li>
-<li id="nav-nyc">
-<a href="http://www.nycsr.org/nyc/"><strong><span>New York Streets</span></strong></a><ul class="sub">
-<li><a href="http://www.nycsr.org/nyc/truth.php"><span>The Truth About Traffic</span></a></li>
-<li><a href="http://www.nycsr.org/nyc/broken.php"><span>Broken Streets</span></a></li>
-<li><a href="http://www.nycsr.org/nyc/building.php"><span>Building on Progress</span></a></li>
-<li><a href="http://www.nycsr.org/nyc/video.php"><span>Video Gallery</span></a></li>
-<li><a href="http://www.nycsr.org/nyc/photo.php"><span>Photo Gallery</span></a></li>
+<li id="nav-nyc" class="selected">
+<a href="http://codespeak.net/nyc/"><strong><span>New York Streets</span></strong></a><ul class="sub">
+<li><a href="http://codespeak.net/nyc/truth.php"><span>The Truth About Traffic</span></a></li>
+<li><a href="http://codespeak.net/nyc/broken.php"><span>Broken Streets</span></a></li>
+<li><a href="http://codespeak.net/nyc/building.php"><span>Building on Progress</span></a></li>
+<li><a href="http://codespeak.net/nyc/video.php"><span>StreetFilms Video Gallery</span></a></li>
+<li><a href="http://codespeak.net/nyc/photo.php"><span>Photo Gallery</span></a></li>
 </ul>
 </li>
 <li id="nav-lessons">
-<a href="http://www.nycsr.org/lessons/"><strong><span>Global Lessons</span></strong></a><ul class="sub">
-<li><a href="http://www.nycsr.org/lessons/chicago.php"><span>Chicago</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/philadelphia.php"><span>Philadelphia</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/london.php"><span>London</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/paris.php"><span>Paris</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/copenhagen.php"><span>Copenhagen</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/great.php"><span>What Makes a Great Street?</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/benefits.php"><span>The Benefits of Great Streets</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/photo.php"><span>Photo Gallery</span></a></li>
+<a href="http://codespeak.net/lessons/"><strong><span>Global Lessons</span></strong></a><ul class="sub">
+<!--
+					<li>
+						<a href="/lessons/contested.php">
+							<span>Contested Streets</span>
+						</a>
+					</li>
+					--><li><a href="http://codespeak.net/lessons/chicago.php"><span>Chicago</span></a></li>
+<li><a href="http://codespeak.net/lessons/philadelphia.php"><span>Philadelphia</span></a></li>
+<li><a href="http://codespeak.net/lessons/london.php"><span>London</span></a></li>
+<li><a href="http://codespeak.net/lessons/paris.php"><span>Paris</span></a></li>
+<li><a href="http://codespeak.net/lessons/copenhagen.php"><span>Copenhagen</span></a></li>
+<li><a href="http://codespeak.net/lessons/great.php"><span>What Makes a Great Street?</span></a></li>
+<li><a href="http://codespeak.net/lessons/benefits.php"><span>The Benefits of Great Streets</span></a></li>
+<li><a href="http://codespeak.net/lessons/photo.php"><span>Photo Gallery</span></a></li>
 </ul>
 </li>
 <li id="nav-involved">
-<a href="http://www.nycsr.org/involved/"><strong><span>Get Involved</span></strong></a><ul class="sub">
-<li><a href="http://www.nycsr.org/involved/join.php"><span>Join Us</span></a></li>
-<li><a href="http://www.nycsr.org/involved/ways.php"><span>Ways to Get Involved</span></a></li>
-<li><a href="http://www.nycsr.org/involved/resources.php"><span>Resources</span></a></li>
+<a href="http://codespeak.net/involved/"><strong><span>Get Involved</span></strong></a><ul class="sub">
+<li><a href="http://codespeak.net/involved/join.php"><span>Join Us</span></a></li>
+<li><a href="http://codespeak.net/involved/ways.php"><span>Ways to Get Involved</span></a></li>
+<li><a href="http://codespeak.net/involved/resources.php"><span>Resources</span></a></li>
 </ul>
 </li>
-<li id="nav-events"><a href="http://www.nycsr.org/events/"><strong><span>Events</span></strong></a></li>
+<li id="nav-events"><a href="http://codespeak.net/events/"><strong><span>Events</span></strong></a></li>
 </ul>
 <div class="clear"></div>
 </div>
@@ -369,22 +375,22 @@
 <!-- Footer --><div id="footer">
 <p class="links">
 		[ 
-		<a href="http://www.nycsr.org/"><span>Home</span></a> 
+		<a href="http://codespeak.net/"><span>Home</span></a> 
 		| 
-		<a href="http://www.nycsr.org/who/"><span>Who We Are</span></a> 
+		<a href="http://codespeak.net/who/"><span>Who We Are</span></a> 
 		| 
-		<a href="http://www.nycsr.org/nyc/"><span>New York Lessons</span></a> 
+		<a href="http://codespeak.net/nyc/"><span>New York Lessons</span></a> 
 		| 
-		<a href="http://www.nycsr.org/lessons/"><span>Global Lessons</span></a> 
+		<a href="http://codespeak.net/lessons/"><span>Global Lessons</span></a> 
 		| 
-		<a href="http://www.nycsr.org/involved/"><span>Get Involved</span></a> 
+		<a href="http://codespeak.net/involved/"><span>Get Involved</span></a> 
 		| 
-		<a href="http://www.nycsr.org/events/"><span>Events</span></a> 
+		<a href="http://codespeak.net/events/"><span>Events</span></a> 
 		| 
-		<a href="http://www.nycsr.org/involved/join.php"><span>Join Us</span></a> 
+		<a href="http://codespeak.net/involved/join.php"><span>Join Us</span></a> 
 		]
 		</p>
-<p class="cc"><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="http://www.nycsr.org/img/logos/cc.png" class="logo"><br>
+<p class="cc"><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="http://codespeak.net/img/logos/cc.png" class="logo"><br>
 				These works are licensed under a Creative Commons License
 			</a></p>
 <!--

Modified: z3/deliverance/trunk/deliverance/test-data/tasktracker/expected.html
==============================================================================
--- z3/deliverance/trunk/deliverance/test-data/tasktracker/expected.html	(original)
+++ z3/deliverance/trunk/deliverance/test-data/tasktracker/expected.html	Mon Dec  4 21:57:54 2006
@@ -10,8 +10,8 @@
 <meta name="generator" content="BBEdit 8.2">
 <meta name="MSSmartTagsPreventParsing" content="true">
 <meta name="robots" content="all">
-<style type="text/css" media="screen">@import url(http://www.nycsr.org/css/style.css);</style>
-<style type="text/css" media="screen">@import url(http://www.nycsr.org/css/nav.css);</style>
+<style type="text/css" media="screen">@import url(http://codespeak.net/css/style.css);</style>
+<style type="text/css" media="screen">@import url(http://codespeak.net/css/nav.css);</style>
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 		startList = function() {
 			if (document.all&&document.getElementById) {
@@ -37,7 +37,7 @@
 </title>
 </head>
 <body id="page-nyc" class="gallery">
-<!-- Header --><div id="header"><h1 class="logo"><a href="http://www.nycsr.org/"><span>The New York City Streets Renaissance</span></a></h1></div>
+<!-- Header --><div id="header"><h1 class="logo"><a href="http://codespeak.net/"><span>The New York City Streets Renaissance</span></a></h1></div>
 <!-- / Header --><hr>
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 startList = function() {
@@ -59,46 +59,52 @@
 window.onload=startList;
 
 //--><!]]></script><!-- Top Level Links --><div id="toplevel"><ul class="links">
-<li id="top-home"><a href="http://www.nycsr.org/"><strong><span>Home Page</span></strong></a></li>
-<li id="top-join"><a href="http://www.nycsr.org/involved/join.php"><strong><span>Join Us</span></strong></a></li>
+<li id="top-home"><a href="http://codespeak.net/"><strong><span>Home Page</span></strong></a></li>
+<li id="top-join"><a href="http://codespeak.net/involved/join.php"><strong><span>Join Us</span></strong></a></li>
 </ul></div>
 <!-- / Top Level Links --><!-- Navigation Bar --><div id="nav">
 <ul id="menu" class="tabs">
 <li id="nav-who">
-<a href="http://www.nycsr.org/who/"><strong><span>Who We Are</span></strong></a><ul class="sub">
-<li><a href="http://www.nycsr.org/who/supporters.php"><span>Supporters List</span></a></li>
-<li><a href="http://www.nycsr.org/who/contact.php"><span>Contact Us</span></a></li>
+<a href="http://codespeak.net/who/"><strong><span>Who We Are</span></strong></a><ul class="sub">
+<li><a href="http://codespeak.net/who/supporters.php"><span>Supporters List</span></a></li>
+<li><a href="http://codespeak.net/who/contact.php"><span>Contact Us</span></a></li>
 </ul>
 </li>
 <li id="nav-nyc" class="selected">
-<a href="http://www.nycsr.org/nyc/"><strong><span>New York Streets</span></strong></a><ul class="sub">
-<li><a href="http://www.nycsr.org/nyc/truth.php"><span>The Truth About Traffic</span></a></li>
-<li><a href="http://www.nycsr.org/nyc/broken.php"><span>Broken Streets</span></a></li>
-<li><a href="http://www.nycsr.org/nyc/building.php"><span>Building on Progress</span></a></li>
-<li><a href="http://www.nycsr.org/nyc/video.php"><span>Video Gallery</span></a></li>
-<li><a href="http://www.nycsr.org/nyc/photo.php"><span>Photo Gallery</span></a></li>
+<a href="http://codespeak.net/nyc/"><strong><span>New York Streets</span></strong></a><ul class="sub">
+<li><a href="http://codespeak.net/nyc/truth.php"><span>The Truth About Traffic</span></a></li>
+<li><a href="http://codespeak.net/nyc/broken.php"><span>Broken Streets</span></a></li>
+<li><a href="http://codespeak.net/nyc/building.php"><span>Building on Progress</span></a></li>
+<li><a href="http://codespeak.net/nyc/video.php"><span>StreetFilms Video Gallery</span></a></li>
+<li><a href="http://codespeak.net/nyc/photo.php"><span>Photo Gallery</span></a></li>
 </ul>
 </li>
 <li id="nav-lessons">
-<a href="http://www.nycsr.org/lessons/"><strong><span>Global Lessons</span></strong></a><ul class="sub">
-<li><a href="http://www.nycsr.org/lessons/chicago.php"><span>Chicago</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/philadelphia.php"><span>Philadelphia</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/london.php"><span>London</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/paris.php"><span>Paris</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/copenhagen.php"><span>Copenhagen</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/great.php"><span>What Makes a Great Street?</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/benefits.php"><span>The Benefits of Great Streets</span></a></li>
-<li><a href="http://www.nycsr.org/lessons/photo.php"><span>Photo Gallery</span></a></li>
+<a href="http://codespeak.net/lessons/"><strong><span>Global Lessons</span></strong></a><ul class="sub">
+<!--
+					<li>
+						<a href="/lessons/contested.php">
+							<span>Contested Streets</span>
+						</a>
+					</li>
+					--><li><a href="http://codespeak.net/lessons/chicago.php"><span>Chicago</span></a></li>
+<li><a href="http://codespeak.net/lessons/philadelphia.php"><span>Philadelphia</span></a></li>
+<li><a href="http://codespeak.net/lessons/london.php"><span>London</span></a></li>
+<li><a href="http://codespeak.net/lessons/paris.php"><span>Paris</span></a></li>
+<li><a href="http://codespeak.net/lessons/copenhagen.php"><span>Copenhagen</span></a></li>
+<li><a href="http://codespeak.net/lessons/great.php"><span>What Makes a Great Street?</span></a></li>
+<li><a href="http://codespeak.net/lessons/benefits.php"><span>The Benefits of Great Streets</span></a></li>
+<li><a href="http://codespeak.net/lessons/photo.php"><span>Photo Gallery</span></a></li>
 </ul>
 </li>
 <li id="nav-involved">
-<a href="http://www.nycsr.org/involved/"><strong><span>Get Involved</span></strong></a><ul class="sub">
-<li><a href="http://www.nycsr.org/involved/join.php"><span>Join Us</span></a></li>
-<li><a href="http://www.nycsr.org/involved/ways.php"><span>Ways to Get Involved</span></a></li>
-<li><a href="http://www.nycsr.org/involved/resources.php"><span>Resources</span></a></li>
+<a href="http://codespeak.net/involved/"><strong><span>Get Involved</span></strong></a><ul class="sub">
+<li><a href="http://codespeak.net/involved/join.php"><span>Join Us</span></a></li>
+<li><a href="http://codespeak.net/involved/ways.php"><span>Ways to Get Involved</span></a></li>
+<li><a href="http://codespeak.net/involved/resources.php"><span>Resources</span></a></li>
 </ul>
 </li>
-<li id="nav-events"><a href="http://www.nycsr.org/events/"><strong><span>Events</span></strong></a></li>
+<li id="nav-events"><a href="http://codespeak.net/events/"><strong><span>Events</span></strong></a></li>
 </ul>
 <div class="clear"></div>
 </div>
@@ -379,22 +385,22 @@
 <!-- Footer --><div id="footer">
 <p class="links">
 		[ 
-		<a href="http://www.nycsr.org/"><span>Home</span></a> 
+		<a href="http://codespeak.net/"><span>Home</span></a> 
 		| 
-		<a href="http://www.nycsr.org/who/"><span>Who We Are</span></a> 
+		<a href="http://codespeak.net/who/"><span>Who We Are</span></a> 
 		| 
-		<a href="http://www.nycsr.org/nyc/"><span>New York Lessons</span></a> 
+		<a href="http://codespeak.net/nyc/"><span>New York Lessons</span></a> 
 		| 
-		<a href="http://www.nycsr.org/lessons/"><span>Global Lessons</span></a> 
+		<a href="http://codespeak.net/lessons/"><span>Global Lessons</span></a> 
 		| 
-		<a href="http://www.nycsr.org/involved/"><span>Get Involved</span></a> 
+		<a href="http://codespeak.net/involved/"><span>Get Involved</span></a> 
 		| 
-		<a href="http://www.nycsr.org/events/"><span>Events</span></a> 
+		<a href="http://codespeak.net/events/"><span>Events</span></a> 
 		| 
-		<a href="http://www.nycsr.org/involved/join.php"><span>Join Us</span></a> 
+		<a href="http://codespeak.net/involved/join.php"><span>Join Us</span></a> 
 		]
 		</p>
-<p class="cc"><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="http://www.nycsr.org/img/logos/cc.png" class="logo"><br>
+<p class="cc"><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="http://codespeak.net/img/logos/cc.png" class="logo"><br>
 				These works are licensed under a Creative Commons License
 			</a></p>
 <!--
@@ -416,3 +422,4 @@
 <!-- / Footer -->
 </body>
 </html>
+

Modified: z3/deliverance/trunk/deliverance/test_speed.py
==============================================================================
--- z3/deliverance/trunk/deliverance/test_speed.py	(original)
+++ z3/deliverance/trunk/deliverance/test_speed.py	Mon Dec  4 21:57:54 2006
@@ -1,9 +1,9 @@
 import sys 
 from lxml import etree
-from htmlserialize import tostring
+from deliverance.htmlserialize import tostring
 import urllib
-from interpreter import Renderer as PythonRenderer
-from xslt import Renderer as XSLTRenderer
+from deliverance.interpreter import Renderer as PythonRenderer
+from deliverance.xslt import Renderer as XSLTRenderer
 from optparse import OptionParser
 import re
 import os

Modified: z3/deliverance/trunk/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/trunk/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/trunk/deliverance/test_wsgi.py	Mon Dec  4 21:57:54 2006
@@ -5,7 +5,7 @@
 from paste.urlparser import StaticURLParser
 from deliverance.wsgimiddleware import DeliveranceMiddleware
 from formencode.doctest_xml_compare import xml_compare
-from htmlserialize import tostring
+from deliverance.htmlserialize import tostring
 
 static_data = os.path.join(os.path.dirname(__file__), 'test-data', 'static')
 tasktracker_data = os.path.join(os.path.dirname(__file__), 'test-data', 'tasktracker')
@@ -73,7 +73,7 @@
     html_string_compare(res.body, res2.body)
 
 def do_tasktracker(renderer_type, name):
-    wsgi_app = DeliveranceMiddleware(tasktracker_app, 'http://www.nycsr.org/nyc/video.php', 
+    wsgi_app = DeliveranceMiddleware(tasktracker_app, 'http://codespeak.net/svn/z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_theme.html', 
                                      'tasktracker.xml',renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/content.html')
@@ -91,7 +91,7 @@
 
 
 def do_nycsr(renderer_type, name):
-    wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://www.nycsr.org','nycsr.xml',
+    wsgi_app = DeliveranceMiddleware(nycsr_app, 'http://codespeak.net/svn/z3/deliverance/trunk/deliverance/test-data/nycsr/nycsr_theme.html','nycsr.xml',
                                      renderer_type)
     app = TestApp(wsgi_app)
     res = app.get('/openplans.html')

Modified: z3/deliverance/trunk/deliverance/tests.py
==============================================================================
--- z3/deliverance/trunk/deliverance/tests.py	(original)
+++ z3/deliverance/trunk/deliverance/tests.py	Mon Dec  4 21:57:54 2006
@@ -2,8 +2,8 @@
 import os
 from lxml import etree
 from formencode.doctest_xml_compare import xml_compare
-from interpreter import Renderer as PyRenderer
-from xslt import Renderer as XSLTRenderer
+from deliverance.interpreter import Renderer as PyRenderer
+from deliverance.xslt import Renderer as XSLTRenderer
 import copy 
 import urllib
 

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Mon Dec  4 21:57:54 2006
@@ -11,8 +11,8 @@
 from paste.request import construct_url
 from paste.response import header_value, replace_header
 from htmlserialize import tostring
-from utils import DeliveranceError
-from utils import DELIVERANCE_ERROR_PAGE
+from deliverance.utils import DeliveranceError
+from deliverance.utils import DELIVERANCE_ERROR_PAGE
 import sys 
 import datetime
 import threading

Modified: z3/deliverance/trunk/deliverance/xslt.py
==============================================================================
--- z3/deliverance/trunk/deliverance/xslt.py	(original)
+++ z3/deliverance/trunk/deliverance/xslt.py	Mon Dec  4 21:57:54 2006
@@ -1,10 +1,10 @@
 from lxml import etree
-import xinclude
+from deliverance import xinclude
 import copy 
 import re
-import utils
-from utils import RuleSyntaxError
-from utils import RendererBase
+from deliverance import utils
+from deliverance.utils import RuleSyntaxError
+from deliverance.utils import RendererBase
 
 
 xslt_wrapper_skel = """

Modified: z3/deliverance/trunk/setup.py
==============================================================================
--- z3/deliverance/trunk/setup.py	(original)
+++ z3/deliverance/trunk/setup.py	Mon Dec  4 21:57:54 2006
@@ -23,6 +23,7 @@
 	'formencode',
 	'elementtree',
 	'nose',
+	'wsgifilter',
 	'setuptools'
       ],
       include_package_data=True,

From ianb at codespeak.net  Mon Dec  4 22:26:55 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon,  4 Dec 2006 22:26:55 +0100 (CET)
Subject: [z3-checkins] r35274 - z3/deliverance/trunk/deliverance
Message-ID: <20061204212655.5F3D71007B@code0.codespeak.net>

Author: ianb
Date: Mon Dec  4 22:26:53 2006
New Revision: 35274

Modified:
   z3/deliverance/trunk/deliverance/utils.py
Log:
Add a warning about a libxml2 error with comments and copying

Modified: z3/deliverance/trunk/deliverance/utils.py
==============================================================================
--- z3/deliverance/trunk/deliverance/utils.py	(original)
+++ z3/deliverance/trunk/deliverance/utils.py	Mon Dec  4 22:26:53 2006
@@ -1,14 +1,22 @@
 from lxml import etree
 import re
 import urlparse
-import htmlserialize
+import copy
+from deliverance import htmlserialize
 
 # Test if the libxml2 fix is in place
 html = etree.HTML('<html><head><script>some text</script></head></html>')
 if html[0][0].text != 'some text':
     import warnings
     warnings.warn(
-        'Deliverance requires the CVS HEAD version of libxml2')
+        'Deliverance requires a newer version of libxml2 (1.1.18 or later)')
+
+# And another fix:
+html_comment = etree.Comment('test comment')
+if copy.deepcopy(html_comment) is None:
+    import warnings
+    warnings.warn(
+        'Deliverance requires a newer version of libxml2 (1.1.18 or later)')
 
 class DeliveranceError(Exception):
     """

From ianb at codespeak.net  Mon Dec  4 22:45:04 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon,  4 Dec 2006 22:45:04 +0100 (CET)
Subject: [z3-checkins] r35275 - z3/deliverance/trunk/deliverance
Message-ID: <20061204214504.4FECC1007A@code0.codespeak.net>

Author: ianb
Date: Mon Dec  4 22:45:03 2006
New Revision: 35275

Modified:
   z3/deliverance/trunk/deliverance/utils.py
Log:
Corrected warning

Modified: z3/deliverance/trunk/deliverance/utils.py
==============================================================================
--- z3/deliverance/trunk/deliverance/utils.py	(original)
+++ z3/deliverance/trunk/deliverance/utils.py	Mon Dec  4 22:45:03 2006
@@ -16,7 +16,7 @@
 if copy.deepcopy(html_comment) is None:
     import warnings
     warnings.warn(
-        'Deliverance requires a newer version of libxml2 (1.1.18 or later)')
+        'Deliverance requires a newer version of lxml (1.2 or later)')
 
 class DeliveranceError(Exception):
     """

From ianb at codespeak.net  Tue Dec  5 18:45:53 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Tue,  5 Dec 2006 18:45:53 +0100 (CET)
Subject: [z3-checkins] r35319 -
	z3/deliverance/buildout/trunk/helpers/topp/helpers
Message-ID: <20061205174553.4297D10077@code0.codespeak.net>

Author: ianb
Date: Tue Dec  5 18:45:50 2006
New Revision: 35319

Modified:
   z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py
Log:
Use execv to replace the process in the wrapped script, and make it a little more readable

Modified: z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py
==============================================================================
--- z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py	(original)
+++ z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py	Tue Dec  5 18:45:50 2006
@@ -1,5 +1,7 @@
 import pkg_resources
-import os,stat
+import os
+import stat
+import sys
 
 class Recipe: 
 
@@ -34,21 +36,23 @@
       """
       
       oldscript = script + ".wrapped"
-      interpreter = open(script).readline()[2:].strip()
-
-      os.rename(script,oldscript)
+      interpreter = sys.executable
+      os.rename(script, oldscript)
 
       s = open(script, 'w')
-      s.write(''.join(["#!%s\n\n" % interpreter,  
-                       "import os\n",
-                       "import sys\n",
-                       "import subprocess\n", 
-                       "os.environ['LD_LIBRARY_PATH'] = '%s'\n\n" % libpath, 
-                       "if __name__ == '__main__':\n", 
-                       "    args = ['%s', '%s']\n" % (interpreter,oldscript),
-                       "    args += sys.argv[1:]\n",
-                       "    subprocess.call(args)"
-                       ]))
+      s.write("""\
+#!%(interpreter)s
+
+import os
+import sys
+
+os.environ['LD_LIBRARY_PATH'] = %(libpath)r
+
+if __name__ == '__main__':
+    args = [sys.executable, %(oldscript)r]
+    args += sys.argv[1:]
+    os.execv(sys.executable, args)
+""" % locals())
       
       
       os.chmod(script,

From ianb at codespeak.net  Tue Dec  5 19:58:49 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Tue,  5 Dec 2006 19:58:49 +0100 (CET)
Subject: [z3-checkins] r35326 - z3/deliverance/trunk/deliverance/test-data
Message-ID: <20061205185849.3FE6B10077@code0.codespeak.net>

Author: ianb
Date: Tue Dec  5 19:58:47 2006
New Revision: 35326

Added:
   z3/deliverance/trunk/deliverance/test-data/test_move.xml
Log:
Added tests (not passing) for move option

Added: z3/deliverance/trunk/deliverance/test-data/test_move.xml
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/test-data/test_move.xml	Tue Dec  5 19:58:47 2006
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deliverance-test-suite>
+
+<!-- tests that move="1" moves the content -->
+
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme="//div[@id='content']" content="//*[@id='body']" />
+    <copy theme="//div[@id='nav']" content="//*[@id='extra_nav']" move="1" />
+  </rules>
+
+  <theme base="http://example.com"> 
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">
+      <div id="extra_nav">some nav</div>
+     </div>
+     <div id="content">Dummy Content</div>
+    </body>
+   </html>
+  </theme>
+
+  <content>
+   <html>
+    <body>
+     <div id="body">Real Content 
+      <div id="extra_nav">nav content</div>
+     </div>
+     <span class="bar">1</span>
+     <span class="quux">2</span>
+     <p>zzz</p>
+     <span class="bar">3</span>
+    </body>
+   </html>
+  </content>
+ 
+  <output>
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">nav content</div>
+     <div id="body">Real Content</div>
+    </body>
+   </html>
+  </output> 
+</deliverance-test>
+
+<!-- tests that move doesn't effect content if the theme is missing -->
+
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme="//div[@id='content']" content="//*[@id='body']" />
+    <copy theme="//div[@id='nav']" content="//*[@id='extra_nav']" move="1" notheme="ignore" />
+  </rules>
+
+  <theme base="http://example.com"> 
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="content">Dummy Content</div>
+    </body>
+   </html>
+  </theme>
+
+  <content>
+   <html>
+    <body>
+     <div id="body">Real Content 
+      <div id="extra_nav">nav content</div>
+     </div>
+    </body>
+   </html>
+  </content>
+ 
+  <output>
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="body">Real Content
+      <div id="extra_nav">nav content</div>
+     </div>
+    </body>
+   </html>
+  </output> 
+</deliverance-test>
+
+<!-- tests move with append -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme="//div[@id='content']" content="//*[@id='body']" />
+    <append theme="//div[@id='nav']" content="//*[@id='extra_nav']" move="1" />
+  </rules>
+
+  <theme base="http://example.com"> 
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">some nav</div>
+     <div id="content">Dummy Content</div>
+    </body>
+   </html>
+  </theme>
+
+  <content>
+   <html>
+    <body>
+     <div id="body">Real Content 
+      <div id="extra_nav">nav content</div>
+     </div>
+    </body>
+   </html>
+  </content>
+ 
+  <output>
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">some nav
+       <div id="extra_nav">nav content</div>
+     </div>
+     <div id="body">Real Content</div>
+    </body>
+   </html>
+  </output> 
+</deliverance-test>
+
+
+
+
+</deliverance-test-suite>

From ianb at codespeak.net  Tue Dec  5 19:59:29 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Tue,  5 Dec 2006 19:59:29 +0100 (CET)
Subject: [z3-checkins] r35327 - in z3/deliverance/trunk: . deliverance
Message-ID: <20061205185929.224FA10077@code0.codespeak.net>

Author: ianb
Date: Tue Dec  5 19:59:26 2006
New Revision: 35327

Added:
   z3/deliverance/trunk/deliverance/testrunner.py   (contents, props changed)
Modified:
   z3/deliverance/trunk/deliverance/tests.py
   z3/deliverance/trunk/setup.py
Log:
Added better selection option for test runner

Added: z3/deliverance/trunk/deliverance/testrunner.py
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/testrunner.py	Tue Dec  5 19:59:26 2006
@@ -0,0 +1,46 @@
+import sys
+import os
+from deliverance import tests
+
+def main(args=None):
+    if args is None:
+        args = sys.argv[1:]
+    # Kind of a crude way to pass info to nose...
+    if sys.argv[0].endswith('.wrapped'):
+        # A buildout detail
+        sys.argv[0] = sys.argv[0][:-len('.wrapped')]
+    remove_items = []
+    for i in range(len(args)):
+        if args[i] == '--test-file':
+            tests.select_tests.append(args[i+1])
+            remove_items.extend([i, i+1])
+        elif args[i].startswith('--test-file='):
+            tests.select_tests.append(args[i][len('--test-file='):])
+            remove_items.append(i)
+    new_args = []
+    for i in range(len(args)):
+        if i not in remove_items:
+            new_args.append(args[i])
+    args = new_args
+    os.environ.update(dict(
+        NOSE_WHERE=os.path.dirname(os.path.dirname(__file__)),
+        NOSE_DETAILED_ERRORS='t',
+        NOSE_WITH_DOCTEST='t',
+        NOSE_DOCTEST_EXTENSION='.txt',
+        NOSE_WITH_MISSING_TESTS='t'))
+    if tests.select_tests:
+        filename = tests.__file__
+        if filename.endswith('.pyc'):
+            filename = filename[:-1]
+        args.append(filename+':test_examples')
+        del os.environ['NOSE_WITH_DOCTEST']
+    sys.argv[1:] = args
+    try:
+        import nose; nose.main()
+    finally:
+        if '-h' in args or '--help' in args:
+            print '  --test-file=FILE'
+            print ' '*23, 'Restrict XML test files (Deliverance)'
+
+if __name__ == '__main__':
+    main()

Modified: z3/deliverance/trunk/deliverance/tests.py
==============================================================================
--- z3/deliverance/trunk/deliverance/tests.py	(original)
+++ z3/deliverance/trunk/deliverance/tests.py	Tue Dec  5 19:59:26 2006
@@ -1,5 +1,6 @@
 import unittest
 import os
+import sys
 from lxml import etree
 from formencode.doctest_xml_compare import xml_compare
 from deliverance.interpreter import Renderer as PyRenderer
@@ -9,6 +10,8 @@
 
 RENDERER_CLASSES = [ PyRenderer, XSLTRenderer ]
 
+select_tests = []
+
 class DeliveranceTestCase:
 
     def __init__(self, rules, rules_uri, theme, theme_uri, content, output, renderer_class):
@@ -60,10 +63,13 @@
                 yield case
 
 def cases(fn, renderer_class):
-    if not os.path.basename(fn).startswith('test_'):
+    basename = os.path.basename(fn)
+    if not basename.startswith('test_'):
         return
     if fn.endswith('~'):
         return
+    if select_tests and basename not in select_tests:
+        return
     try:
         doc = etree.parse(fn)
     except etree.XMLSyntaxError, e:
@@ -107,17 +113,3 @@
 
 
 
-
-
-def main(args=None):
-    # Kind of a crude way to pass info to nose...
-    os.environ.update(dict(
-        NOSE_WHERE=os.path.dirname(__file__),
-        NOSE_DETAILED_ERRORS='t',
-        NOSE_WITH_DOCTEST='t',
-        NOSE_DOCTEST_EXTENSION='.txt',
-        NOSE_WITH_MISSING_TESTS='t'))
-    import nose; nose.main() 
-
-if __name__ == '__main__':
-    main()

Modified: z3/deliverance/trunk/setup.py
==============================================================================
--- z3/deliverance/trunk/setup.py	(original)
+++ z3/deliverance/trunk/setup.py	Tue Dec  5 19:59:26 2006
@@ -33,7 +33,7 @@
 
       [console_scripts]
       deliverance-proxy = deliverance.proxycommand:main
-      deliverance-tests = deliverance.tests:main
+      deliverance-tests = deliverance.testrunner:main
       deliverance-speed = deliverance.test_speed:main
       deliverance-handtransform = deliverance.handtransform:main
       """,

From ltucker at codespeak.net  Tue Dec  5 21:58:46 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue,  5 Dec 2006 21:58:46 +0100 (CET)
Subject: [z3-checkins] r35341 - z3/deliverance/trunk
Message-ID: <20061205205846.C004310077@code0.codespeak.net>

Author: ltucker
Date: Tue Dec  5 21:58:44 2006
New Revision: 35341

Modified:
   z3/deliverance/trunk/setup.py
Log:
make setup less whiney about finding dependencies

Modified: z3/deliverance/trunk/setup.py
==============================================================================
--- z3/deliverance/trunk/setup.py	(original)
+++ z3/deliverance/trunk/setup.py	Tue Dec  5 21:58:44 2006
@@ -19,11 +19,11 @@
       zip_safe=False,
       install_requires=[
         'lxml',
-        'paste',
-	'formencode',
+        'Paste',
+	'FormEncode',
 	'elementtree',
 	'nose',
-	'wsgifilter',
+	'WSGIFilter',
 	'setuptools'
       ],
       include_package_data=True,

From ltucker at codespeak.net  Tue Dec  5 21:59:13 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue,  5 Dec 2006 21:59:13 +0100 (CET)
Subject: [z3-checkins] r35342 - in z3/deliverance/buildout/trunk: .
	helpers/topp/helpers
Message-ID: <20061205205913.9C64610077@code0.codespeak.net>

Author: ltucker
Date: Tue Dec  5 21:59:10 2006
New Revision: 35342

Modified:
   z3/deliverance/buildout/trunk/buildout.cfg
   z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py
Log:
search local egg dirs for distributions during fixlibsearch

Modified: z3/deliverance/buildout/trunk/buildout.cfg
==============================================================================
--- z3/deliverance/buildout/trunk/buildout.cfg	(original)
+++ z3/deliverance/buildout/trunk/buildout.cfg	Tue Dec  5 21:59:10 2006
@@ -25,7 +25,7 @@
 
 [deliverance-inst]
 recipe = zc.recipe.egg
-eggs = deliverance
+eggs = Deliverance
 
 [fix-bin-path]
 recipe = topp.helpers:addbinpath
@@ -33,5 +33,5 @@
 
 [fix-deliverance-scripts]
 recipe = topp.helpers:fixlibsearch
-eggs = deliverance
+eggs = Deliverance
 libpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libXslt/lib

Modified: z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py
==============================================================================
--- z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py	(original)
+++ z3/deliverance/buildout/trunk/helpers/topp/helpers/fixlibsearch.py	Tue Dec  5 21:59:10 2006
@@ -11,17 +11,24 @@
       self.name = name
 
   def install(self):
-      options = self.options
-      dists = [
+
+      eggs = [
           r.strip() 
-          for r in options.get('eggs', self.name).split('\n')
+          for r in self.options.get('eggs', self.name).split('\n')
           if r.strip()]
 
-      libpath = options.get('libpath').strip()
+      libpath = self.options.get('libpath').strip()
 
       bindir = self.buildout['buildout']['bin-directory']
 
-      for dist in dists: 
+      local_env = pkg_resources.Environment([self.buildout['buildout']['eggs-directory'],
+                                             self.buildout['buildout']['develop-eggs-directory']])
+      
+      for egg in eggs: 
+          dists = local_env[egg]
+          if dists is None or len(dists) == 0: 
+              raise pkg_resources.DistributionNotFound,egg 
+          dist = dists[0] # uses the newest 
           for script in pkg_resources.get_entry_map(dist, 'console_scripts').keys():
               self.fixscript(os.path.join(bindir,script), libpath)
 

From ianb at codespeak.net  Wed Dec  6 00:26:57 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Wed,  6 Dec 2006 00:26:57 +0100 (CET)
Subject: [z3-checkins] r35349 - z3/deliverance/DeliveranceDemo/trunk
Message-ID: <20061205232657.ED8EF10071@code0.codespeak.net>

Author: ianb
Date: Wed Dec  6 00:26:51 2006
New Revision: 35349

Added:
   z3/deliverance/DeliveranceDemo/trunk/supervisor.conf
Log:
Added example supervisor configuration

Added: z3/deliverance/DeliveranceDemo/trunk/supervisor.conf
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/supervisor.conf	Wed Dec  6 00:26:51 2006
@@ -0,0 +1,48 @@
+; This is for use with supervisor2:
+;   http://www.plope.com/software/supervisor2/
+
+[supervisord]
+http_port=./tmp/supervisor.sock ; (default is to run a UNIX domain socket server)
+;http_port=127.0.0.1:9001  ; (alternately, ip_address:port specifies AF_INET)
+;sockchmod=0700              ; AF_UNIX socketmode (AF_INET ignore, default 0700)
+;sockchown=nobody.nogroup     ; AF_UNIX socket uid.gid owner (AF_INET ignores)
+;umask=022                   ; (process file creation umask;default 022)
+logfile=./tmp/supervisord.log ; (main log file;default $CWD/supervisord.log)
+logfile_maxbytes=50MB       ; (max main logfile bytes b4 rotation;default 50MB)
+logfile_backups=10          ; (num of main logfile rotation backups;default 10)
+loglevel=info               ; (logging level;default info; others: debug,warn)
+pidfile=./tmp/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+nodaemon=true              ; (start in foreground if true;default false)
+minfds=1024                 ; (min. avail startup file descriptors;default 1024)
+minprocs=200                ; (min. avail process descriptors;default 200)
+
+;nocleanup=true              ; (don't clean up tempfiles at start;default false)
+;http_username=user          ; (default is no username (open system))
+;http_password=123           ; (default is no password (open system))
+;childlogdir=/tmp            ; ('AUTO' child log dir, default $TEMP)
+;user=chrism                 ; (default is current user, required if root)
+;directory=/tmp              ; (default is not to cd during start)
+;environment=KEY=value       ; (key value pairs to add to environment)
+
+[supervisorctl]
+serverurl=unix:./tmp/supervisor.sock ; use a unix:// URL  for a unix socket
+;serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket
+;username=chris              ; should be same as http_username if set
+;password=123                ; should be same as http_password if set
+;prompt=mysupervisor         ; cmd line prompt (default "supervisor")
+
+[program:ddemo]
+;command=sh -c "exec paster serve development.ini"
+command=paster serve development.ini
+autostart=true
+autorestart=true
+logfile=./tmp/ddemo.log
+;logfile_maxbytes=1MB        ; max # logfile bytes b4 rotation (default 50MB)
+;logfile_backups=10          ; # of logfile backups (default 10)
+
+
+;priority=999                ; the relative start priority (default 999)
+;stopwaitsecs=10             ; max num secs to wait before SIGKILL (default 10)
+;user=chrism                 ; setuid to this UNIX account to run the program
+
+

From jwashin at codespeak.net  Wed Dec  6 19:11:48 2006
From: jwashin at codespeak.net (jwashin at codespeak.net)
Date: Wed,  6 Dec 2006 19:11:48 +0100 (CET)
Subject: [z3-checkins] r35408 - in z3/jsonserver/trunk: . tests
Message-ID: <20061206181148.10B9510079@code0.codespeak.net>

Author: jwashin
Date: Wed Dec  6 19:11:45 2006
New Revision: 35408

Modified:
   z3/jsonserver/trunk/JSONViews.txt
   z3/jsonserver/trunk/minjson.py
   z3/jsonserver/trunk/tests/test_json.py
Log:
fixed minjson bug about literal e.g., '\\n'


Modified: z3/jsonserver/trunk/JSONViews.txt
==============================================================================
--- z3/jsonserver/trunk/JSONViews.txt	(original)
+++ z3/jsonserver/trunk/JSONViews.txt	Wed Dec  6 19:11:45 2006
@@ -56,10 +56,10 @@
     ... newValue))
 
 Before we can JSONView, there needs to be an IJSONWriter utility.  Here's one.
-    >>> import zope.component
+    >>> from zope.app.testing import ztapi
     >>> import jsoncomponent
     >>> from jsonserver.interfaces import IJSONWriter
-    >>> zope.component.provideUtility(jsoncomponent.JSONWriter(),IJSONWriter)
+    >>> ztapi.provideUtility(IJSONWriter, jsoncomponent.JSONWriter())
 
 We reset the browser just for fun...
     >>> browser = Browser('http://localhost/@@/testbrowser/simple.html')

Modified: z3/jsonserver/trunk/minjson.py
==============================================================================
--- z3/jsonserver/trunk/minjson.py	(original)
+++ z3/jsonserver/trunk/minjson.py	Wed Dec  6 19:11:45 2006
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -30,8 +30,10 @@
 
 # Additional thanks to Balazs Ree for replacing the writing module.
 
-# Jim Washington 30 Dec 2005.
+# Jim Washington 6 Dec 2006.
 
+# 2006-12-06 Thanks to Koen van de Sande, now handles the case where someone 
+#            might want e.g., a literal "\n" in text not a new-line.
 # 2005-12-30 writing now traverses the object tree instead of relying on 
 #            str() or unicode()
 # 2005-10-10 on reading, looks for \\uxxxx and replaces with u'\uxxxx'
@@ -71,7 +73,7 @@
 def unichrReplace(match):
     return unichr(int(match.group()[2:],16))
 
-escapeStrs = (('\\','\\\\'),('\n',r'\n'),('\b',r'\b'),
+escapeStrs = (('\n',r'\n'),('\b',r'\b'),
     ('\f',r'\f'),('\t',r'\t'),('\r',r'\r'), ('"',r'\"')
     )
 
@@ -213,10 +215,11 @@
                 self.objects.append(CommaToken())
         elif type == STRING:
             tok = token[1:-1]
+            parts = tok.split("\\\\")
             for k in escapeStrs:
                 if k[1] in tok:
-                    tok = tok.replace(k[1],k[0])
-            self.objects.append(tok)
+                    parts = [part.replace(k[1],k[0]) for part in parts]
+            self.objects.append("\\".join(parts))
         elif type == NUMBER:
             if self.lastOp == '-':
                 factor = -1
@@ -434,3 +437,5 @@
 
     def getvalue(self):
         return self.stream.getvalue()
+
+

Modified: z3/jsonserver/trunk/tests/test_json.py
==============================================================================
--- z3/jsonserver/trunk/tests/test_json.py	(original)
+++ z3/jsonserver/trunk/tests/test_json.py	Wed Dec  6 19:11:45 2006
@@ -455,6 +455,30 @@
         r = json.write(obj, 'utf-8')
         #cannot assertEqual here, but the printed representation should be readable
         #self.assertEqual(unicode(r,'utf-8'), good_composite_result)
+    
+    #these tests from Koen van der Sande; just in case we really want literal
+    # '\n' sent across the wire.
+    
+    def testReadSpecialEscapedChars1(self):
+        test = r'"\\f"'
+        self.assertEqual([ord(x) for x in json.read(test)],[92,102])
+        
+    def testReadSpecialEscapedChars2(self):
+        test = r'"\\a"'
+        self.assertEqual([ord(x) for x in json.read(test)],[92,97])
+        
+    def testReadSpecialEscapedChars3(self):
+        test = r'"\\\\a"'
+        self.assertEqual([ord(x) for x in json.read(test)],[92,92,97])
+    
+    def testReadSpecialEscapedChars4(self):
+        test = r'"\\\\b"'
+        self.assertEqual([ord(x) for x in json.read(test)],[92,92,98])
+    
+    def testReadSpecialEscapedChars5(self):
+        test = r'"\\\n"'
+        self.assertEqual([ord(x) for x in json.read(test)],[92,10])
+
 def test_suite():
     loader = unittest.TestLoader()
     return loader.loadTestsFromTestCase(JSONTests)

From ltucker at codespeak.net  Thu Dec  7 16:53:12 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu,  7 Dec 2006 16:53:12 +0100 (CET)
Subject: [z3-checkins] r35442 - in z3/deliverance/trunk/deliverance: .
	test-data
Message-ID: <20061207155312.C90AD100A0@code0.codespeak.net>

Author: ltucker
Date: Thu Dec  7 16:53:09 2006
New Revision: 35442

Modified:
   z3/deliverance/trunk/deliverance/interpreter.py
   z3/deliverance/trunk/deliverance/test-data/test_debug.xml
   z3/deliverance/trunk/deliverance/test-data/test_drop.xml
   z3/deliverance/trunk/deliverance/test-data/test_move.xml
   z3/deliverance/trunk/deliverance/utils.py
   z3/deliverance/trunk/deliverance/xslt.py
Log:
implementation the move option for both renderers

Modified: z3/deliverance/trunk/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/trunk/deliverance/interpreter.py	(original)
+++ z3/deliverance/trunk/deliverance/interpreter.py	Thu Dec  7 16:53:09 2006
@@ -60,6 +60,7 @@
         return result
 
 
+
     def apply_rules(self, rules, theme, content):
         """
         applies the deliverance rules given on the 
@@ -69,11 +70,17 @@
         structures. 
         """
         drop_rules, other_rules = self.separate_drop_rules(rules)
+        move_rules, other_rules = self.separate_move_rules(other_rules)
 
         # process all drop rules first 
         for rule in drop_rules:
             self.apply_rule(rule, theme, content) 
 
+        # process all move rules next 
+        for rule in move_rules: 
+            self.apply_rule(rule,theme,content)
+
+        # finally the rest
         for rule in other_rules:
             self.apply_rule(rule, theme, content)
 
@@ -106,6 +113,27 @@
                 "Rule %s (%s) not understood" % (
                     rule.tag, etree.tostring(rule)))
 
+        # process possible "move" attribute 
+        self.check_content_removal(rule, theme, content)
+
+
+    def check_content_removal(self, rule, theme, content):
+        if rule.attrib.get(self.RULE_MOVE_KEY, None) is None:
+            return
+
+        if rule.tag == self.SUBRULES_TAG or rule.tag == self.DROP_RULE_TAG: 
+            self.add_to_body_start(
+                theme, self.format_error("invalid move attribute", rule))
+            return
+
+        # drop content elements if move was specified except when 
+        # notheme='ignore' was specified and no theme elements were matched 
+        theme_els = theme.xpath(rule.attrib.get(self.RULE_THEME_KEY)) 
+        if (theme_els is not None and len(theme_els) > 0) or \
+                rule.attrib.get(self.NOTHEME_KEY) != self.IGNORE_KEYWORD:
+            self.drop_els(content, content.xpath(rule.attrib.get(self.RULE_CONTENT_KEY)))
+
+
     def apply_append(self,rule,theme,content):
         """
         function that performs the deliverance "append" 
@@ -278,48 +306,7 @@
             self.debug_replace(theme_el, content_els, rule)
             return 
 
-        non_text_els = self.elements_in(content_els)
-        self.strip_tails(non_text_els)
-
-
-        # the xpath may return a mixture of strings and elements, handle strings 
-        # by attaching them to the proper element 
-        if (type(content_els[0]) is type(str())):
-            # text must be appended to the tail of the most recent sibling or appended 
-            # to the text of the parent of the replaced element
-            self.attach_text_to_previous(theme_el, content_els[0])
-
-        if len(non_text_els) == 0:
-            self.attach_text_to_previous(theme_el, theme_el.tail)
-            theme_el.getparent().remove(theme_el)
-            return
-        
-        self.attach_tails(content_els)
-
-        # this tail, if there is one, should stick around 
-        preserve_tail = non_text_els[0].tail 
-
-        #replaces first element
-        self.replace_element(theme_el, non_text_els[0])
-        temptail = non_text_els[0].tail 
-        non_text_els[0].tail = None
-        parent = non_text_els[0].getparent()
-
-        # appends the rest of the elements
-        i = parent.index(non_text_els[0])
-        parent[i+1:i+1] = non_text_els[1:]
-
-        if non_text_els[-1].tail:
-            non_text_els[-1].tail += temptail
-        else:
-            non_text_els[-1].tail = temptail
-        
-        # tack in any preserved tail we stored above
-        if preserve_tail:
-            if non_text_els[0].tail:
-                non_text_els[0].tail = preserve_tail + non_text_els[0].tail
-            else:
-                non_text_els[0].tail = preserve_tail
+        self.replace_many(theme_el,content_els)
 
     def debug_replace(self,theme_el,content_els,rule):
         """
@@ -390,12 +377,10 @@
 
         if self.debug:
             comment_before,comment_after = self.make_debugging_comments(rule)
-            parent = theme_el.getparent()
-            index = parent.index(theme_el)
-            parent.insert(index-1, comment_before)
-            parent.insert(index+2, comment_after)
-            comment_after.tail = theme_el.tail
-            theme_el.tail = None
+            if theme_el.text:
+                comment_before.text = theme_el.text 
+            theme_el[0:0] = [comment_before]
+            theme_el.append(comment_after)
             
 
     def apply_append_or_replace(self, rule, theme, content):
@@ -438,53 +423,45 @@
         theme_el.extend(content_els)
 
 
-    def apply_drop(self, rule, theme, content):
-        """
-        function that performs the deliverance "drop" 
-        rule given by rule on the theme and content given. 
-        see deliverance specification 
-        """
-        for context in ('theme', 'content'):
-            if context not in rule.attrib: continue
-            document = locals()[context]
-            removed = False
-            for el in document.xpath(rule.attrib[context]):
-                self.attach_text_to_previous(el, el.tail)
-                el.getparent().remove(el)
-                removed = True
-            if not removed and rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
-                self.add_to_body_start(
-                    theme, self.format_error("no %s matched" % context, rule))
 
-    def elements_in(self, els):
+    def drop_els(self,doc,els): 
         """
-        return a list containing elements from els which are not strings 
+        helper to drop a list of elements without losing 
+        surrounding text 
         """
-        return [x for x in els if type(x) is not type(str())]
-            
+        removed = 0
+        for el in els: 
+            self.attach_text_to_previous(el,el.tail)
+            el.getparent().remove(el)
+            removed += 1
+        return removed
 
-
-    def strip_tails(self, els):
+    
+    def apply_drop(self, rule, theme, content):        
         """
-        for each lxml etree element in the list els, 
-        set the tail of the element to None
+        function that performs the deliverance "drop" 
+        rule given by rule on the theme and content given. 
+        see deliverance specification 
         """
-        for el in els:
-            el.tail = None
-
+        content_drop_xp = rule.attrib.get(self.RULE_CONTENT_KEY,None)
+        theme_drop_xp = rule.attrib.get(self.RULE_THEME_KEY,None)
+        
+        if (content_drop_xp is None and theme_drop_xp is None): 
+            self.add_to_body_start(
+                theme, self.format_error("No content or theme elements specified.",rule))
+            return
+                
+        if content_drop_xp: 
+            num_dropped = self.drop_els(self,content.xpath(content_drop_xp))
+            if num_dropped == 0 and not rule.attrib.get(self.NOCONTENT_KEY,None) == self.IGNORE_KEYWORD: 
+                self.add_to_body_start(
+                    theme, self.format_error("no content matched", rule))
 
-    def attach_tails(self,els):
-        """
-        whereever an lxml element in the list is followed by 
-        a string, set the tail of the lxml element to that string 
-        """
-        for index,el in enumerate(els): 
-            # if we run into a string after the current element, 
-            # attach it to the current element as the tail 
-            if (type(el) is not type(str()) and 
-                index + 1 < len(els) and 
-                type(els[index+1]) is type(str())):
-                el.tail = els[index+1]   
+        if theme_drop_xp: 
+            num_dropped = self.drop_els(self,theme.xpath(theme_drop_xp))
+            if num_dropped == 0 and not rule.attrib.get(self.NOTHEME_KEY,None) == self.IGNORE_KEYWORD: 
+                self.add_to_body_start(
+                    theme, self.format_error("no theme matched", rule))
 
 
     def make_debugging_comments(self, rule):

Modified: z3/deliverance/trunk/deliverance/test-data/test_debug.xml
==============================================================================
--- z3/deliverance/trunk/deliverance/test-data/test_debug.xml	(original)
+++ z3/deliverance/trunk/deliverance/test-data/test_debug.xml	Thu Dec  7 16:53:09 2006
@@ -154,9 +154,12 @@
   <output>
     <html>
       <body>before span
-         <!--Deliverance: applying rule <copy theme="//body/span" content="//body/div"/>
-         --><span><div>Real Content</div></span><!--Deliverance: done applying rule <copy theme="//body/span" content="//body/div"/>
-         -->after span
+        
+         <span> 
+	   <!--Deliverance: applying rule <copy theme="//body/span" content="//body/div"/> -->
+           <div>Real Content</div>
+           <!-- Deliverance: done applying rule <copy theme="//body/span" content="//body/div"/> --></span>
+         after span
 	   </body>
       </html>
   </output> 

Modified: z3/deliverance/trunk/deliverance/test-data/test_drop.xml
==============================================================================
--- z3/deliverance/trunk/deliverance/test-data/test_drop.xml	(original)
+++ z3/deliverance/trunk/deliverance/test-data/test_drop.xml	Thu Dec  7 16:53:09 2006
@@ -173,7 +173,7 @@
      should squash error messages -->
 <deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance">
-    <drop theme="//div[@id='foo']" nocontent='ignore'/>
+    <drop theme="//div[@id='foo']" notheme='ignore'/>
   </rules>
 
   <theme base="http://example.com"> 

Modified: z3/deliverance/trunk/deliverance/test-data/test_move.xml
==============================================================================
--- z3/deliverance/trunk/deliverance/test-data/test_move.xml	(original)
+++ z3/deliverance/trunk/deliverance/test-data/test_move.xml	Thu Dec  7 16:53:09 2006
@@ -43,8 +43,8 @@
      <title>Blah</title>
     </head>
     <body>
-     <div id="nav">nav content</div>
-     <div id="body">Real Content</div>
+     <div id="nav"><div id="extra_nav">nav content</div></div>
+     <div id="content"><div id="body">Real Content</div></div>
     </body>
    </html>
   </output> 
@@ -72,9 +72,9 @@
   <content>
    <html>
     <body>
-     <div id="body">Real Content 
-      <div id="extra_nav">nav content</div>
-     </div>
+       <div id="body">Real Content 
+         <div id="extra_nav">nav content</div>
+       </div>
     </body>
    </html>
   </content>
@@ -85,9 +85,11 @@
      <title>Blah</title>
     </head>
     <body>
+     <div id="content">
      <div id="body">Real Content
       <div id="extra_nav">nav content</div>
      </div>
+     </div>
     </body>
    </html>
   </output> 
@@ -131,7 +133,7 @@
      <div id="nav">some nav
        <div id="extra_nav">nav content</div>
      </div>
-     <div id="body">Real Content</div>
+     <div id="content"><div id="body">Real Content</div></div>
     </body>
    </html>
   </output> 

Modified: z3/deliverance/trunk/deliverance/utils.py
==============================================================================
--- z3/deliverance/trunk/deliverance/utils.py	(original)
+++ z3/deliverance/trunk/deliverance/utils.py	Thu Dec  7 16:53:09 2006
@@ -71,8 +71,12 @@
 
     RULE_CONTENT_KEY = "content"
     RULE_THEME_KEY   = "theme" 
+    RULE_MOVE_KEY = "move"
 
     NOCONTENT_KEY = "nocontent"
+    NOTHEME_KEY = "notheme"
+
+    IGNORE_KEYWORD = "ignore"
 
     def get_theme_el(self,rule,theme):
         """
@@ -80,10 +84,11 @@
         rule given in the theme document given. theme and rule 
         should be lxml etree structures. 
         """
-        theme_els = theme.xpath(rule.attrib[self.RULE_THEME_KEY])
+        theme_els = theme.xpath(rule.get(self.RULE_THEME_KEY))
         if len(theme_els)== 0:
-            e = self.format_error("no element found in theme", rule)
-            self.add_to_body_start(theme, e)
+            if rule.get(self.NOTHEME_KEY) != self.IGNORE_KEYWORD: 
+                e = self.format_error("no element found in theme", rule)
+                self.add_to_body_start(theme, e)        
             return None
         elif len(theme_els)> 1:
             e = self.format_error("multiple elements found in theme", rule, theme_els)
@@ -99,7 +104,7 @@
         returns None
         """
 
-        if rule.attrib.get('onerror', None) == 'ignore':
+        if rule.get('onerror',None) == self.IGNORE_KEYWORD:
             return None
 
         d = etree.Element('div')
@@ -210,7 +215,25 @@
             else:
                 regular_rules.append(rule)
         return drop_rules, regular_rules
-        
+
+    
+    def separate_move_rules(self, rules):
+        """
+        separates out drop rules from a list of rules, returns two 
+        lists. 
+
+        first the list of all drop rules, second all other rules 
+        order is preserved. 
+        """
+        regular_rules = []
+        move_rules = []
+        for rule in rules:
+            if rule.get(self.RULE_MOVE_KEY): 
+                move_rules.append(rule)
+            else:
+                regular_rules.append(rule)
+        return move_rules, regular_rules
+
 
 
     CSS_URL_PAT = re.compile(r'url\([\"\']*(.*?)[\"\']*\)',re.I)
@@ -231,9 +254,23 @@
             if el.text:
                 el.text = re.sub(self.CSS_IMPORT_PAT,imp_absuri,el.text)
                 el.text = re.sub(self.CSS_URL_PAT,absuri,el.text)
-        
 
 
+    def append_text(self,parent,text):
+        if text is None:
+            return
+        if len(parent) == 0:
+            target = parent
+        else:
+            target = parent[-1]
+
+        if target.text:
+            target.text = target.text + text
+        else:
+            target.text = text
+
+                
+
     def attach_text_to_previous(self,el,text):
         """
         attaches the text given to the nearest previous node to el, 
@@ -255,4 +292,96 @@
             else:
                 el.getparent().text = text
 
+    def elements_in(self, els):
+        """
+        return a list containing elements from els which are not strings 
+        """
+        return [x for x in els if type(x) is not type(str())]
+            
+
+
+    def strip_tails(self, els):
+        """
+        for each lxml etree element in the list els, 
+        set the tail of the element to None
+        """
+        for el in els:
+            el.tail = None
+
+
+    def attach_tails(self,els):
+        """
+        whereever an lxml element in the list is followed by 
+        a string, set the tail of the lxml element to that string 
+        """
+        for index,el in enumerate(els): 
+            # if we run into a string after the current element, 
+            # attach it to the current element as the tail 
+            if (type(el) is not type(str()) and 
+                index + 1 < len(els) and 
+                type(els[index+1]) is type(str())):
+                el.tail = els[index+1]   
+
+
+    def append_many(self, parent, children):
+    
+        if children is None or len(children) == 0:
+            return
+        
+        if type(children[0]) is type(str()):
+            self.append_text(parent,children[0])            
+            children = children[1:]
+
+        non_text_els = self.elements_in(children)
+        self.strip_tails(non_text_els)
+        self.attach_tails(children)
+        
+        for el in non_text_els:
+            parent.append(el)
+            
+
+    def replace_many(self, theme_el, content_els):
+        non_text_els = self.elements_in(content_els)
+        self.strip_tails(non_text_els)
+
+        # the xpath may return a mixture of strings and elements, handle strings 
+                # by attaching them to the proper element 
+        if (type(content_els[0]) is type(str())):
+            # text must be appended to the tail of the most recent sibling or appended 
+            # to the text of the parent of the replaced element
+            self.attach_text_to_previous(theme_el, content_els[0])
+
+        if len(non_text_els) == 0:
+            self.attach_text_to_previous(theme_el, theme_el.tail)
+            theme_el.getparent().remove(theme_el)
+            return
+        
+        self.attach_tails(content_els)
+
+        # this tail, if there is one, should stick around 
+        preserve_tail = non_text_els[0].tail 
+
+        #replaces first element
+        self.replace_element(theme_el, non_text_els[0])
+        temptail = non_text_els[0].tail 
+        non_text_els[0].tail = None
+        parent = non_text_els[0].getparent()
+
+        # appends the rest of the elements
+        i = parent.index(non_text_els[0])
+        parent[i+1:i+1] = non_text_els[1:]
+
+        if non_text_els[-1].tail:
+            non_text_els[-1].tail += temptail
+        else:
+            non_text_els[-1].tail = temptail
+        
+        # tack in any preserved tail we stored above
+        if preserve_tail:
+            if non_text_els[0].tail:
+                non_text_els[0].tail = preserve_tail + non_text_els[0].tail
+            else:
+                non_text_els[0].tail = preserve_tail
+
+
    

Modified: z3/deliverance/trunk/deliverance/xslt.py
==============================================================================
--- z3/deliverance/trunk/deliverance/xslt.py	(original)
+++ z3/deliverance/trunk/deliverance/xslt.py	Thu Dec  7 16:53:09 2006
@@ -28,6 +28,35 @@
 </xsl:transform>
 """
 
+xslt_bucket_mover_skel = """
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!-- drops elements from the content specified in move rules, but leaves behind 
+       traces for error checking --> 
+
+  <xsl:template match="node()|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
+  </xsl:template> 
+
+</xsl:transform>
+"""
+
+xslt_bucket_grabber_skel = """
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:template match="/">
+  <buckets> 
+    <!-- bucket grabbers go here --> 
+  </buckets> 
+</xsl:template>
+
+</xsl:transform>
+"""
+
+
+
 nsmap = {
     "dv": "http://www.plone.org/deliverance",
     "html": "http://www.w3.org/1999/xhtml",
@@ -77,14 +106,19 @@
             self.debug = False
 
         self.transform_drop = None
+        self.transform_move = None
+        self.transform_move_grabber = None
+        self.transform_get_buckets = None
+        self.next_bucket = 0
+        
         self.apply_rules(self.rules,theme_copy)
     
-        xslt_wrapper = etree.XML(xslt_wrapper_skel)
-        insertion_point = xslt_wrapper.xpath("//xsl:transform/xsl:template[@match='/']",
+        self.xslt_wrapper = etree.XML(xslt_wrapper_skel)
+        insertion_point = self.xslt_wrapper.xpath("//xsl:transform/xsl:template[@match='/']",
                                              nsmap)[0]
         insertion_point.append(theme_copy)
 
-        self.transform = etree.XSLT(xslt_wrapper)
+        self.transform = etree.XSLT(self.xslt_wrapper)
     
         
 
@@ -95,11 +129,28 @@
                 transformation represented by this class performed on the 
                 given content. 
         """
+
+        #print "TRANSFORM: %s" % etree.tostring(self.xslt_wrapper)
         if content:
             if self.transform_drop:
                 content = self.transform_drop(content)
 
-            return self.transform(content).getroot()
+            # stash "moved" elements in the content in a separate document,
+            # but leave behind some traces to allow checking for existence 
+            if self.transform_move:
+                buckets = self.transform_get_buckets(content).getroot()
+                #print "!BUCKETS! %s" % etree.tostring(buckets)
+                content = self.transform_move(content)
+                #print "\n\nCONTENT POST BUCKET: %s\n\n" % etree.tostring(content)
+
+            output = self.transform(content).getroot()
+
+            # bind the buckets that are now littering the theme
+            # to the junk stashed above 
+            if self.transform_move:
+                output = self.fill_buckets(output,buckets)
+
+            return output
 
         else:
             return self.transform(etree.Element("dummy")).getroot()
@@ -112,13 +163,23 @@
         the rules given in the context of the theme given. 
         """
         drop_rules, other_rules = self.separate_drop_rules(rules)
-
+        move_rules, other_rules = self.separate_move_rules(other_rules)
+        
         if len(drop_rules):
             self.xslt_dropper = etree.XML(xslt_dropper_skel)
             for rule in drop_rules:
                 self.apply_drop(rule, theme)
             self.transform_drop = etree.XSLT(self.xslt_dropper)
 
+        if len(move_rules):
+            self.xslt_mover = etree.XML(xslt_bucket_mover_skel)
+            self.xslt_bucket_grabber = etree.XML(xslt_bucket_grabber_skel)
+            for rule in move_rules:
+                self.apply_rule(rule,theme)
+                
+            self.transform_move = etree.XSLT(self.xslt_mover)
+            self.transform_get_buckets = etree.XSLT(self.xslt_bucket_grabber)
+
         for rule in other_rules:
             self.apply_rule(rule, theme)
 
@@ -128,6 +189,9 @@
         dispatch to proper rule handling function for 
         the rule given. 
         """
+        #print "APPLY: %s " % etree.tostring(rule) 
+        self.check_move(rule,theme)
+        
         if rule.tag == self.APPEND_RULE_TAG:
             self.apply_append(rule,theme)
         elif rule.tag == self.PREPEND_RULE_TAG:
@@ -149,6 +213,8 @@
                 "Rule %s (%s) not understood" % (
                     rule.tag, etree.tostring(rule)))
 
+
+
     def apply_append(self, rule, theme):
         """
         prepare transform elements for "append" rule 
@@ -161,10 +227,8 @@
         # no content is matched 
         self.add_conditional_missing_content_error(theme, rule)
 
-
-        copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
-        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
-
+        copier = self.make_copy_node(rule)
+        
         self.debug_append(theme_el, copier, rule)
 
 
@@ -180,10 +244,8 @@
         # no content is matched 
         self.add_conditional_missing_content_error(theme, rule)
 
-        copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
-
-        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])        
-
+        copier = self.make_copy_node(rule)
+        
         self.debug_prepend(theme_el, copier, rule)
 
 
@@ -202,23 +264,14 @@
 
         self.add_conditional_missing_content_error(theme, rule)      
 
-        copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
-        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
-
+        copier = self.make_copy_node(rule, nocontent_fallback=[copy.deepcopy(theme_el)])
 
-        # if content is matched, replace the theme element, otherwise, keep the
-        # theme element 
-        choose = self.make_when_otherwise("count(%s)=0" % 
-                                          rule.attrib[self.RULE_CONTENT_KEY], 
-                                          copy.deepcopy(theme_el), 
-                                          copier)
-
-        self.debug_replace(theme_el,choose,rule)
+        self.debug_replace(theme_el,copier,rule)
 
 
     def apply_copy(self, rule, theme):
         """
-        prepare transform elements for "prepend" rule 
+        prepare transform elements for "copy" rule 
         """
 
         theme_el = self.get_theme_el(rule, theme)
@@ -229,28 +282,12 @@
         # no content is matched 
         self.add_conditional_missing_content_error(theme,rule)
 
-        # create an element that is like the target theme element 
-        # with its children replaced by an xsl copy element 
-        copy_theme_el = copy.deepcopy(theme_el)
-        del(copy_theme_el[:])
-        copy_theme_el.text = None
-        copier = etree.SubElement(theme_el,
-                                    "{%s}copy-of" % nsmap["xsl"])
-        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])  
-        copy_theme_el.append(copier)
-
-        # create a copy of the current theme element 
-        normal_theme_el = copy.deepcopy(theme_el)
-
-        # create an xsl choose element that picks between them based 
-        # on whether content was matched 
-        choose = self.make_when_otherwise("count(%s)=0" % 
-                                          rule.attrib[self.RULE_CONTENT_KEY], 
-                                          normal_theme_el, 
-                                          copy_theme_el)
-        self.debug_replace(theme_el, choose,rule)
-        copy_theme_el.tail = None
-        normal_theme_el.tail = None
+        theme_copy = copy.deepcopy(theme_el)
+        fallback = theme_copy.xpath("text()|child::node()")
+        theme_el.text = None
+        del(theme_el[:])        
+        copier = self.make_copy_node(rule,nocontent_fallback=fallback)
+        self.debug_append(theme_el,copier,rule)
         
 
    
@@ -274,13 +311,12 @@
             if el.tag == remove_tag:
                 conditional = etree.Element("{%s}if" % nsmap["xsl"])
                 conditional.set("test","count(%s) = 0" % 
-                                rule.attrib[self.RULE_CONTENT_KEY])
+                                self.get_content_test_xpath(rule))
                 conditional.append(copy.deepcopy(el))
                 self.replace_element(el,conditional)
  
-        copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
-        copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
-   
+        copier = self.make_copy_node(rule)
+           
         self.debug_append(theme_el, copier, rule)
 
 
@@ -290,7 +326,7 @@
         """
         if self.RULE_THEME_KEY in rule.attrib:
             if len(theme.xpath(rule.attrib[self.RULE_THEME_KEY])) == 0:
-                if rule.get(self.NOCONTENT_KEY) == 'ignore':
+                if rule.get(self.NOTHEME_KEY) == self.IGNORE_KEYWORD:
                     return 
                 else:
                     e = self.format_error("no theme matched", rule)
@@ -334,29 +370,34 @@
         during the transformation; no message is produced
         if nocontent='ignore' attribute is set
         """
-        if rule.get(self.NOCONTENT_KEY) == 'ignore':
+        if rule.get(self.NOCONTENT_KEY) == self.IGNORE_KEYWORD:
             return
 
         err = self.format_error("no content matched", rule)
         if err:
+            # if the content was possibly moved, check for a marker instead of the content 
+            check_xpath = self.get_content_test_xpath(rule)
+                
             conditional = etree.Element("{%s}if" % nsmap["xsl"])
-            conditional.set("test", "count(%s)=0" % rule.attrib[self.RULE_CONTENT_KEY])
+            conditional.set("test", "count(%s)=0" % check_xpath)
             conditional.append(err)
             self.add_to_body_start(theme, conditional)
         
 
-    def make_when_otherwise(self, test, whenbody, otherwisebody):
+    def make_when_otherwise(self, test, when_els, otherwise_els):
         """
         makes a conditional xlst node. when placed into a document, 
         if the xslt expression represented by the string test evaluates 
-        to true, whenbody is produced, if false, otherwise body is produced 
+        to true, when_els are produced, if false, otherwise_els are produced
         """
+
         choose = etree.Element("{%s}choose" % nsmap["xsl"])
         when = etree.Element("{%s}when" % nsmap["xsl"])
         when.set("test", test)
-        when.append(copy.deepcopy(whenbody))
         otherwise = etree.Element("{%s}otherwise" % nsmap["xsl"])
-        otherwise.append(otherwisebody)
+
+        self.append_many(when,when_els)
+        self.append_many(otherwise,otherwise_els)
         choose.append(when)
         choose.append(otherwise)
         return choose
@@ -440,3 +481,85 @@
         comment_after = etree.Element("{%s}comment" % nsmap["xsl"])
         comment_after.text = "Deliverance: done applying rule %s" % etree.tostring(rule)
         return comment_before, comment_after
+
+
+    def make_copy_node(self,rule, nocontent_fallback=None):
+
+        if rule.get(self.RULE_MOVE_KEY,None) is None: 
+            copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
+            copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
+        else:
+            copier = etree.Element("bucket")
+            bucket_id = "bucket_%d" % self.next_bucket
+            copier.set("id",bucket_id)
+            self.xslt_bucket_grabber[0][0].append(self.make_bucket_grabber(rule,bucket_id))
+            self.next_bucket += 1
+
+
+            
+        if nocontent_fallback is None:
+            return copier
+        else:
+            return self.make_when_otherwise("count(%s)=0" % 
+                                            self.get_content_test_xpath(rule), 
+                                            nocontent_fallback, 
+                                            [copier])            
+
+                       
+    def check_move(self,rule,theme):
+        if rule.get(self.RULE_MOVE_KEY,None) is None:
+            return
+        if rule.tag == self.DROP_RULE_TAG or rule.tag == self.SUBRULES_TAG:
+            e = self.format_error("rule does not support the move attribute", rule)
+            self.add_to_body_start(theme, e)
+            return
+
+        theme_els = theme.xpath(rule.get(self.RULE_THEME_KEY))
+        if theme_els is None or len(theme_els) == 0:
+            if rule.get(self.NOTHEME_KEY,None) == self.IGNORE_KEYWORD:
+                del(rule.attrib[self.RULE_MOVE_KEY]) # just process it normally
+            return
+        
+        # make a node that will drop the content, but leave behind a "bucket pointer" 
+        fwd_template = etree.Element("{%s}template" % nsmap["xsl"])
+        fwd_template.set("match", rule.get(self.RULE_CONTENT_KEY))
+        pointer = etree.SubElement(fwd_template,"bucket_pointer")
+        pointer.set('pointer',self.make_pointer(rule.get(self.RULE_CONTENT_KEY)))
+        self.xslt_mover[0:0] = [fwd_template]
+
+    def get_content_test_xpath(self, rule): 
+        if rule.get(self.RULE_MOVE_KEY):
+            return self.get_pointer_xpath(rule)
+        else:
+            return rule.get(self.RULE_CONTENT_KEY)
+        
+    def get_pointer_xpath(self, rule):
+        return "//bucket_pointer[@pointer='%s']" % self.make_pointer(rule.attrib[self.RULE_CONTENT_KEY])
+                
+    def make_bucket_grabber(self,rule,id):
+        bucket = etree.Element("bucket")
+        bucket.set("id",id)
+        copier = etree.SubElement(bucket,"{%s}copy-of" % nsmap["xsl"])
+        copier.set("select",rule.get(self.RULE_CONTENT_KEY))
+        return bucket
+
+    def make_pointer(self,xpath):
+        # XXX not robust 
+        return '%d' % hash(xpath)
+        
+    def fill_buckets(self,theme,buckets):
+        # XXX this method is temporary to get the ball rolling
+
+        for bucket in buckets:        
+            bucket_id = bucket.get('id')
+            #print "FILL BUCKET(%s)! %s" % (bucket_id,etree.tostring(bucket))        
+            theme_el = theme.xpath("//bucket[@id='%s']" % bucket_id)[0]
+            self.replace_many(theme_el,bucket.xpath("child::node()"))
+
+        # discard nasty bucket pointers 
+        bucket_pointers = theme.xpath("//bucket_pointer")
+        for ptr in bucket_pointers:
+            self.attach_text_to_previous(ptr,ptr.tail)
+            ptr.getparent().remove(ptr)
+
+        return theme

From ltucker at codespeak.net  Thu Dec  7 17:38:53 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu,  7 Dec 2006 17:38:53 +0100 (CET)
Subject: [z3-checkins] r35445 - in z3/deliverance/trunk/deliverance: .
	test-data
Message-ID: <20061207163853.A655C1008F@code0.codespeak.net>

Author: ltucker
Date: Thu Dec  7 17:38:50 2006
New Revision: 35445

Modified:
   z3/deliverance/trunk/deliverance/interpreter.py
   z3/deliverance/trunk/deliverance/test-data/test_move.xml
   z3/deliverance/trunk/deliverance/xslt.py
Log:
move error harmonization, more tests for move attribute

Modified: z3/deliverance/trunk/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/trunk/deliverance/interpreter.py	(original)
+++ z3/deliverance/trunk/deliverance/interpreter.py	Thu Dec  7 17:38:50 2006
@@ -114,16 +114,16 @@
                     rule.tag, etree.tostring(rule)))
 
         # process possible "move" attribute 
-        self.check_content_removal(rule, theme, content)
+        self.check_move(rule, theme, content)
 
 
-    def check_content_removal(self, rule, theme, content):
-        if rule.attrib.get(self.RULE_MOVE_KEY, None) is None:
+    def check_move(self, rule, theme, content):
+        if rule.get(self.RULE_MOVE_KEY, None) is None:
             return
 
         if rule.tag == self.SUBRULES_TAG or rule.tag == self.DROP_RULE_TAG: 
-            self.add_to_body_start(
-                theme, self.format_error("invalid move attribute", rule))
+            e = self.format_error("rule does not support the move attribute", rule)
+            self.add_to_body_start(theme, e)
             return
 
         # drop content elements if move was specified except when 

Modified: z3/deliverance/trunk/deliverance/test-data/test_move.xml
==============================================================================
--- z3/deliverance/trunk/deliverance/test-data/test_move.xml	(original)
+++ z3/deliverance/trunk/deliverance/test-data/test_move.xml	Thu Dec  7 17:38:50 2006
@@ -139,7 +139,97 @@
   </output> 
 </deliverance-test>
 
+<!-- tests move with prepend -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <copy theme="//div[@id='content']" content="//*[@id='body']" />
+    <prepend theme="//div[@id='nav']" content="//*[@id='extra_nav']" move="1" />
+  </rules>
 
+  <theme base="http://example.com"> 
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">some nav</div>
+     <div id="content">Dummy Content</div>
+    </body>
+   </html>
+  </theme>
+
+  <content>
+   <html>
+    <body>
+     <div id="body">Real Content 
+      <div id="extra_nav">nav content</div>
+     </div>
+    </body>
+   </html>
+  </content>
+ 
+  <output>
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">
+       <div id="extra_nav">nav content</div>
+       some nav
+     </div>
+     <div id="content"><div id="body">Real Content</div></div>
+    </body>
+   </html>
+  </output> 
+</deliverance-test>
+
+<!-- tests error message is generated by using move in an invalid spot -->
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop theme="//div[@id='content']" move="1"/>
+  </rules>
+
+  <theme base="http://example.com"> 
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">
+       good nav
+       <div id="oldnav">some nav</div>
+     </div>
+     <div id="content">Dummy Content</div>
+    </body>
+   </html>
+  </theme>
+
+  <content>
+   <html>
+    <body>
+     <div id="body">Real Content 
+       <div id="extra_nav">nav content</div>
+     </div>
+    </body>
+   </html>
+  </content>
+ 
+  <output>
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+      <div class="deliverance-error">Deliverance error: rule does not support the move attribute<br/>rule: &lt;drop theme="//div[@id='content']" move="1"/&gt;</div>
+     <div id="nav">
+       good nav
+       <div id="oldnav">some nav</div>
+     </div>
+    </body>
+   </html>
+  </output> 
+</deliverance-test>
 
 
 </deliverance-test-suite>

Modified: z3/deliverance/trunk/deliverance/xslt.py
==============================================================================
--- z3/deliverance/trunk/deliverance/xslt.py	(original)
+++ z3/deliverance/trunk/deliverance/xslt.py	Thu Dec  7 17:38:50 2006
@@ -168,7 +168,7 @@
         if len(drop_rules):
             self.xslt_dropper = etree.XML(xslt_dropper_skel)
             for rule in drop_rules:
-                self.apply_drop(rule, theme)
+                self.apply_rule(rule, theme)
             self.transform_drop = etree.XSLT(self.xslt_dropper)
 
         if len(move_rules):
@@ -507,9 +507,10 @@
 
                        
     def check_move(self,rule,theme):
-        if rule.get(self.RULE_MOVE_KEY,None) is None:
+        if rule.get(self.RULE_MOVE_KEY, None) is None:
             return
-        if rule.tag == self.DROP_RULE_TAG or rule.tag == self.SUBRULES_TAG:
+
+        if rule.tag == self.SUBRULES_TAG or rule.tag == self.DROP_RULE_TAG: 
             e = self.format_error("rule does not support the move attribute", rule)
             self.add_to_body_start(theme, e)
             return

From ianb at codespeak.net  Thu Dec  7 18:53:13 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu,  7 Dec 2006 18:53:13 +0100 (CET)
Subject: [z3-checkins] r35450 - z3/deliverance/DeliveranceDemo/trunk/docs
Message-ID: <20061207175313.8FAC310080@code0.codespeak.net>

Author: ianb
Date: Thu Dec  7 18:53:11 2006
New Revision: 35450

Added:
   z3/deliverance/DeliveranceDemo/trunk/docs/
   z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html   (contents, props changed)
Log:
added docs+links

Added: z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html
==============================================================================
--- (empty file)
+++ z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html	Thu Dec  7 18:53:11 2006
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>Find link page</title>
+</head>
+
+<body>
+
+<a href="../#egg=DeliveranceDemo-dev">Link to Deliverance svn checkout</a>
+
+</body> </html>

From ianb at codespeak.net  Thu Dec  7 19:29:06 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu,  7 Dec 2006 19:29:06 +0100 (CET)
Subject: [z3-checkins] r35452 - z3/deliverance/DeliveranceDemo/trunk/docs
Message-ID: <20061207182906.83E6A10090@code0.codespeak.net>

Author: ianb
Date: Thu Dec  7 19:29:04 2006
New Revision: 35452

Modified:
   z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html
Log:
another link

Modified: z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html	Thu Dec  7 19:29:04 2006
@@ -7,5 +7,7 @@
 <body>
 
 <a href="../#egg=DeliveranceDemo-dev">Link to Deliverance svn checkout</a>
+<a href="http://pylonshq.com/svn/Pylons/trunk#egg=Pylons-dev">Pylons
+link :(</a>
 
 </body> </html>

From ianb at codespeak.net  Thu Dec  7 22:08:44 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu,  7 Dec 2006 22:08:44 +0100 (CET)
Subject: [z3-checkins] r35459 - z3/deliverance/DeliveranceDemo/trunk/ddemo
Message-ID: <20061207210844.7A3C710086@code0.codespeak.net>

Author: ianb
Date: Thu Dec  7 22:08:42 2006
New Revision: 35459

Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py
Log:
Only Pylons trunk has those variables, and we don't care anyway

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/helpers.py	Thu Dec  7 22:08:42 2006
@@ -5,4 +5,5 @@
 """
 from webhelpers import *
 from webhelpers.util import *
-from pylons.helpers import _, log, set_lang, get_lang
+from pylons.helpers import *
+

From ianb at codespeak.net  Thu Dec  7 22:08:57 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu,  7 Dec 2006 22:08:57 +0100 (CET)
Subject: [z3-checkins] r35460 - z3/deliverance/DeliveranceDemo/trunk/ddemo
Message-ID: <20061207210857.A72791008D@code0.codespeak.net>

Author: ianb
Date: Thu Dec  7 22:08:55 2006
New Revision: 35460

Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
Log:
Allow localhost

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dataprovider.py	Thu Dec  7 22:08:55 2006
@@ -1,7 +1,7 @@
 import re
 import os
 
-domain_re = re.compile(r'^[a-z][a-z0-9.\-]+\.[a-z]+$', re.I)
+domain_re = re.compile(r'^localhost|[a-z][a-z0-9.\-]+\.[a-z]+$', re.I)
 
 default_rule_xml = '''\
 <?xml version="1.0" encoding="UTF-8"?>

From ianb at codespeak.net  Thu Dec  7 22:09:15 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu,  7 Dec 2006 22:09:15 +0100 (CET)
Subject: [z3-checkins] r35461 - z3/deliverance/DeliveranceDemo/trunk
Message-ID: <20061207210915.075D410088@code0.codespeak.net>

Author: ianb
Date: Thu Dec  7 22:09:13 2006
New Revision: 35461

Modified:
   z3/deliverance/DeliveranceDemo/trunk/setup.py
Log:
Added Paste trunk requirement

Modified: z3/deliverance/DeliveranceDemo/trunk/setup.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/setup.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/setup.py	Thu Dec  7 22:09:13 2006
@@ -8,6 +8,7 @@
     #author_email="",
     #url="",
     install_requires=[
+      'Paste==dev,>1.0', # There's a bug fix we need
       "Pylons>=0.9.3",
       'Deliverance',
       'WSGIFilter',

From ianb at codespeak.net  Thu Dec  7 22:09:35 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu,  7 Dec 2006 22:09:35 +0100 (CET)
Subject: [z3-checkins] r35462 - z3/deliverance/DeliveranceDemo/trunk/ddemo
Message-ID: <20061207210935.BC1BC10088@code0.codespeak.net>

Author: ianb
Date: Thu Dec  7 22:09:33 2006
New Revision: 35462

Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/debuginterp.py
Log:
Deal with (not understood) case where format_error returns None

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/debuginterp.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/debuginterp.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/debuginterp.py	Thu Dec  7 22:09:33 2006
@@ -9,6 +9,9 @@
 
     def format_error(self, message, rule, elts=None):
         error = super(PyRenderer, self).format_error(message, rule, elts)
+        if error is None:
+            error = etree.Element('div')
+            error.text = 'Error with no message (%s)' % message
         error_container = etree.Element('div')
         error_container.attrib['style'] = self.error_style
         if not current_environ.get('ddemo.has_errors'):
@@ -27,5 +30,6 @@
             error_container.append(container)
         error_container.append(error)
         return error_container
+
             
         

From ianb at codespeak.net  Fri Dec  8 17:31:53 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Fri,  8 Dec 2006 17:31:53 +0100 (CET)
Subject: [z3-checkins] r35492 - z3/deliverance/trunk/deliverance
Message-ID: <20061208163153.C6D8F10077@code0.codespeak.net>

Author: ianb
Date: Fri Dec  8 17:31:51 2006
New Revision: 35492

Modified:
   z3/deliverance/trunk/deliverance/utils.py
Log:
Add warnings about lxml threading issues in Python 2.4.1 and earlier

Modified: z3/deliverance/trunk/deliverance/utils.py
==============================================================================
--- z3/deliverance/trunk/deliverance/utils.py	(original)
+++ z3/deliverance/trunk/deliverance/utils.py	Fri Dec  8 17:31:51 2006
@@ -3,6 +3,7 @@
 import urlparse
 import copy
 from deliverance import htmlserialize
+import sys
 
 # Test if the libxml2 fix is in place
 html = etree.HTML('<html><head><script>some text</script></head></html>')
@@ -18,6 +19,12 @@
     warnings.warn(
         'Deliverance requires a newer version of lxml (1.2 or later)')
 
+if sys.version_info <= (2, 4, 1):
+    # There are reported threading issues for this version
+    import warnings
+    warnings.warn(
+        'lxml has threading problems for Python 2.4.1 and earlier')
+
 class DeliveranceError(Exception):
     """
     General Deliverance Error.

From ltucker at codespeak.net  Sat Dec  9 04:57:46 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Sat,  9 Dec 2006 04:57:46 +0100 (CET)
Subject: [z3-checkins] r35531 - z3/deliverance/trunk/deliverance
Message-ID: <20061209035746.D5B3B1006E@code0.codespeak.net>

Author: ltucker
Date: Sat Dec  9 04:57:43 2006
New Revision: 35531

Modified:
   z3/deliverance/trunk/deliverance/xslt.py
Log:
vast simplications to drop and move thanks to paul everitts advice

Modified: z3/deliverance/trunk/deliverance/xslt.py
==============================================================================
--- z3/deliverance/trunk/deliverance/xslt.py	(original)
+++ z3/deliverance/trunk/deliverance/xslt.py	Sat Dec  9 04:57:43 2006
@@ -9,52 +9,29 @@
 
 xslt_wrapper_skel = """
 <xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:template match="/">
-    <!-- theme goes here --> 
-  </xsl:template>
-</xsl:transform>"""
 
-xslt_dropper_skel = """
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!-- empty templates for moved or dropped nodes are inserted here --> 
 
-  <!-- match nodes that do dropping are inserted here --> 
+  <!-- this is the top level rule --> 
+  <xsl:template match="/" priority="2">
+    <!-- theme goes here --> 
+  </xsl:template>
 
+  <!-- this copies whatever the current node is when apply-templates is called in normal mode --> 
   <xsl:template match="node()|@*">
     <xsl:copy>
-      <xsl:apply-templates select="node()|@*"/>
+      <xsl:apply-templates select="node()|@*" />
     </xsl:copy>
-  </xsl:template> 
-
-</xsl:transform>
-"""
-
-xslt_bucket_mover_skel = """
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <!-- drops elements from the content specified in move rules, but leaves behind 
-       traces for error checking --> 
+  </xsl:template>
 
-  <xsl:template match="node()|@*">
+  <!-- this copies whatever the current node is when apply-templates is called in move mode -->
+  <xsl:template match="node()|@*" mode="move" >
     <xsl:copy>
-      <xsl:apply-templates select="node()|@*"/>
+      <xsl:apply-templates select="node()|@*" />
     </xsl:copy>
-  </xsl:template> 
-
-</xsl:transform>
-"""
-
-xslt_bucket_grabber_skel = """
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:template match="/">
-  <buckets> 
-    <!-- bucket grabbers go here --> 
-  </buckets> 
-</xsl:template>
-
-</xsl:transform>
-"""
-
+  </xsl:template>
+  
+</xsl:transform>"""
 
 
 nsmap = {
@@ -105,15 +82,12 @@
         else:
             self.debug = False
 
-        self.transform_drop = None
-        self.transform_move = None
-        self.transform_move_grabber = None
-        self.transform_get_buckets = None
-        self.next_bucket = 0
+        self.transform = None
         
+        self.xslt_wrapper = etree.XML(xslt_wrapper_skel)
         self.apply_rules(self.rules,theme_copy)
     
-        self.xslt_wrapper = etree.XML(xslt_wrapper_skel)
+
         insertion_point = self.xslt_wrapper.xpath("//xsl:transform/xsl:template[@match='/']",
                                              nsmap)[0]
         insertion_point.append(theme_copy)
@@ -132,26 +106,7 @@
 
         #print "TRANSFORM: %s" % etree.tostring(self.xslt_wrapper)
         if content:
-            if self.transform_drop:
-                content = self.transform_drop(content)
-
-            # stash "moved" elements in the content in a separate document,
-            # but leave behind some traces to allow checking for existence 
-            if self.transform_move:
-                buckets = self.transform_get_buckets(content).getroot()
-                #print "!BUCKETS! %s" % etree.tostring(buckets)
-                content = self.transform_move(content)
-                #print "\n\nCONTENT POST BUCKET: %s\n\n" % etree.tostring(content)
-
-            output = self.transform(content).getroot()
-
-            # bind the buckets that are now littering the theme
-            # to the junk stashed above 
-            if self.transform_move:
-                output = self.fill_buckets(output,buckets)
-
-            return output
-
+            return self.transform(content).getroot()
         else:
             return self.transform(etree.Element("dummy")).getroot()
 
@@ -162,25 +117,7 @@
         The transforms represent the application of 
         the rules given in the context of the theme given. 
         """
-        drop_rules, other_rules = self.separate_drop_rules(rules)
-        move_rules, other_rules = self.separate_move_rules(other_rules)
-        
-        if len(drop_rules):
-            self.xslt_dropper = etree.XML(xslt_dropper_skel)
-            for rule in drop_rules:
-                self.apply_rule(rule, theme)
-            self.transform_drop = etree.XSLT(self.xslt_dropper)
-
-        if len(move_rules):
-            self.xslt_mover = etree.XML(xslt_bucket_mover_skel)
-            self.xslt_bucket_grabber = etree.XML(xslt_bucket_grabber_skel)
-            for rule in move_rules:
-                self.apply_rule(rule,theme)
-                
-            self.transform_move = etree.XSLT(self.xslt_mover)
-            self.transform_get_buckets = etree.XSLT(self.xslt_bucket_grabber)
-
-        for rule in other_rules:
+        for rule in rules:
             self.apply_rule(rule, theme)
 
 
@@ -339,10 +276,15 @@
                 el.getparent().remove(el)
 
         if self.RULE_CONTENT_KEY in rule.attrib:
-            drop_template = etree.Element("{%s}template" % nsmap["xsl"])
-            drop_template.set("match", rule.attrib[self.RULE_CONTENT_KEY])
-            self.xslt_dropper[0:0] = [drop_template]
+            empty_template = etree.Element("{%s}template" % nsmap["xsl"])
+            empty_template.set("priority","1")
+            empty_template.set("match",rule.get(self.RULE_CONTENT_KEY))
 
+            move_empty_template = copy.deepcopy(empty_template)
+            move_empty_template.set("mode","move")
+            
+            self.xslt_wrapper[0:0] = [empty_template,move_empty_template]
+            
             # add an element that produces an error if 
             # no content is matched 
             self.add_conditional_missing_content_error(theme,rule)
@@ -485,25 +427,25 @@
 
     def make_copy_node(self,rule, nocontent_fallback=None):
 
-        if rule.get(self.RULE_MOVE_KEY,None) is None: 
-            copier = etree.Element("{%s}copy-of" % nsmap["xsl"])
-            copier.set("select",rule.attrib[self.RULE_CONTENT_KEY])
-        else:
-            copier = etree.Element("bucket")
-            bucket_id = "bucket_%d" % self.next_bucket
-            copier.set("id",bucket_id)
-            self.xslt_bucket_grabber[0][0].append(self.make_bucket_grabber(rule,bucket_id))
-            self.next_bucket += 1
-
+        apply = etree.Element("{%s}apply-templates" % nsmap["xsl"])
+        apply.set("select",rule.get(self.RULE_CONTENT_KEY))
+                  
+        if rule.get(self.RULE_MOVE_KEY,None) is not None:
+            apply.set("mode","move")
+            # in the normal mode it is ignored 
+            empty_template = etree.Element("{%s}template" % nsmap["xsl"])
+            empty_template.set("priority","1")
+            empty_template.set("match",rule.get(self.RULE_CONTENT_KEY))
 
+            self.xslt_wrapper[0:0] = [empty_template]
             
         if nocontent_fallback is None:
-            return copier
+            return apply 
         else:
             return self.make_when_otherwise("count(%s)=0" % 
                                             self.get_content_test_xpath(rule), 
                                             nocontent_fallback, 
-                                            [copier])            
+                                            [apply])            
 
                        
     def check_move(self,rule,theme):
@@ -520,47 +462,7 @@
             if rule.get(self.NOTHEME_KEY,None) == self.IGNORE_KEYWORD:
                 del(rule.attrib[self.RULE_MOVE_KEY]) # just process it normally
             return
-        
-        # make a node that will drop the content, but leave behind a "bucket pointer" 
-        fwd_template = etree.Element("{%s}template" % nsmap["xsl"])
-        fwd_template.set("match", rule.get(self.RULE_CONTENT_KEY))
-        pointer = etree.SubElement(fwd_template,"bucket_pointer")
-        pointer.set('pointer',self.make_pointer(rule.get(self.RULE_CONTENT_KEY)))
-        self.xslt_mover[0:0] = [fwd_template]
 
     def get_content_test_xpath(self, rule): 
-        if rule.get(self.RULE_MOVE_KEY):
-            return self.get_pointer_xpath(rule)
-        else:
-            return rule.get(self.RULE_CONTENT_KEY)
+        return rule.get(self.RULE_CONTENT_KEY)
         
-    def get_pointer_xpath(self, rule):
-        return "//bucket_pointer[@pointer='%s']" % self.make_pointer(rule.attrib[self.RULE_CONTENT_KEY])
-                
-    def make_bucket_grabber(self,rule,id):
-        bucket = etree.Element("bucket")
-        bucket.set("id",id)
-        copier = etree.SubElement(bucket,"{%s}copy-of" % nsmap["xsl"])
-        copier.set("select",rule.get(self.RULE_CONTENT_KEY))
-        return bucket
-
-    def make_pointer(self,xpath):
-        # XXX not robust 
-        return '%d' % hash(xpath)
-        
-    def fill_buckets(self,theme,buckets):
-        # XXX this method is temporary to get the ball rolling
-
-        for bucket in buckets:        
-            bucket_id = bucket.get('id')
-            #print "FILL BUCKET(%s)! %s" % (bucket_id,etree.tostring(bucket))        
-            theme_el = theme.xpath("//bucket[@id='%s']" % bucket_id)[0]
-            self.replace_many(theme_el,bucket.xpath("child::node()"))
-
-        # discard nasty bucket pointers 
-        bucket_pointers = theme.xpath("//bucket_pointer")
-        for ptr in bucket_pointers:
-            self.attach_text_to_previous(ptr,ptr.tail)
-            ptr.getparent().remove(ptr)
-
-        return theme

From ltucker at codespeak.net  Sat Dec  9 05:04:18 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Sat,  9 Dec 2006 05:04:18 +0100 (CET)
Subject: [z3-checkins] r35532 - z3/deliverance/trunk/deliverance/test-data
Message-ID: <20061209040418.A151E1006F@code0.codespeak.net>

Author: ltucker
Date: Sat Dec  9 05:04:14 2006
New Revision: 35532

Modified:
   z3/deliverance/trunk/deliverance/test-data/test_move.xml
Log:
combination drop/move

Modified: z3/deliverance/trunk/deliverance/test-data/test_move.xml
==============================================================================
--- z3/deliverance/trunk/deliverance/test-data/test_move.xml	(original)
+++ z3/deliverance/trunk/deliverance/test-data/test_move.xml	Sat Dec  9 05:04:14 2006
@@ -184,6 +184,52 @@
   </output> 
 </deliverance-test>
 
+<!-- tests combination of move and drop --> 
+<deliverance-test>
+  <rules xmlns="http://www.plone.org/deliverance">
+    <drop content="//div[@id='dropme']" />
+    <copy theme="//div[@id='nav']" content="//*[@id='extra_nav']" move="1" />
+    <copy theme="//div[@id='content']" content="//*[@id='body']" />
+  </rules>
+
+  <theme base="http://example.com"> 
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">some nav</div>
+     <div id="content">Dummy Content</div>
+    </body>
+   </html>
+  </theme>
+
+  <content>
+   <html>
+    <body>
+     <div id="body">Real Content 
+      <div id="extra_nav">nav content<div id="dropme">badness</div></div>
+     </div>
+    </body>
+   </html>
+  </content>
+ 
+  <output>
+   <html>
+    <head>
+     <title>Blah</title>
+    </head>
+    <body>
+     <div id="nav">
+       <div id="extra_nav">nav content</div>
+     </div>
+     <div id="content"><div id="body">Real Content</div></div>
+    </body>
+   </html>
+  </output> 
+</deliverance-test>
+
+
 <!-- tests error message is generated by using move in an invalid spot -->
 <deliverance-test>
   <rules xmlns="http://www.plone.org/deliverance">

From ltucker at codespeak.net  Mon Dec 11 23:52:55 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 11 Dec 2006 23:52:55 +0100 (CET)
Subject: [z3-checkins] r35608 - z3/deliverance/trunk/deliverance
Message-ID: <20061211225255.69D0310077@code0.codespeak.net>

Author: ltucker
Date: Mon Dec 11 23:52:52 2006
New Revision: 35608

Modified:
   z3/deliverance/trunk/deliverance/interpreter.py
   z3/deliverance/trunk/deliverance/test_wsgi.py
   z3/deliverance/trunk/deliverance/utils.py
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
   z3/deliverance/trunk/deliverance/xslt.py
Log:
first pass at content aggregation with href on rules

Modified: z3/deliverance/trunk/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/trunk/deliverance/interpreter.py	(original)
+++ z3/deliverance/trunk/deliverance/interpreter.py	Mon Dec 11 23:52:52 2006
@@ -27,8 +27,8 @@
 
         reference_resolver: a function taking a url a parse type and 
          and an encoding type returning the data referred to by the url 
-         in the manner specified. if parse is set to 'xml', the result 
-         should be an lxml etree structure, otherwise if encoding 
+         in the manner specified. if parse is set to 'xml' or 'html', 
+         the result should be an lxml etree structure, otherwise if encoding 
          is specified, the data should be decoded using this encoding 
          before being returned. 
                 
@@ -36,9 +36,14 @@
         self.theme = self.fixup_links(theme, theme_uri)
         self.rules = rule
         self.rules_uri = rule_uri
+
+        self.resolve_uri = reference_resolver
+
         # perform xincludes on the rules
-        if reference_resolver:
-            xinclude.include(self.rules, self.rules_uri, loader=reference_resolver)
+        if self.resolve_uri:
+            xinclude.include(self.rules, self.rules_uri, loader=self.resolve_uri)
+
+
 
         debug = self.rules.get("debug", None)
         if debug and debug.lower() == "true":
@@ -55,7 +60,7 @@
                 given content. 
         """
         result = copy.deepcopy(self.theme)
-        input = copy.deepcopy(content)
+        input = self.aggregate(self.resolve_uri,self.rules,copy.deepcopy(content))
         self.apply_rules(self.rules, result, input)
         return result
 
@@ -131,7 +136,7 @@
         theme_els = theme.xpath(rule.attrib.get(self.RULE_THEME_KEY)) 
         if (theme_els is not None and len(theme_els) > 0) or \
                 rule.attrib.get(self.NOTHEME_KEY) != self.IGNORE_KEYWORD:
-            self.drop_els(content, content.xpath(rule.attrib.get(self.RULE_CONTENT_KEY)))
+            self.drop_els(content, content.xpath(self.get_content_xpath(rule)))
 
 
     def apply_append(self,rule,theme,content):
@@ -145,7 +150,7 @@
             return 
 
         content_els = copy.deepcopy(
-            content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+            content.xpath(self.get_content_xpath(rule)))
 
         if len(content_els) == 0:
             if rule.get(self.NOCONTENT_KEY) != 'ignore':
@@ -209,7 +214,7 @@
         if theme_el is None:
             return 
 
-        xpath = rule.attrib[self.RULE_CONTENT_KEY]
+        xpath = self.get_content_xpath(rule)
         content_els = copy.deepcopy(content.xpath(xpath))
 
         if len(content_els) == 0:
@@ -288,7 +293,7 @@
             return 
 
         content_els = copy.deepcopy(
-            content.xpath(rule.attrib[self.RULE_CONTENT_KEY]))
+            content.xpath(self.get_content_xpath(rule)))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -354,7 +359,7 @@
         if theme_el is None:
             return
 
-        content_els = self._xpath_copy(content, rule.attrib[self.RULE_CONTENT_KEY])
+        content_els = self._xpath_copy(content, self.get_content_xpath(rule))
 
         if len(content_els) == 0:
             if rule.attrib.get(self.NOCONTENT_KEY) != 'ignore':
@@ -393,7 +398,7 @@
         if theme_el is None:
             return 
 
-        content_xpath = rule.attrib[self.RULE_CONTENT_KEY]
+        content_xpath = self.get_content_xpath(rule)
         remove_tag = self.get_tag_from_xpath(content_xpath)
 
         if remove_tag is None:
@@ -443,7 +448,7 @@
         rule given by rule on the theme and content given. 
         see deliverance specification 
         """
-        content_drop_xp = rule.attrib.get(self.RULE_CONTENT_KEY,None)
+        content_drop_xp = self.get_content_xpath(rule)
         theme_drop_xp = rule.attrib.get(self.RULE_THEME_KEY,None)
         
         if (content_drop_xp is None and theme_drop_xp is None): 

Modified: z3/deliverance/trunk/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/trunk/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/trunk/deliverance/test_wsgi.py	Mon Dec 11 23:52:52 2006
@@ -14,6 +14,7 @@
 guidesearch_data = os.path.join(os.path.dirname(__file__), 'test-data', 'guidesearch')
 ajax_data = os.path.join(os.path.dirname(__file__), 'test-data', 'ajax')
 url_data = os.path.join(os.path.dirname(__file__), 'test-data', 'wsgiurl')
+aggregate_data = os.path.join(os.path.dirname(__file__), 'test-data', 'aggregate')
 
 static_app = StaticURLParser(static_data)
 tasktracker_app = StaticURLParser(tasktracker_data)
@@ -22,7 +23,7 @@
 guidesearch_app = StaticURLParser(guidesearch_data)
 ajax_app = StaticURLParser(ajax_data)
 url_app = StaticURLParser(url_data)
-
+aggregate_app = StaticURLParser(aggregate_data)
 
 def html_string_compare(astr, bstr):
     """
@@ -127,9 +128,16 @@
     res2 = app.get('/foo/bar/test_url_expected.html?notheme')
     html_string_compare(res.body,res2.body)
 
+def do_aggregate(renderer_type, name):
+    wsgi_app = DeliveranceMiddleware(aggregate_app, 'theme.html', 'rules.xml',
+                                     renderer_type)
+    app = TestApp(wsgi_app)
+    res = app.get('/example.html')
+    res2 = app.get('/expected.html?notheme')
+    html_string_compare(res.body, res2.body)
 
 RENDERER_TYPES = ['py', 'xslt']
-TEST_FUNCS = [ do_url, do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch, do_ajax ] 
+TEST_FUNCS = [ do_url, do_basic, do_text, do_tasktracker, do_xinclude, do_nycsr, do_necoro, do_guidesearch, do_ajax, do_aggregate ] 
 def test_all():
     for renderer_type in RENDERER_TYPES:
         for test_func in TEST_FUNCS: 

Modified: z3/deliverance/trunk/deliverance/utils.py
==============================================================================
--- z3/deliverance/trunk/deliverance/utils.py	(original)
+++ z3/deliverance/trunk/deliverance/utils.py	Mon Dec 11 23:52:52 2006
@@ -79,12 +79,15 @@
     RULE_CONTENT_KEY = "content"
     RULE_THEME_KEY   = "theme" 
     RULE_MOVE_KEY = "move"
+    RULE_HREF_KEY = "href"
 
     NOCONTENT_KEY = "nocontent"
     NOTHEME_KEY = "notheme"
 
     IGNORE_KEYWORD = "ignore"
 
+    REQUEST_CONTENT = "deliverance:request-content"
+
     def get_theme_el(self,rule,theme):
         """
         get the element referred to by the "theme" attribute of the 
@@ -390,5 +393,73 @@
             else:
                 non_text_els[0].tail = preserve_tail
 
+    def aggregate(self, resolve_uri, rules, content): 
+        """
+        aggregates the requested docuemnt and documents 
+        referred to in the "href" attribute of 
+        rules into a single document structured like: 
+
+        <content>
+          <document content="http://blah.org/foo">...</document>
+          <docuemnt content="deliverance:request-content">
+            ... 
+          </document>
+        </content>
+
+        content is an lxml etree structure representing the 
+        requested content which appears in the document node
+        with content attribute set to the value of REQUEST_CONTENT
+
+        the reference_relover is a function used to get the content of other 
+        documents referred to in rules, and is described in the 
+        initializer for renderers. 
+        """
+        root = etree.Element("content")
+
+
+        if content: 
+            request_doc = etree.SubElement(root,"document")
+            request_doc.set("content",self.REQUEST_CONTENT)
+            request_doc.append(content)
+
+        if resolve_uri is None:
+            return root
+
+        aggregated = {}
+        for rule in rules: 
+            href = rule.get(self.RULE_HREF_KEY,None)
+            if href is None or aggregated.has_key(href): 
+                continue
+            
+            doc = resolve_uri(href, parse="html")
+            aggregated[href] = True
+            if doc is None:
+                continue 
+
+            doc_node = etree.SubElement(root,"document")
+            doc_node.set("content",href)
+            doc_node.append(doc)
+        
+        return root
+
+    def get_content_xpath(self, rule): 
+        """
+        gets the xpath to lookup the content referred to by rule 
+        in the aggregated content document 
+        """
+        content_xpath = rule.get(self.RULE_CONTENT_KEY)
+
+        if content_xpath is None:
+            return None
+        
+        if not content_xpath.startswith('/'): 
+            content_xpath = '/%s' % content_xpath 
+
+        content_doc = rule.get(self.RULE_HREF_KEY,self.REQUEST_CONTENT)
+        new_xpath = "/content/document[@content='%s']%s" % (content_doc,content_xpath)
+
+        return new_xpath
+
+
 
    

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Mon Dec 11 23:52:52 2006
@@ -88,8 +88,13 @@
             text = self.get_resource(environ,href)
             if parse == "xml":
                 return etree.XML(text)
-            elif encoding:
-                return text.decode(encoding)
+            if parse == "html":
+                return etree.HTML(text)
+            else:
+                if encoding:
+                    return text.decode(encoding)
+                else:
+                    return text
 
         try:
             parsedTheme = parseHTML(theme)

Modified: z3/deliverance/trunk/deliverance/xslt.py
==============================================================================
--- z3/deliverance/trunk/deliverance/xslt.py	(original)
+++ z3/deliverance/trunk/deliverance/xslt.py	Mon Dec 11 23:52:52 2006
@@ -73,8 +73,10 @@
         self.fixup_links(theme_copy, theme_uri)
         self.xsl_escape_comments(theme_copy)
 
-        if reference_resolver:
-            xinclude.include(self.rules, self.rules_uri, loader=reference_resolver)
+        self.resolve_uri = reference_resolver
+        if self.resolve_uri:
+            xinclude.include(self.rules, self.rules_uri, loader=self.resolve_uri)
+
 
         debug = self.rules.get("debug", None)
         if debug and debug.lower() == "true":
@@ -106,6 +108,7 @@
 
         #print "TRANSFORM: %s" % etree.tostring(self.xslt_wrapper)
         if content:
+            content = self.aggregate(self.resolve_uri, self.rules, content)
             return self.transform(content).getroot()
         else:
             return self.transform(etree.Element("dummy")).getroot()
@@ -248,7 +251,7 @@
             if el.tag == remove_tag:
                 conditional = etree.Element("{%s}if" % nsmap["xsl"])
                 conditional.set("test","count(%s) = 0" % 
-                                self.get_content_test_xpath(rule))
+                                self.get_content_xpath(rule))
                 conditional.append(copy.deepcopy(el))
                 self.replace_element(el,conditional)
  
@@ -278,7 +281,7 @@
         if self.RULE_CONTENT_KEY in rule.attrib:
             empty_template = etree.Element("{%s}template" % nsmap["xsl"])
             empty_template.set("priority","1")
-            empty_template.set("match",rule.get(self.RULE_CONTENT_KEY))
+            empty_template.set("match",self.get_content_xpath(rule))
 
             move_empty_template = copy.deepcopy(empty_template)
             move_empty_template.set("mode","move")
@@ -318,7 +321,7 @@
         err = self.format_error("no content matched", rule)
         if err:
             # if the content was possibly moved, check for a marker instead of the content 
-            check_xpath = self.get_content_test_xpath(rule)
+            check_xpath = self.get_content_xpath(rule)
                 
             conditional = etree.Element("{%s}if" % nsmap["xsl"])
             conditional.set("test", "count(%s)=0" % check_xpath)
@@ -428,14 +431,14 @@
     def make_copy_node(self,rule, nocontent_fallback=None):
 
         apply = etree.Element("{%s}apply-templates" % nsmap["xsl"])
-        apply.set("select",rule.get(self.RULE_CONTENT_KEY))
+        apply.set("select",self.get_content_xpath(rule))
                   
         if rule.get(self.RULE_MOVE_KEY,None) is not None:
             apply.set("mode","move")
             # in the normal mode it is ignored 
             empty_template = etree.Element("{%s}template" % nsmap["xsl"])
             empty_template.set("priority","1")
-            empty_template.set("match",rule.get(self.RULE_CONTENT_KEY))
+            empty_template.set("match",self.get_content_xpath(rule))
 
             self.xslt_wrapper[0:0] = [empty_template]
             
@@ -443,7 +446,7 @@
             return apply 
         else:
             return self.make_when_otherwise("count(%s)=0" % 
-                                            self.get_content_test_xpath(rule), 
+                                            self.get_content_xpath(rule), 
                                             nocontent_fallback, 
                                             [apply])            
 
@@ -463,6 +466,5 @@
                 del(rule.attrib[self.RULE_MOVE_KEY]) # just process it normally
             return
 
-    def get_content_test_xpath(self, rule): 
-        return rule.get(self.RULE_CONTENT_KEY)
+
         

From ianb at codespeak.net  Thu Dec 14 01:05:19 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 14 Dec 2006 01:05:19 +0100 (CET)
Subject: [z3-checkins] r35714 - z3/deliverance/DeliveranceDemo/trunk/docs
Message-ID: <20061214000519.62F9E10075@code0.codespeak.net>

Author: ianb
Date: Thu Dec 14 01:05:15 2006
New Revision: 35714

Modified:
   z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html
Log:
supervisor

Modified: z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html	Thu Dec 14 01:05:15 2006
@@ -9,5 +9,6 @@
 <a href="../#egg=DeliveranceDemo-dev">Link to Deliverance svn checkout</a>
 <a href="http://pylonshq.com/svn/Pylons/trunk#egg=Pylons-dev">Pylons
 link :(</a>
+<a href="http://www.plope.com/software/supervisor2/supervisor-2.1b1.tar.gz/download#egg=supervisor-2.1b1">supervisor</a>
 
 </body> </html>

From ianb at codespeak.net  Thu Dec 14 03:44:36 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 14 Dec 2006 03:44:36 +0100 (CET)
Subject: [z3-checkins] r35718 - z3/deliverance/buildout/trunk
Message-ID: <20061214024436.B3EF810076@code0.codespeak.net>

Author: ianb
Date: Thu Dec 14 03:44:28 2006
New Revision: 35718

Modified:
   z3/deliverance/buildout/trunk/buildout.cfg
Log:
Added ddemo and supervisor buildout sections (not installed by default)

Modified: z3/deliverance/buildout/trunk/buildout.cfg
==============================================================================
--- z3/deliverance/buildout/trunk/buildout.cfg	(original)
+++ z3/deliverance/buildout/trunk/buildout.cfg	Thu Dec 14 03:44:28 2006
@@ -1,6 +1,6 @@
 [buildout]
 develop = zc.recipe.cmmi deliverance helpers
-parts = fix-bin-path libxml2 libXslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
+parts = fix-bin-path libXslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
 
 [libxml2]
 recipe = zc.recipe.cmmi
@@ -27,6 +27,21 @@
 recipe = zc.recipe.egg
 eggs = Deliverance
 
+[ddemo]
+recipe = zc.recipe.egg
+eggs = PasteScript 
+       Paste ==dev,>1.0
+       DeliveranceDemo
+find-links = http://codespeak.net/svn/z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html
+scripts = paster
+
+[supervisor]
+recipe = zc.recipe.egg
+eggs = supervisor
+find-links = http://codespeak.net/svn/z3/deliverance/DeliveranceDemo/trunk/docs/find-links.html
+# Doesn't work for some reason, dammit:
+scripts = supervisord supervisorctl
+
 [fix-bin-path]
 recipe = topp.helpers:addbinpath
 path = ${buildout:directory}/parts/libxml2/bin:${buildout:directory}/parts/libXslt/bin
@@ -35,3 +50,5 @@
 recipe = topp.helpers:fixlibsearch
 eggs = Deliverance
 libpath = ${buildout:directory}/parts/libxml2/lib:${buildout:directory}/parts/libXslt/lib
+
+

From ianb at codespeak.net  Thu Dec 14 17:44:23 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 14 Dec 2006 17:44:23 +0100 (CET)
Subject: [z3-checkins] r35755 - z3/deliverance/trunk/deliverance
Message-ID: <20061214164423.A0FFD10091@code0.codespeak.net>

Author: ianb
Date: Thu Dec 14 17:44:21 2006
New Revision: 35755

Modified:
   z3/deliverance/trunk/deliverance/relocateresponse.py
Log:
update content-length in link rewriting code

Modified: z3/deliverance/trunk/deliverance/relocateresponse.py
==============================================================================
--- z3/deliverance/trunk/deliverance/relocateresponse.py	(original)
+++ z3/deliverance/trunk/deliverance/relocateresponse.py	Thu Dec 14 17:44:21 2006
@@ -5,7 +5,7 @@
 import urlparse
 import re
 from paste.request import construct_url
-from paste.response import header_value
+from paste.response import header_value, replace_header
 import fixuplinks
 
 def relocate_response(headers, content, base_href, old_href, new_href):
@@ -77,7 +77,6 @@
         app_iter = self.app(environ, repl_start_response)
         if skipped:
             return app_iter
-        start_response(*stat_headers)
         try:
             for chunk in app_iter:
                 written.append(chunk)
@@ -86,4 +85,7 @@
                 app_iter.close()
         content = ''.join(written)
         content = relocate_content(content, base_href, self.old_href, new_href)
+        headers = stat_headers[1]
+        replace_header(headers, 'content-length', str(len(content)))
+        start_response(*stat_headers)
         return [content]

From ltucker at codespeak.net  Thu Dec 14 18:05:08 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Thu, 14 Dec 2006 18:05:08 +0100 (CET)
Subject: [z3-checkins] r35757 - z3/deliverance/trunk/deliverance
Message-ID: <20061214170508.51E2A1008A@code0.codespeak.net>

Author: ltucker
Date: Thu Dec 14 18:05:06 2006
New Revision: 35757

Modified:
   z3/deliverance/trunk/deliverance/proxycommand.py
Log:
fix specification of renderer to proxy app

Modified: z3/deliverance/trunk/deliverance/proxycommand.py
==============================================================================
--- z3/deliverance/trunk/deliverance/proxycommand.py	(original)
+++ z3/deliverance/trunk/deliverance/proxycommand.py	Thu Dec 14 18:05:06 2006
@@ -49,6 +49,7 @@
                   action="store_true",
                   dest="rewrite")
 parser.add_option('--renderer',
+                  dest="renderer",
                   help="Select which renderer to use: 'py' or 'xslt'",
                   default='py')
 
@@ -82,7 +83,8 @@
         proxy=proxy,
         transparent=options.transparent,
         debug_headers=debug_headers,
-        relocate_content=options.rewrite)
+        relocate_content=options.rewrite, 
+        renderer=options.renderer)
     if options.request_log:
         from paste.translogger import TransLogger
         app = TransLogger(app)

From ianb at codespeak.net  Thu Dec 14 23:55:48 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Thu, 14 Dec 2006 23:55:48 +0100 (CET)
Subject: [z3-checkins] r35771 - z3/deliverance/trunk/deliverance
Message-ID: <20061214225548.503291007A@code0.codespeak.net>

Author: ianb
Date: Thu Dec 14 23:55:38 2006
New Revision: 35771

Added:
   z3/deliverance/trunk/deliverance/faketestingapps.py   (contents, props changed)
Log:
Added some loadtest apps

Added: z3/deliverance/trunk/deliverance/faketestingapps.py
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/deliverance/faketestingapps.py	Thu Dec 14 23:55:38 2006
@@ -0,0 +1,85 @@
+"""
+These applications are intended for load testing odd situations with
+Deliverance.  Two models are implemented:
+
+* Slow servers
+* Random content
+
+Both support probabilities (e.g., return random content on some
+probability, or slow down a certain percentage of requests).
+"""
+import random
+import time
+
+__all__ = ['Switcher']
+
+class Switcher(object):
+
+    """
+    Switches request paths.
+
+    Usage::
+
+        [filter-app:switchedapp]
+        paste.filter_app_factory = deliverance.faketestingapps.Switcher
+        /bad_content.html = 10
+        next = static
+
+        [app:static]
+        use = egg:Paste#static
+        document_root = /some/dir
+
+    Then 90% of the time / will direct to /some/dir/index.html (the
+    default) and 10% of the time to /some/dir/bad_content.html.
+    """
+
+    def __init__(self, app, global_conf, **paths):
+        self.app = app
+        self.redirects = []
+        total_prob = 0
+        for path, prob in paths.items():
+            if not path.startswith('/'):
+                path = '/'+path
+            prob = float(prob) / 100.0
+            total_prob += prob
+            self.redirects.append((path, prob))
+
+    def __call__(self, environ, start_response):
+        prob = random.random()
+        for path, path_prob in self.redirects:
+            if prob < path_prob:
+                environ['PATH_INFO'] = path
+                break
+        return self.app(environ, start_response)
+
+
+class Pauser(object):
+
+    """
+    Pauses some requests.
+
+    Usage::
+
+        [filter-app:pauser]
+        paste.filter_app_factory = deliverance.faketestingapps.Pauser
+        # 10% of the time:
+        probability = 10
+        # pause 5 seconds:
+        pause = 5
+        next = static
+
+        [app:static]
+        use = egg:Paste#static
+        document_root = /docroot
+    """
+
+    def __init__(self, app, global_conf, probability, pause):
+        self.app = app
+        self.probability = float(probability)
+        self.pause = float(pause)
+
+    def __call__(self, environ, start_response):
+        if random.random()*100 < self.probability:
+            time.sleep(self.pause)
+        return self.app(environ, start_response)
+    

From ltucker at codespeak.net  Mon Dec 18 18:48:21 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Mon, 18 Dec 2006 18:48:21 +0100 (CET)
Subject: [z3-checkins] r35857 - z3/deliverance/buildout/trunk
Message-ID: <20061218174821.3DF0210076@code0.codespeak.net>

Author: ltucker
Date: Mon Dec 18 18:48:18 2006
New Revision: 35857

Modified:
   z3/deliverance/buildout/trunk/buildout.cfg
Log:
re-adding libxml2 to buildout

Modified: z3/deliverance/buildout/trunk/buildout.cfg
==============================================================================
--- z3/deliverance/buildout/trunk/buildout.cfg	(original)
+++ z3/deliverance/buildout/trunk/buildout.cfg	Mon Dec 18 18:48:18 2006
@@ -1,6 +1,6 @@
 [buildout]
 develop = zc.recipe.cmmi deliverance helpers
-parts = fix-bin-path libXslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
+parts = fix-bin-path libxml2 libXslt lxml lxml-inst deliverance-inst fix-deliverance-scripts 
 
 [libxml2]
 recipe = zc.recipe.cmmi

From ianb at codespeak.net  Mon Dec 18 19:08:50 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 18 Dec 2006 19:08:50 +0100 (CET)
Subject: [z3-checkins] r35858 - z3/deliverance/trunk/deliverance
Message-ID: <20061218180850.A9CF010077@code0.codespeak.net>

Author: ianb
Date: Mon Dec 18 19:08:48 2006
New Revision: 35858

Modified:
   z3/deliverance/trunk/deliverance/proxyapp.py
Log:
print out content-length/type

Modified: z3/deliverance/trunk/deliverance/proxyapp.py
==============================================================================
--- z3/deliverance/trunk/deliverance/proxyapp.py	(original)
+++ z3/deliverance/trunk/deliverance/proxyapp.py	Mon Dec 18 19:08:48 2006
@@ -55,6 +55,9 @@
 
 class DebugHeaders(object):
 
+    translate_keys = {'CONTENT_LENGTH': 'HTTP_CONTENT_LENGTH',
+                      'CONTENT_TYPE': 'HTTP_CONTENT_TYPE}
+
     def __init__(self, app):
         self.app = app
 
@@ -63,6 +66,7 @@
         print 'Incoming headers: (%s %s)' % (
             environ['REQUEST_METHOD'], construct_url(environ))
         for name, value in sorted(environ.items()):
+            name = self.translate_keys.get(name, name)
             if not name.startswith('HTTP_'):
                 continue
             name = name[5:].replace('_', '-').title()

From ianb at codespeak.net  Mon Dec 18 19:09:31 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 18 Dec 2006 19:09:31 +0100 (CET)
Subject: [z3-checkins] r35859 - z3/deliverance/trunk/deliverance
Message-ID: <20061218180931.C626E10077@code0.codespeak.net>

Author: ianb
Date: Mon Dec 18 19:09:30 2006
New Revision: 35859

Modified:
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
Log:
Remove bad keys from environ for recursive requests

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Mon Dec 18 19:09:30 2006
@@ -267,6 +267,10 @@
             uri = '/' + uri
         environ['PATH_INFO'] = uri
         environ['SCRIPT_NAME'] = environ[DELIVERANCE_BASE_URL]
+        environ['REQUEST_METHOD'] = 'GET'
+        environ['CONTENT_LENGTH'] = '0'
+        environ['wsgi.input'] = StringIO('')
+        environ['CONTENT_TYPE'] = ''
         if environ['QUERY_STRING']:
             environ['QUERY_STRING'] += '&notheme'
         else:

From ianb at codespeak.net  Mon Dec 18 20:21:07 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 18 Dec 2006 20:21:07 +0100 (CET)
Subject: [z3-checkins] r35860 - in z3/deliverance/DeliveranceDemo/trunk: .
	ddemo
Message-ID: <20061218192107.5257210077@code0.codespeak.net>

Author: ianb
Date: Mon Dec 18 20:21:04 2006
New Revision: 35860

Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
   z3/deliverance/DeliveranceDemo/trunk/development.ini
Log:
allow showing of bodies in logs

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/wsgiapp.py	Mon Dec 18 20:21:04 2006
@@ -59,7 +59,7 @@
     app = DeliveranceDispatcher(app, app_conf)
     app = RecursiveMiddleware(app)
     if asbool(app_conf.get('debug_headers')):
-        app = proxyapp.DebugHeaders(app)
+        app = proxyapp.DebugHeaders(app, show_body=asbool(app_conf.get('debug_bodies')))
     app = RegistryManager(app)
     if (asbool(full_stack)
         and asbool(app_conf.get('debug', global_conf.get('debug')))):

Modified: z3/deliverance/DeliveranceDemo/trunk/development.ini
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/development.ini	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/development.ini	Mon Dec 18 20:21:04 2006
@@ -22,6 +22,8 @@
 session_key = ddemo
 session_secret = somesecret
 debug_headers = true
+# To view bodies:
+#debug_bodies = true
 
 # 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

From ianb at codespeak.net  Mon Dec 18 20:21:50 2006
From: ianb at codespeak.net (ianb at codespeak.net)
Date: Mon, 18 Dec 2006 20:21:50 +0100 (CET)
Subject: [z3-checkins] r35861 - in z3/deliverance/DeliveranceDemo/trunk: .
	ddemo
Message-ID: <20061218192150.47EA410077@code0.codespeak.net>

Author: ianb
Date: Mon Dec 18 20:21:48 2006
New Revision: 35861

Modified:
   z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py
   z3/deliverance/DeliveranceDemo/trunk/development.ini
Log:
Allow disabling of link rewriting

Modified: z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/ddemo/dispatcher.py	Mon Dec 18 20:21:48 2006
@@ -4,6 +4,7 @@
 from paste import httpexceptions
 from paste.urlparser import StaticURLParser
 from paste.fileapp import FileApp
+from paste.deploy.converters import asbool
 from wsgifilter import proxyapp
 from wsgifilter import relocateresponse
 from deliverance.wsgimiddleware import DeliveranceMiddleware
@@ -24,6 +25,7 @@
         self.pylons_app = pylons_app
         data_dir = app_conf['data_dir']
         self.provider = DataProvider(data_dir)
+        self.rewrite_links = asbool(app_conf.get('rewrite_links', True))
 
     def __call__(self, environ, start_response):
         if 'paste.registry' in environ:
@@ -64,8 +66,9 @@
         app = proxyapp.ForcedProxy(
             remote=domain_info.remote,
             force_host=True)
-        app = relocateresponse.RelocateMiddleware(
-            app, old_href=domain_info.remote)
+        if self.rewrite_links:
+            app = relocateresponse.RelocateMiddleware(
+                app, old_href=domain_info.remote)
         rule_uri = construct_url(
             environ, with_query_string=False,
             path_info='/_rules/rule.xml')

Modified: z3/deliverance/DeliveranceDemo/trunk/development.ini
==============================================================================
--- z3/deliverance/DeliveranceDemo/trunk/development.ini	(original)
+++ z3/deliverance/DeliveranceDemo/trunk/development.ini	Mon Dec 18 20:21:48 2006
@@ -24,6 +24,9 @@
 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

From ltucker at codespeak.net  Tue Dec 19 01:19:16 2006
From: ltucker at codespeak.net (ltucker at codespeak.net)
Date: Tue, 19 Dec 2006 01:19:16 +0100 (CET)
Subject: [z3-checkins] r35868 - z3/deliverance/trunk/deliverance
Message-ID: <20061219001916.E17CF1007B@code0.codespeak.net>

Author: ltucker
Date: Tue Dec 19 01:18:52 2006
New Revision: 35868

Modified:
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
Log:
fix paste recursive call part 1

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Tue Dec 19 01:18:52 2006
@@ -252,21 +252,23 @@
         f.close()
         return content
 
-    def get_internal_resource(self, environ, uri):
+    def get_internal_resource(self, in_environ, uri):
         """
         get the data referred to by the uri given 
         by using the wrapped WSGI application 
         """
-        if 'paste.recursive.include' in environ:
-            # Try to do the redirect this way...
-            includer = environ['paste.recursive.include']
-            res = includer(uri)
-            return res.body
-        environ = environ.copy()
+
+        print "get_internal_resource('%s')" % uri
+        
+        if 'paste.recursive.include' in in_environ:
+            environ = in_environ['paste.recursive.include'].original_environ.copy()
+        else:
+            environ = in_environ.copy()
+            
         if not uri.startswith('/'):
             uri = '/' + uri
         environ['PATH_INFO'] = uri
-        environ['SCRIPT_NAME'] = environ[DELIVERANCE_BASE_URL]
+        environ['SCRIPT_NAME'] = in_environ[DELIVERANCE_BASE_URL]
         environ['REQUEST_METHOD'] = 'GET'
         environ['CONTENT_LENGTH'] = '0'
         environ['wsgi.input'] = StringIO('')
@@ -276,6 +278,18 @@
         else:
             environ['QUERY_STRING'] = 'notheme'
 
+        if 'HTTP_ACCEPT_ENCODING' in environ:
+            print "Knocking out ACCEPT_ENCODING: (%s)" % environ['HTTP_ACCEPT_ENCODING']
+	    environ['HTTP_ACCEPT_ENCODING'] = '' 
+
+        if 'paste.recursive.include' in in_environ:
+            # Try to do the redirect this way...
+            includer = in_environ['paste.recursive.include']
+            res = includer(uri,environ)
+            print "did paste.recursive.include for %s: [%s]" % (uri,res.body)
+            return res.body
+
+
         path_info = environ['PATH_INFO']
         status, headers, body = intercept_output(environ, self.app)
         if not status.startswith('200'):

From kobold at codespeak.net  Sun Dec 24 12:04:23 2006
From: kobold at codespeak.net (kobold at codespeak.net)
Date: Sun, 24 Dec 2006 12:04:23 +0100 (CET)
Subject: [z3-checkins] r35969 - in z3/sqlos/branch/kobold-sqlos: .
	Zope2/FiveSQLOS doc src/sqlos src/sqlos/ftests src/sqlos/testing
Message-ID: <20061224110423.A4DCE10072@code0.codespeak.net>

Author: kobold
Date: Sun Dec 24 12:04:20 2006
New Revision: 35969

Modified:
   z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS/README.txt
   z3/sqlos/branch/kobold-sqlos/doc/HowToMakeARealease.rst
   z3/sqlos/branch/kobold-sqlos/makefile
   z3/sqlos/branch/kobold-sqlos/src/sqlos/README.txt
   z3/sqlos/branch/kobold-sqlos/src/sqlos/adapter.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml
   z3/sqlos/branch/kobold-sqlos/src/sqlos/connection.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/ftesting.zcml
   z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/adding.txt
   z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/joins_browser.txt
   z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/localutilities.txt
   z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/test_transaction.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/testing/testdb.py
Log:
Partial merge with the trunk, which adds zope 3.3 support.


Modified: z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS/README.txt
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS/README.txt	(original)
+++ z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS/README.txt	Sun Dec 24 12:04:20 2006
@@ -34,10 +34,10 @@
     >>> from Products.Five import zcml
     >>> import sqlos
     >>> import Products.FiveSQLOS
-    >>> import zope.app.rdb
+    >>> import zope.rdb
     >>> zcml.load_config('configure.zcml', package=Products.Five)
     >>> zcml.load_config('meta.zcml', package=Products.FiveSQLOS)
-    >>> zcml.load_config('meta.zcml', package=zope.app.rdb)
+    >>> zcml.load_config('meta.zcml', package=zope.rdb)
     >>> zcml.load_config('meta.zcml', package=sqlos)
     >>> zcml.load_config('configure.zcml', package=Products.FiveSQLOS)
     >>> zcml.load_config('configure.zcml', package=sqlos)

Modified: z3/sqlos/branch/kobold-sqlos/doc/HowToMakeARealease.rst
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/doc/HowToMakeARealease.rst	(original)
+++ z3/sqlos/branch/kobold-sqlos/doc/HowToMakeARealease.rst	Sun Dec 24 12:04:20 2006
@@ -11,7 +11,7 @@
 -----------------------------
 
 Update the documents in the source:
-    1. trunk/src/sqlos/README.txt - Th compatibility matrix.
+    1. trunk/src/sqlos/README.txt - The compatibility matrix.
 
 
 Step 2 - Make a maintenance branch for the release

Modified: z3/sqlos/branch/kobold-sqlos/makefile
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/makefile	(original)
+++ z3/sqlos/branch/kobold-sqlos/makefile	Sun Dec 24 12:04:20 2006
@@ -64,4 +64,4 @@
 
 .PHONY: run-sampleapp
 run-sampleapp: develop Zope3/principals.zcml $(z3includes)/sqlos.ftesting-configure.zcml
-	cd Zope3; ./z3.py
+	cd Zope3; PYTHONPATH=src ./z3.py

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/README.txt
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/README.txt	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/README.txt	Sun Dec 24 12:04:20 2006
@@ -45,13 +45,18 @@
 The following table shows which sqlos version can and should be used
 with which Zope 2 and Zope 3 versions.
 
-============ ========
-.            Zope 2.9
------------- --------
-.            Zope 3.2
-============ ========
-sqlos 0.2.x     X
-============ ========
+============ ======== =========
+.            Zope 2.9 Zope 2.10
+------------ -------- ---------
+.            Zope 3.2 Zope 3.3
+============ ======== =========
+sqlos 0.2.x     X        D
+------------ -------- ---------
+sqlos 0.3.x              X
+============ ======== =========
+
+* X = Runs, all tests pass, no deprecation warnings.
+* D = Runs, trivial tests fail, deprecation warnings.
 
 .. _FiveSQLOS: http://codespeak.net/svn/z3/sqlos/trunk/Zope2/FiveSQLOS/
 
@@ -137,7 +142,7 @@
     $ easy_install --install-dir=~/lib/python2.4/site-packages sqlos
 
 After that, you should install the Zope Database Adapter you wish to use and
-copy the sqlos-*.zcml package includes (in the includes directory in the
+copy the sqlos-\*.zcml package includes (in the includes directory in the
 tarball) to the package-includes directory of your Zope instance.
 
 NOTE: the sqlos.ftesting-configure.zcml shouldn't be copied unless you want
@@ -361,7 +366,7 @@
 
 Finally, write the ZCML configuration to put all the pieces together::
 
-  <content class="myproject.PersonContainer">
+  <class class="myproject.PersonContainer">
 
     <implements interface="zope.app.container.interfaces.IContentContainer" />
 
@@ -422,7 +427,7 @@
 
 The code is as follows::
 
-    >>> from zope.app.dublincore.interfaces import IZopeDublinCore
+    >>> from zope.dublincore.interfaces import IZopeDublinCore
 
     >>> class PersonDublinCore(object):
     ...     """An adapter providing DublinCore metadata for IPerson objects"""
@@ -441,7 +446,7 @@
 
 
       <adapter
-          provides="zope.app.dublincore.interfaces.IZopeDublinCore"
+          provides="zope.dublincore.interfaces.IZopeDublinCore"
           for="myproject.interfaces.IPerson"
           factory="myproject.PersonDublinCore"
           trusted="true"

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/adapter.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/adapter.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/adapter.py	Sun Dec 24 12:04:20 2006
@@ -21,7 +21,7 @@
 from sqlobject import _mysql, _postgres, _sqlite
 from sqlobject.converters import registerConverter
 from sqlobject.mysql import mysqlconnection
-from zope.app.rdb.interfaces import DatabaseException
+from zope.rdb.interfaces import DatabaseException
 from zope.app.container.interfaces import INameChooser
 from zope.interface import implements
 
@@ -54,12 +54,12 @@
 
     def getConnection(self):
         # we override this because we really don't care about sqlobjects idea
-        # of threadsafe pool of db connections. zope.app.rdb takes care of
+        # of threadsafe pool of db connections. zope.rdb takes care of
         # that for us
         return self.makeConnection()
 
     def releaseConnection(self, conn, explicit=False):
-        # we simply lobotomize this method because zope.app.rdb
+        # we simply lobotomize this method because zope.rdb
         # takes care of all commits/rollbacks as well as all threading issues
         # with connections
         pass

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml	Sun Dec 24 12:04:20 2006
@@ -5,7 +5,7 @@
 
   <!-- ISQLObjectContainer Views -->
 
-  <content class=".container.SQLObjectContainer">
+  <class class=".container.SQLObjectContainer">
 
     <implements interface="zope.app.container.interfaces.IContentContainer" />
 
@@ -29,7 +29,7 @@
         attributes="select"
         />
 
-  </content>
+  </class>
 
   <adapter
       provides="zope.app.container.interfaces.INameChooser"
@@ -40,7 +40,7 @@
 
   <!-- ISQLObjectJoinContainer Views -->
 
-  <content class=".container.SQLOSContainer">
+  <class class=".container.SQLOSContainer">
     <implements interface="zope.app.container.interfaces.IContentContainer" />
     <factory
         id="sqlos.container.SQLOSContainer"
@@ -50,7 +50,7 @@
         permission="zope.View"
         interface="zope.app.container.interfaces.IReadContainer"
         />
-  </content>
+  </class>
 
   <adapter
       provides="zope.app.container.interfaces.INameChooser"
@@ -137,19 +137,14 @@
         />
   </class>
 
-  <!--
-    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    For now, you need to change the factory here if you want
-    to use a diferent connection type.
-    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-  <adapter
-      provides=".interfaces.IZopeSQLConnection"
-      for="zope.app.rdb.interfaces.IZopeConnection"
-      permission="zope.Public"
-      factory=".adapter.PostgresAdapter"
-      />
-  -->
+  <configure zcml:condition="installed psycopgda">
+    <adapter
+        provides=".interfaces.IZopeSQLConnection"
+        for="psycopgda.adapter.IPsycopgZopeConnection"
+        permission="zope.Public"
+        factory=".adapter.PostgresAdapter"
+        />
+  </configure>
 
   <configure zcml:condition="installed mysqldbda">
     <!-- if this doesnt work, you need a new version of mysqldbda-->

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/connection.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/connection.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/connection.py	Sun Dec 24 12:04:20 2006
@@ -25,7 +25,7 @@
 
 from zope.component import ComponentLookupError
 import zope.component
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
 from zope.thread import local
 
 from sqlos.interfaces import IZopeSQLConnection, IConnectionName
@@ -52,7 +52,7 @@
 
     This subscriber serves a dual purpose. Firstly it makes sure that local
     sites will work with the cache. Secondly it ensures that the cached
-    connections are not kept around forever, allowing zope.app.rdb to
+    connections are not kept around forever, allowing zope.rdb to
     recover from problems such as [1].
 
     Subscribed to BeforeTraverseEvent and EndTraverseEvent.

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/ftesting.zcml
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/ftesting.zcml	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/ftesting.zcml	Sun Dec 24 12:04:20 2006
@@ -15,7 +15,7 @@
 
   <adapter
       provides=".interfaces.IZopeSQLConnection"
-      for="zope.app.rdb.interfaces.IZopeConnection"
+      for="zope.rdb.interfaces.IZopeConnection"
       permission="zope.Public"
       factory=".adapter.SQLiteAdapter"
       />
@@ -67,7 +67,7 @@
       description="A Sample Person"
       />
 
-  <content class=".testing.sampleperson.SamplePerson">
+  <class class=".testing.sampleperson.SamplePerson">
     <!-- The followinf factory directive is actually uneccessary and
          probably a bad idea as sqlos:factory with register the factory.
          It is included here as a decoy to be sure that sqlos still functions
@@ -90,7 +90,7 @@
         permission="zope.View"
         interface="zope.app.container.interfaces.IReadContainer"
         />
-  </content>
+  </class>
 
   <browser:addform
       schema="sqlos.testing.sampleperson.IPerson"
@@ -123,7 +123,7 @@
 
   <!-- Define a Sample Dog with some views so we can test through the ZMI -->
 
-  <content class=".testing.sampleperson.Dog">
+  <class class=".testing.sampleperson.Dog">
     <require
         permission="zope.ManageContent"
         interface="sqlos.testing.sampleperson.IDog"
@@ -133,7 +133,7 @@
         permission="zope.View"
         interface="sqlos.interfaces.ISQLObject"
         />
-  </content>
+  </class>
 
   <browser:addform
       schema="sqlos.testing.sampleperson.IDog"
@@ -180,7 +180,7 @@
     <browser:page name="action.html" attribute="action"/>
   </browser:view>
 
-  <content class="sqlos.testing.sampleperson.MultiContainer">
+  <class class="sqlos.testing.sampleperson.MultiContainer">
     <factory
         id="sqlos.testing.sampleperson.MultiContainer"
         title="SQLObject Multi Container (Dogs and people)"
@@ -198,7 +198,7 @@
         permission="zope.View"
         attributes="select"
         />
-  </content>
+  </class>
 
   <browser:addMenuItem
       class="sqlos.testing.sampleperson.MultiContainer"
@@ -220,7 +220,7 @@
     <browser:page name="action.html" attribute="action"/>
   </browser:view>
 
-  <content class="sqlos.testing.sampleperson.SampleDogContainer">
+  <class class="sqlos.testing.sampleperson.SampleDogContainer">
     <factory
         id="sqlos.testing.sampleperson.SampleDogContainer"
         title="SQLObject Dog Container"
@@ -239,7 +239,7 @@
         permission="zope.View"
         attributes="select"
         />
-  </content>
+  </class>
 
   <browser:addMenuItem
       class="sqlos.testing.sampleperson.SampleDogContainer"

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/adding.txt
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/adding.txt	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/adding.txt	Sun Dec 24 12:04:20 2006
@@ -11,7 +11,7 @@
 
 Then get a browser:
 
-    >>> from zope.testbrowser import Browser
+    >>> from zope.testbrowser.testing import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
     >>> browser.handleErrors = False

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/joins_browser.txt
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/joins_browser.txt	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/joins_browser.txt	Sun Dec 24 12:04:20 2006
@@ -10,7 +10,7 @@
 
 Then get a browser:
 
-    >>> from zope.testbrowser import Browser
+    >>> from zope.testbrowser.testing import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
     >>> browser.handleErrors = False

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/localutilities.txt
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/localutilities.txt	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/localutilities.txt	Sun Dec 24 12:04:20 2006
@@ -30,7 +30,7 @@
 
 Now we set up a local database utility
 
-    >>> from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+    >>> from zope.rdb.interfaces import IZopeDatabaseAdapter
     >>> from zope.app.component.interfaces.registration import ActiveStatus
     >>> from sqlos.testing.testdb import SQLiteda
     >>> from zope.app.utility import UtilityRegistration
@@ -90,7 +90,7 @@
 
 So, get a testbrowser:
 
-    >>> from zope.testbrowser import Browser
+    >>> from zope.testbrowser.testing import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
     >>> browser.handleErrors = False

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/test_transaction.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/test_transaction.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/test_transaction.py	Sun Dec 24 12:04:20 2006
@@ -17,7 +17,7 @@
 from transaction import get, begin
 from zope.app.testing.functional import BrowserTestCase
 import zope.component
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
 
 from sqlos.interfaces import IConnectionName
 from sqlos.testing.sampleperson import SamplePerson

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/testing/testdb.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/testing/testdb.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/testing/testdb.py	Sun Dec 24 12:04:20 2006
@@ -18,7 +18,7 @@
 import urlparse
 
 import transaction
-from zope.app.rdb import ZopeDatabaseAdapter
+from zope.rdb import ZopeDatabaseAdapter
 
 from sqlos.adapter import SQLiteAdapter
 

From kobold at codespeak.net  Sun Dec 24 12:14:14 2006
From: kobold at codespeak.net (kobold at codespeak.net)
Date: Sun, 24 Dec 2006 12:14:14 +0100 (CET)
Subject: [z3-checkins] r35970 - in z3/sqlos/branch/kobold-sqlos/src/sqlos: .
	interfaces
Message-ID: <20061224111414.6F2B810074@code0.codespeak.net>

Author: kobold
Date: Sun Dec 24 12:14:11 2006
New Revision: 35970

Added:
   z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-configure.zcml
   z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-ftesting.zcml
   z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-meta.zcml
Modified:
   z3/sqlos/branch/kobold-sqlos/src/sqlos/browser.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml
   z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/interfaces/__init__.py
   z3/sqlos/branch/kobold-sqlos/src/sqlos/interfaces/container.py
Log:
Other changes: avoided deprecation warnings, added set-up ZCML files.


Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/browser.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/browser.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/browser.py	Sun Dec 24 12:14:11 2006
@@ -15,7 +15,7 @@
 
 from zope.interface import implements
 from zope.app.form.browser.add import AddView
-from zope.app.traversing.interfaces import ITraversable, TraversalError
+from zope.traversing.interfaces import ITraversable, TraversalError
 
 from sqlos.interfaces.container import ISQLObjectJoinContainer
 

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml	Sun Dec 24 12:14:11 2006
@@ -61,7 +61,7 @@
 
   <adapter
       factory=".browser.SQLOSContainerTraversable"
-      provides="zope.app.traversing.interfaces.ITraversable"
+      provides="zope.traversing.interfaces.ITraversable"
       for=".interfaces.container.ISQLObjectJoinContainer"
       />
 

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/container.py	Sun Dec 24 12:14:11 2006
@@ -25,9 +25,9 @@
 from zope.app.container.contained import Contained
 from zope.app.container.contained import NameChooser
 from zope.app.container.constraints import checkFactory
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
 from zope.proxy import sameProxiedObjects
-from zope.app.exception.interfaces import UserError
+from zope.exceptions.interfaces import UserError
 
 from sqlos.interfaces import ISQLObject, ISQLObjectIsolated, IISQLObject
 from sqlos.interfaces.container import ISQLObjectContainer, IIsolatedSQLContainer, ISQLObjectMonoContainer, ISQLObjectJoinContainer

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/interfaces/__init__.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/interfaces/__init__.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/interfaces/__init__.py	Sun Dec 24 12:14:11 2006
@@ -11,12 +11,11 @@
 """
 from zope.schema import TextLine
 from zope.interface import Interface, Attribute
-from zope.component import getService, ComponentLookupError
 from zope.interface import classImplements
 from zope.security.checker import NamesChecker, NoProxy, defineChecker
 from zope.schema.vocabulary import SimpleVocabulary
 from zope.schema import Choice, List
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.interfaces import IContained
 from sqlobject import NoDefault
 from sqlobject.dbconnection import DBConnection, DBAPI

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/interfaces/container.py
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/interfaces/container.py	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/interfaces/container.py	Sun Dec 24 12:14:11 2006
@@ -11,7 +11,7 @@
 """
 from zope.interface import Attribute
 from zope.app.container.constraints import ItemTypePrecondition
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.interfaces import IContainerNamesContainer
 from zope.app.container.interfaces import IReadContainer, IContainer
 

Added: z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-configure.zcml
==============================================================================
--- (empty file)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-configure.zcml	Sun Dec 24 12:14:11 2006
@@ -0,0 +1 @@
+<include package="sqlos" />

Added: z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-ftesting.zcml
==============================================================================
--- (empty file)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-ftesting.zcml	Sun Dec 24 12:14:11 2006
@@ -0,0 +1 @@
+<include package="sqlos" file="ftesting.zcml"/>

Added: z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-meta.zcml
==============================================================================
--- (empty file)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/sqlos-meta.zcml	Sun Dec 24 12:14:11 2006
@@ -0,0 +1 @@
+<include package="sqlos" file="meta.zcml"/>

From kobold at codespeak.net  Sun Dec 24 12:15:28 2006
From: kobold at codespeak.net (kobold at codespeak.net)
Date: Sun, 24 Dec 2006 12:15:28 +0100 (CET)
Subject: [z3-checkins] r35971 - z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS
Message-ID: <20061224111528.E462D1007A@code0.codespeak.net>

Author: kobold
Date: Sun Dec 24 12:15:28 2006
New Revision: 35971

Modified:
   z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS/dependencies-meta.zcml
Log:
Deprecation warning.


Modified: z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS/dependencies-meta.zcml
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS/dependencies-meta.zcml	(original)
+++ z3/sqlos/branch/kobold-sqlos/Zope2/FiveSQLOS/dependencies-meta.zcml	Sun Dec 24 12:15:28 2006
@@ -12,7 +12,7 @@
   <include package="zope.app.component" file="meta.zcml"/>
   <include package="zope.app.security" file="meta.zcml"/>
   <include package="zope.app" file="menus.zcml"/>
-  <include package="zope.app.rdb" file="meta.zcml"/>
+  <include package="zope.rdb" file="meta.zcml"/>
   <include package="sqlos" file="meta.zcml"/>
 
   <!-- XXX - remove when we break compatibility with Five 1.3-->