<\/select><\/div>' + + '<\/div><\/form>'; + if (controlVis == 'hidden') { + var hidden = document.getElementById('navLinks'); + } else { + var hidden = document.getElementById('jumplist'); + } + addClass(hidden,'hideme'); +} + +function fontScale() { // causes layout problems in FireFox that get fixed if browser's Reload is used; same may be true of other Gecko-based browsers + if (!s5mode) return false; + var vScale = 22; // both yield 32 (after rounding) at 1024x768 + var hScale = 32; // perhaps should auto-calculate based on theme's declared value? + if (window.innerHeight) { + var vSize = window.innerHeight; + var hSize = window.innerWidth; + } else if (document.documentElement.clientHeight) { + var vSize = document.documentElement.clientHeight; + var hSize = document.documentElement.clientWidth; + } else if (document.body.clientHeight) { + var vSize = document.body.clientHeight; + var hSize = document.body.clientWidth; + } else { + var vSize = 700; // assuming 1024x768, minus chrome and such + var hSize = 1024; // these do not account for kiosk mode or Opera Show + } + var newSize = Math.min(Math.round(vSize/vScale),Math.round(hSize/hScale)); + fontSize(newSize + 'px'); + if (isGe) { // hack to counter incremental reflow bugs + var obj = document.getElementsByTagName('body')[0]; + obj.style.display = 'none'; + obj.style.display = 'block'; + } +} + +function fontSize(value) { + if (!(s5ss = document.getElementById('s5ss'))) { + if (!isIE) { + document.getElementsByTagName('head')[0].appendChild(s5ss = document.createElement('style')); + s5ss.setAttribute('media','screen, projection'); + s5ss.setAttribute('id','s5ss'); + } else { + document.createStyleSheet(); + document.s5ss = document.styleSheets[document.styleSheets.length - 1]; + } + } + if (!isIE) { + while (s5ss.lastChild) s5ss.removeChild(s5ss.lastChild); + s5ss.appendChild(document.createTextNode('body {font-size: ' + value + ' !important;}')); + } else { + document.s5ss.addRule('body','font-size: ' + value + ' !important;'); + } } function notOperaFix() { - var obj = document.getElementById('slideProj'); - obj.setAttribute('media','screen'); + slideCSS = document.getElementById('slideProj').href; + var slides = document.getElementById('slideProj'); + var outline = document.getElementById('outlineStyle'); + slides.setAttribute('media','screen'); + outline.disabled = true; if (isGe) { - obj.setAttribute('href','null'); // Gecko fix - obj.setAttribute('href',slideCSS); // Gecko fix + slides.setAttribute('href','null'); // Gecko fix + slides.setAttribute('href',slideCSS); // Gecko fix + } + if (isIE && document.styleSheets && document.styleSheets[0]) { + document.styleSheets[0].addRule('img', 'behavior: url(ui/default/iepngfix.htc)'); + document.styleSheets[0].addRule('div', 'behavior: url(ui/default/iepngfix.htc)'); + document.styleSheets[0].addRule('.slide', 'behavior: url(ui/default/iepngfix.htc)'); + } +} + +function getIncrementals(obj) { + var incrementals = new Array(); + if (!obj) + return incrementals; + var children = obj.childNodes; + for (var i = 0; i < children.length; i++) { + var child = children[i]; + if (hasClass(child, 'incremental')) { + if (child.nodeName == 'OL' || child.nodeName == 'UL') { + removeClass(child, 'incremental'); + for (var j = 0; j < child.childNodes.length; j++) { + if (child.childNodes[j].nodeType == 1) { + addClass(child.childNodes[j], 'incremental'); + } + } + } else { + incrementals[incrementals.length] = child; + removeClass(child,'incremental'); + } + } + if (hasClass(child, 'show-first')) { + if (child.nodeName == 'OL' || child.nodeName == 'UL') { + removeClass(child, 'show-first'); + if (child.childNodes[isGe].nodeType == 1) { + removeClass(child.childNodes[isGe], 'incremental'); + } + } else { + incrementals[incrementals.length] = child; + } + } + incrementals = incrementals.concat(getIncrementals(child)); + } + return incrementals; +} + +function createIncrementals() { + var incrementals = new Array(); + for (var i = 0; i < smax; i++) { + incrementals[i] = getIncrementals(document.getElementById('slide'+i)); } + return incrementals; +} + +function defaultCheck() { + var allMetas = document.getElementsByTagName('meta'); + for (var i = 0; i< allMetas.length; i++) { + if (allMetas[i].name == 'defaultView') { + defaultView = allMetas[i].content; + } + if (allMetas[i].name == 'controlVis') { + controlVis = allMetas[i].content; + } + } +} + +// Key trap fix, new function body for trap() +function trap(e) { + if (!e) { + e = event; + e.which = e.keyCode; + } + try { + modifierKey = e.ctrlKey || e.altKey || e.metaKey; + } + catch(e) { + modifierKey = false; + } + return modifierKey || e.which == 0; } function startup() { + defaultCheck(); if (!isOp) createControls(); slideLabel(); - if (!isOp) { + fixLinks(); + externalLinks(); + fontScale(); + if (!isOp) { notOperaFix(); + incrementals = createIncrementals(); slideJump(); + if (defaultView == 'outline') { + toggle(); + } document.onkeyup = keys; + document.onkeypress = trap; document.onclick = clicker; } } window.onload = startup; +window.onresize = function(){setTimeout('fontScale()', 50);} \ No newline at end of file From philikon at codespeak.net Sat Jun 10 16:31:47 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 16:31:47 +0200 (CEST) Subject: [z3-checkins] r28619 - z3/Sfive/trunk Message-ID: <20060610143147.3FD5710060@code0.codespeak.net> Author: philikon Date: Sat Jun 10 16:31:40 2006 New Revision: 28619 Modified: z3/Sfive/trunk/browser.py Log: Use docutils 0.4.0's ability to render s5 compatible markup instead of trying to do all sorts of weird monkey business... Modified: z3/Sfive/trunk/browser.py ============================================================================== --- z3/Sfive/trunk/browser.py (original) +++ z3/Sfive/trunk/browser.py Sat Jun 10 16:31:40 2006 @@ -1,46 +1,26 @@ import os -from StringIO import StringIO -from datetime import date -from zope.app import zapi -from zope.app.renderer.interfaces import IHTMLRenderer -from Products.Five import BrowserView - -class PresentationView(BrowserView): - - def render(self): - source = zapi.createObject(None, self.context.type, - self.context.text) - renderer = zapi.getMultiAdapter((source, self.request), IHTMLRenderer) - #return renderer.render() - #XXX work around a bug in docutils or so - return renderer.render().decode('utf-8') - - def renderAndAdjust(self): - body = self.render() - body = body.strip() - body = body[23:-7] - #body.replace('

', '') - body = body.replace('

', '

') - body = body.replace('

', '') - return body - - def renderAndAdjustLXML(self): - from lxml import etree - body = self.render() - - xsltfile = os.path.join(os.path.dirname(__file__), 'transform.xsl') - xslt = file(xsltfile) - xslt_doc = etree.parse(xslt) - style = etree.XSLT(xslt_doc) - - body = body.strip() #XXX work around a bug in lxml - bodyfile = StringIO(body) - doc = etree.parse(bodyfile) - result = style.apply(doc) - return style.tostring(result) +import datetime +import docutils.core +from docutils.writers import s5_html +from zope.traversing.browser import absoluteURL +from zope.publisher.browser import BrowserPage + +class ViewPresentation(BrowserPage): + + def __call__(self): + return docutils.core.publish_string( + self.context.text, + writer = s5_html.Writer(), + settings_overrides = { + 'input_encoding': 'unicode', + 'output_encoding': 'unicode', + 'theme': None, + 'theme_url': (absoluteURL(self.context, self.request) + + '/++resource++s5ui') + } + ) def todaysDate(self): - today = date.today() + today = datetime.date.today() #XXX should use locale formatter here return today.strftime("%d %b %Y") From philikon at codespeak.net Sat Jun 10 16:34:03 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 16:34:03 +0200 (CEST) Subject: [z3-checkins] r28620 - z3/Sfive/trunk Message-ID: <20060610143403.C1F7810060@code0.codespeak.net> Author: philikon Date: Sat Jun 10 16:33:56 2006 New Revision: 28620 Removed: z3/Sfive/trunk/renderer.zcml Log: THis is no longer needed since we aren't using ozpe.app.renderer naymore Deleted: /z3/Sfive/trunk/renderer.zcml ============================================================================== --- /z3/Sfive/trunk/renderer.zcml Sat Jun 10 16:33:56 2006 +++ (empty file) @@ -1,28 +0,0 @@ - - - - - - - - - - - From philikon at codespeak.net Sat Jun 10 16:36:16 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 16:36:16 +0200 (CEST) Subject: [z3-checkins] r28621 - z3/Sfive/trunk Message-ID: <20060610143616.888ED10053@code0.codespeak.net> Author: philikon Date: Sat Jun 10 16:36:10 2006 New Revision: 28621 Modified: z3/Sfive/trunk/configure.zcml Log: Make Zope 2.10 ready: * five;traversable and five:defaultViewable aren't needed anymore (instead we have a browser:defaultView declaration) * Use short spelling of adapter registration * register presentation class as Zope 2 meta type with add form etc (very nice, yuppy). Added an "Add presentations" permission for that Modified: z3/Sfive/trunk/configure.zcml ============================================================================== --- z3/Sfive/trunk/configure.zcml (original) +++ z3/Sfive/trunk/configure.zcml Sat Jun 10 16:36:10 2006 @@ -2,39 +2,47 @@ xmlns:browser="http://namespaces.zope.org/browser" xmlns:five="http://namespaces.zope.org/five" xmlns:i18n="http://namespaces.zope.org/i18n" - i18n_domain="sfive"> + xmlns:zcml="http://namespaces.zope.org/zcml" + i18n_domain="sfive" + > - - + - + - - - - - + + - + + - From philikon at codespeak.net Sat Jun 10 16:40:33 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 16:40:33 +0200 (CEST) Subject: [z3-checkins] r28622 - z3/Sfive/trunk Message-ID: <20060610144033.83D4B10053@code0.codespeak.net> Author: philikon Date: Sat Jun 10 16:40:25 2006 New Revision: 28622 Modified: z3/Sfive/trunk/README.txt Log: documentation update Modified: z3/Sfive/trunk/README.txt ============================================================================== --- z3/Sfive/trunk/README.txt (original) +++ z3/Sfive/trunk/README.txt Sat Jun 10 16:40:25 2006 @@ -2,22 +2,21 @@ ===== ``Sfive`` is a Five-based Zope 2 product for giving presentations. It -allows you to enter some form of semantically structured text (most -preferrably reStructuredText). It then renders a dynamic application -in your web browser that presents the contents in invidiual slides, -with most of the comfort you'd expect from any other presentation -program. +allows you to enter reStructuredText and then renders a dynamic +application in your web browser that presents the contents in +invidiual slides, with most of the comfort you'd expect from any other +presentation program. ``Sfive`` uses Eric A. Meyer's set of CSS stylesheets and JavaScripts called `S5`__ to create the in-browser presentation application. It -requires Five 1.1, Zope X3.0.x and lxml 0.6. +requires Zope 2.10. .. __: http://www.meyerweb.com/eric/tools/s5/ Copyright --------- -``Sfive`` is copyright (c) 2005 by Philipp "philiKON" von +``Sfive`` is copyright (c) 2005, 2006 by Philipp "philiKON" von Weitershausen. Like S5 it is released under the `Creative Commons Attribution-ShareAlike 2.0 license`__. From philikon at codespeak.net Sat Jun 10 17:00:17 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:00:17 +0200 (CEST) Subject: [z3-checkins] r28623 - z3/Sfive/trunk Message-ID: <20060610150017.7FA9210060@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:00:09 2006 New Revision: 28623 Modified: z3/Sfive/trunk/presentation.py Log: Get rid of weird __init__ (very zope 2 specific) Provide some sane default values Provide an IFactory utility component Modified: z3/Sfive/trunk/presentation.py ============================================================================== --- z3/Sfive/trunk/presentation.py (original) +++ z3/Sfive/trunk/presentation.py Sat Jun 10 17:00:09 2006 @@ -1,5 +1,6 @@ import zope.interface import zope.component +from zope.component.factory import Factory from zope.size.interfaces import ISized from zope.i18nmessageid import MessageFactory _ = MessageFactory('sfive') @@ -9,11 +10,14 @@ class Presentation(SimpleItem): zope.interface.implements(IPresentation) - meta_type = 'Sfive Presentation' - def __init__(self, id, title): - self.id = id - self.title = title + title = u'' + presenter = u'' + affiliation = u'' + location = u'' + text = u'' + +PresentationFactory = Factory(Presentation) class PresentationSize(object): """Size adapter for `Presentation`. From philikon at codespeak.net Sat Jun 10 17:00:43 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:00:43 +0200 (CEST) Subject: [z3-checkins] r28624 - z3/Sfive/trunk Message-ID: <20060610150043.33A6910060@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:00:37 2006 New Revision: 28624 Modified: z3/Sfive/trunk/presentation.py Log: M-x untabify Modified: z3/Sfive/trunk/presentation.py ============================================================================== --- z3/Sfive/trunk/presentation.py (original) +++ z3/Sfive/trunk/presentation.py Sat Jun 10 17:00:37 2006 @@ -43,10 +43,10 @@ zope.component.adapts(IPresentation) def __init__(self, context): - self.context = context + self.context = context def sizeForSorting(self): - return ('byte', len(self.context.text)) + return ('byte', len(self.context.text)) def sizeForDisplay(self): unit, chars = self.sizeForSorting() From philikon at codespeak.net Sat Jun 10 17:01:23 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:01:23 +0200 (CEST) Subject: [z3-checkins] r28625 - z3/Sfive/trunk Message-ID: <20060610150123.1569610060@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:01:17 2006 New Revision: 28625 Modified: z3/Sfive/trunk/interfaces.py Log: Get rid of unused import and use Text rather than SourceText Modified: z3/Sfive/trunk/interfaces.py ============================================================================== --- z3/Sfive/trunk/interfaces.py (original) +++ z3/Sfive/trunk/interfaces.py Sat Jun 10 17:01:17 2006 @@ -1,5 +1,5 @@ from zope.interface import Interface -from zope.schema import TextLine, SourceText, Choice +from zope.schema import TextLine, Text from zope.i18nmessageid import MessageFactory _ = MessageFactory('sfive') @@ -31,7 +31,7 @@ default=u"" ) - text = SourceText( + text = Text( title=_(u"Text"), description=_(u"Presentation text"), required=True From philikon at codespeak.net Sat Jun 10 17:02:13 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:02:13 +0200 (CEST) Subject: [z3-checkins] r28626 - z3/Sfive/trunk Message-ID: <20060610150213.9A36210060@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:02:08 2006 New Revision: 28626 Modified: z3/Sfive/trunk/browser.py Log: formlib-based forms Modified: z3/Sfive/trunk/browser.py ============================================================================== --- z3/Sfive/trunk/browser.py (original) +++ z3/Sfive/trunk/browser.py Sat Jun 10 17:02:08 2006 @@ -2,8 +2,15 @@ import datetime import docutils.core from docutils.writers import s5_html + +import zope.component from zope.traversing.browser import absoluteURL from zope.publisher.browser import BrowserPage +from zope.formlib.form import AddForm, EditForm, Fields, applyChanges +from zope.i18nmessageid import MessageFactory +_ = MessageFactory('sfive') + +from Products.Sfive.interfaces import IPresentation class ViewPresentation(BrowserPage): @@ -24,3 +31,16 @@ today = datetime.date.today() #XXX should use locale formatter here return today.strftime("%d %b %Y") + +class AddPresentation(AddForm): + form_fields = Fields(IPresentation) + label = _(u'Add Presentation') + + def create(self, data): + presentation = zope.component.createObject(u'sfive.Presentation') + applyChanges(presentation, self.form_fields, data) + return presentation + +class EditPresentation(EditForm): + form_fields = Fields(IPresentation) + label = _(u'Edit Presentation') From philikon at codespeak.net Sat Jun 10 17:02:45 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:02:45 +0200 (CEST) Subject: [z3-checkins] r28627 - z3/Sfive/trunk Message-ID: <20060610150245.6211510060@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:02:38 2006 New Revision: 28627 Modified: z3/Sfive/trunk/configure.zcml Log: Register formlib forms instead of zope.app.form-based ones. Register IFactory utility Modified: z3/Sfive/trunk/configure.zcml ============================================================================== --- z3/Sfive/trunk/configure.zcml (original) +++ z3/Sfive/trunk/configure.zcml Sat Jun 10 17:02:38 2006 @@ -27,6 +27,11 @@ /> + + - - - + + Author: philikon Date: Sat Jun 10 17:21:35 2006 New Revision: 28630 Modified: z3/Sfive/trunk/browser.py z3/Sfive/trunk/presentation.py Log: Make this package work in Zope 3 and Zope 2 alike. Modified: z3/Sfive/trunk/browser.py ============================================================================== --- z3/Sfive/trunk/browser.py (original) +++ z3/Sfive/trunk/browser.py Sat Jun 10 17:21:35 2006 @@ -6,10 +6,15 @@ import zope.component from zope.traversing.browser import absoluteURL from zope.publisher.browser import BrowserPage -from zope.formlib.form import AddForm, EditForm, Fields, applyChanges +from zope.formlib.form import Fields, applyChanges from zope.i18nmessageid import MessageFactory _ = MessageFactory('sfive') +try: + from Products.Five.formlib.formbase import AddForm, EditForm +except ImportError: + from zope.formlib import AddForm, EditForm + from Products.Sfive.interfaces import IPresentation class ViewPresentation(BrowserPage): Modified: z3/Sfive/trunk/presentation.py ============================================================================== --- z3/Sfive/trunk/presentation.py (original) +++ z3/Sfive/trunk/presentation.py Sat Jun 10 17:21:35 2006 @@ -5,7 +5,11 @@ from zope.i18nmessageid import MessageFactory _ = MessageFactory('sfive') -from OFS.SimpleItem import SimpleItem +try: + from OFS.SimpleItem import SimpleItem +except ImportError: + from persistent import Persistent as SimpleItem + from Products.Sfive.interfaces import IPresentation class Presentation(SimpleItem): From philikon at codespeak.net Sat Jun 10 17:24:46 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:24:46 +0200 (CEST) Subject: [z3-checkins] r28631 - z3/Sfive/trunk Message-ID: <20060610152446.EAB0C10064@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:24:36 2006 New Revision: 28631 Modified: z3/Sfive/trunk/browser.py z3/Sfive/trunk/presentation.py Log: We're a top-level python package now... Modified: z3/Sfive/trunk/browser.py ============================================================================== --- z3/Sfive/trunk/browser.py (original) +++ z3/Sfive/trunk/browser.py Sat Jun 10 17:24:36 2006 @@ -15,7 +15,7 @@ except ImportError: from zope.formlib import AddForm, EditForm -from Products.Sfive.interfaces import IPresentation +from sfive.interfaces import IPresentation class ViewPresentation(BrowserPage): Modified: z3/Sfive/trunk/presentation.py ============================================================================== --- z3/Sfive/trunk/presentation.py (original) +++ z3/Sfive/trunk/presentation.py Sat Jun 10 17:24:36 2006 @@ -10,7 +10,7 @@ except ImportError: from persistent import Persistent as SimpleItem -from Products.Sfive.interfaces import IPresentation +from sfive.interfaces import IPresentation class Presentation(SimpleItem): zope.interface.implements(IPresentation) From philikon at codespeak.net Sat Jun 10 17:25:19 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:25:19 +0200 (CEST) Subject: [z3-checkins] r28632 - z3/Sfive/trunk Message-ID: <20060610152519.D9DD010064@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:25:12 2006 New Revision: 28632 Added: z3/Sfive/trunk/sfive-configure.zcml (contents, props changed) Log: ZCMl slug now required Added: z3/Sfive/trunk/sfive-configure.zcml ============================================================================== --- (empty file) +++ z3/Sfive/trunk/sfive-configure.zcml Sat Jun 10 17:25:12 2006 @@ -0,0 +1 @@ + \ No newline at end of file From philikon at codespeak.net Sat Jun 10 17:38:12 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:38:12 +0200 (CEST) Subject: [z3-checkins] r28633 - z3/Sfive/trunk Message-ID: <20060610153812.ADA3E10063@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:38:00 2006 New Revision: 28633 Added: z3/Sfive/trunk/browser.zcml - copied, changed from r28627, z3/Sfive/trunk/configure.zcml Modified: z3/Sfive/trunk/configure.zcml Log: Move browser config out to browser.zcml Copied: z3/Sfive/trunk/browser.zcml (from r28627, z3/Sfive/trunk/configure.zcml) ============================================================================== --- z3/Sfive/trunk/configure.zcml (original) +++ z3/Sfive/trunk/browser.zcml Sat Jun 10 17:38:00 2006 @@ -1,47 +1,7 @@ - - - - - - - - - - - - - - - - - Modified: z3/Sfive/trunk/configure.zcml ============================================================================== --- z3/Sfive/trunk/configure.zcml (original) +++ z3/Sfive/trunk/configure.zcml Sat Jun 10 17:38:00 2006 @@ -1,5 +1,4 @@ - - - - - - - - - - + + From philikon at codespeak.net Sat Jun 10 17:39:42 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:39:42 +0200 (CEST) Subject: [z3-checkins] r28634 - z3/Sfive/trunk Message-ID: <20060610153942.7F47910063@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:39:34 2006 New Revision: 28634 Modified: z3/Sfive/trunk/TODO.txt Log: we don't support anything other than reST Modified: z3/Sfive/trunk/TODO.txt ============================================================================== --- z3/Sfive/trunk/TODO.txt (original) +++ z3/Sfive/trunk/TODO.txt Sat Jun 10 17:39:34 2006 @@ -1,4 +1,3 @@ -- test with structured text, plain text - unit and functional tests - make five support filerepresentation adapters so that i can upload presentations with FTP or HTTP PUT From philikon at codespeak.net Sat Jun 10 17:57:32 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 17:57:32 +0200 (CEST) Subject: [z3-checkins] r28635 - z3/Sfive/trunk Message-ID: <20060610155732.8D80610053@code0.codespeak.net> Author: philikon Date: Sat Jun 10 17:57:22 2006 New Revision: 28635 Modified: z3/Sfive/trunk/browser.zcml z3/Sfive/trunk/configure.zcml Log: Improve Zoep 3 compatibility: use zope.View and only bridge it to zope2.View when in Zope 2 Modified: z3/Sfive/trunk/browser.zcml ============================================================================== --- z3/Sfive/trunk/browser.zcml (original) +++ z3/Sfive/trunk/browser.zcml Sat Jun 10 17:57:22 2006 @@ -25,13 +25,13 @@ for=".interfaces.IPresentation" name="index.html" class=".browser.ViewPresentation" - permission="zope2.View" + permission="zope.View" /> Modified: z3/Sfive/trunk/configure.zcml ============================================================================== --- z3/Sfive/trunk/configure.zcml (original) +++ z3/Sfive/trunk/configure.zcml Sat Jun 10 17:57:22 2006 @@ -1,6 +1,7 @@ @@ -15,9 +16,15 @@ title="Edit Sfive Presentations" /> + + Author: philikon Date: Sat Jun 10 18:02:27 2006 New Revision: 28636 Modified: z3/Sfive/trunk/browser.py Log: last z3 compat fixes Modified: z3/Sfive/trunk/browser.py ============================================================================== --- z3/Sfive/trunk/browser.py (original) +++ z3/Sfive/trunk/browser.py Sat Jun 10 18:02:27 2006 @@ -13,13 +13,17 @@ try: from Products.Five.formlib.formbase import AddForm, EditForm except ImportError: - from zope.formlib import AddForm, EditForm + from zope.formlib.form import AddForm, EditForm from sfive.interfaces import IPresentation class ViewPresentation(BrowserPage): def __call__(self): + # Zope 3 assumes text/plain as content type + response = getattr(self.request, 'RESPONSE', self.request.response) + response.setHeader('Content-Type', 'text/html') + return docutils.core.publish_string( self.context.text, writer = s5_html.Writer(), @@ -28,7 +32,7 @@ 'output_encoding': 'unicode', 'theme': None, 'theme_url': (absoluteURL(self.context, self.request) + - '/++resource++s5ui') + '/++resource++s5ui') # this is lame } ) From philikon at codespeak.net Sat Jun 10 18:06:57 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 18:06:57 +0200 (CEST) Subject: [z3-checkins] r28637 - z3/Sfive/trunk Message-ID: <20060610160657.073C110053@code0.codespeak.net> Author: philikon Date: Sat Jun 10 18:06:46 2006 New Revision: 28637 Removed: z3/Sfive/trunk/transform.xsl Log: get rid of unnecessary file Deleted: /z3/Sfive/trunk/transform.xsl ============================================================================== --- /z3/Sfive/trunk/transform.xsl Sat Jun 10 18:06:46 2006 +++ (empty file) @@ -1,34 +0,0 @@ - - - - - - - -

- -

- - - - - - - - - - - - - - - - From philikon at codespeak.net Sat Jun 10 18:09:29 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 18:09:29 +0200 (CEST) Subject: [z3-checkins] r28638 - z3/Sfive/trunk Message-ID: <20060610160929.0C5A210053@code0.codespeak.net> Author: philikon Date: Sat Jun 10 18:09:21 2006 New Revision: 28638 Modified: z3/Sfive/trunk/TODO.txt Log: remember some todo items Modified: z3/Sfive/trunk/TODO.txt ============================================================================== --- z3/Sfive/trunk/TODO.txt (original) +++ z3/Sfive/trunk/TODO.txt Sat Jun 10 18:09:21 2006 @@ -1,3 +1,5 @@ +- bring back old functionality to display extra information +- test custom skins - unit and functional tests - make five support filerepresentation adapters so that i can upload presentations with FTP or HTTP PUT From philikon at codespeak.net Sat Jun 10 18:09:42 2006 From: philikon at codespeak.net (philikon at codespeak.net) Date: Sat, 10 Jun 2006 18:09:42 +0200 (CEST) Subject: [z3-checkins] r28639 - z3/Sfive/trunk Message-ID: <20060610160942.A1A1E10053@code0.codespeak.net> Author: philikon Date: Sat Jun 10 18:09:40 2006 New Revision: 28639 Removed: z3/Sfive/trunk/s5-blank.html Log: get rid of another unused file Deleted: /z3/Sfive/trunk/s5-blank.html ============================================================================== --- /z3/Sfive/trunk/s5-blank.html Sat Jun 10 18:09:40 2006 +++ (empty file) @@ -1,56 +0,0 @@ - - - - - -[slide show title here] - - - - - - - - -

- -

- - - -

- - -

- -

[slide show title here]

[name of presenter]

[affiliation of presenter]

- - -

[slide title]

[point one]
[point two]
[point three]
[point four]
[point five]

-[any material that should appear in print but not on the slide] -

- - -

- - - From paul at codespeak.net Mon Jun 12 08:53:01 2006 From: paul at codespeak.net (paul at codespeak.net) Date: Mon, 12 Jun 2006 08:53:01 +0200 (CEST) Subject: [z3-checkins] r28693 - in z3/bdbxml/trunk: . xmlsite xmlsite/archived Message-ID: <20060612065301.9B84510036@code0.codespeak.net> Author: paul Date: Mon Jun 12 08:52:57 2006 New Revision: 28693 Added: z3/bdbxml/trunk/ z3/bdbxml/trunk/xmlsite/ z3/bdbxml/trunk/xmlsite/__init__.py z3/bdbxml/trunk/xmlsite/archived/ z3/bdbxml/trunk/xmlsite/archived/bdbxmlcontainer.py z3/bdbxml/trunk/xmlsite/configure.zcml z3/bdbxml/trunk/xmlsite/interfaces.py z3/bdbxml/trunk/xmlsite/xmldbcontainer.py z3/bdbxml/trunk/xmlsite/xmlpage.py Log: Getting this re-organized. Still a lot to do: everything requires authentication, no actually transforming stuff into HTML, no tests, etc. Added: z3/bdbxml/trunk/xmlsite/__init__.py ============================================================================== --- (empty file) +++ z3/bdbxml/trunk/xmlsite/__init__.py Mon Jun 12 08:52:57 2006 @@ -0,0 +1 @@ +# Make a Python package Added: z3/bdbxml/trunk/xmlsite/archived/bdbxmlcontainer.py ============================================================================== --- (empty file) +++ z3/bdbxml/trunk/xmlsite/archived/bdbxmlcontainer.py Mon Jun 12 08:52:57 2006 @@ -0,0 +1,139 @@ +__doc__=""" +Make a Zope 3 container datastructure, ala BTreeContainer, based on Berkeley DB XML. + +This module contains no Zope 3 specific code and can run without Zope 3. +""" + +import os +from bsddb3 import db +from bsddb3 import * +from dbxml import * +#from xmlpage import XMLPage + +class BDBXMLContainer: + """A class to manage content in Berkeley DB XML databases.""" + + def __init__(self, fn): + self.mgr = XmlManager() + self.container = self.mgr.openContainer(fn) + self.container.addAlias("content") + + self.__data = self.getAllDocuments() + + + def xxxgetDatabase(self): + mgr = XmlManager() + container = mgr.openContainer(self.containername, + db.DB_CREATE) + # Let's add an alias to make XQuery expressions simpler + container.addAlias("content") + + return mgr, container + + + def get(self, key): + return self.__data.get(key) + + def has_key(self, key): + return self.__data.has_key(key) + + def keys(self): + return self.__data.keys() + + def items(self): + return self.__data.items() + + def values(self): + return self.__data.values() + + def __len__(self): + return len(self.__data) + + + ####### + + def getAllIds(self): + """Return the id of each document in the database""" + mgr, container = self.getDatabase() + + qc = mgr.createQueryContext() + querystring = "collection('content')/*" + results = mgr.query(querystring, qc) + response = [] + for result in results: + doc = result.asDocument() + docname = doc.getName() + response.append(docname) + + + container.close() + return response + + def getAllDocuments(self): + """Dump of every document in the database, for iterators""" + + qc = self.mgr.createQueryContext() + querystring = "collection('content')/*" + results = self.mgr.query(querystring, qc) + data = {} + for result in results: + doc = result.asDocument() + docname = doc.getName() + thispage = result.asString() + data[docname] = thispage + + return data + + def xxxgetDocument(self, name): + """Retrieve a document with the published name""" + + mgr = XmlManager() + uc = mgr.createUpdateContext() + container = mgr.openContainer("var/stuff.dbxml") + document = container.getDocument(str(name)) + s = document.getContent() + container.close() + + return s + + +def loadDirectory(): + dirname = "/Users/paul/zeaprojects/mobility/trunk/src/mobilib/sampledata" + containername = "var/stuff.dbxml" + + + environment = db.DBEnv() + environment.open(None, DB_CREATE|DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN, 0) + mgr = XmlManager(environment, 0) + uc = mgr.createUpdateContext() + container = mgr.createContainer(containername, DBXML_TRANSACTIONAL) + + + for fn in os.listdir(dirname): + print fn + if fn[-4:] != ".xml": + continue + fullfn = os.path.join(dirname, fn) + xtxn = mgr.createTransaction(); + document = mgr.createDocument() + book_content = open(fullfn).read() + document.setContent(book_content) + document.setName(fn) + container.putDocument(xtxn, document, uc) + #del document # holds ref on container + xtxn.commit() + del document + + del container # prevents removal + environment.close(0) + return + + + +def main(): + #b = BDBXMLContainer("/tmp/z3bdbxml.dbxml") + #print b.getAllDocuments() + loadDirectory() + #b.test() + +if __name__ == "__main__": main() Added: z3/bdbxml/trunk/xmlsite/configure.zcml ============================================================================== --- (empty file) +++ z3/bdbxml/trunk/xmlsite/configure.zcml Mon Jun 12 08:52:57 2006 @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: z3/bdbxml/trunk/xmlsite/interfaces.py ============================================================================== --- (empty file) +++ z3/bdbxml/trunk/xmlsite/interfaces.py Mon Jun 12 08:52:57 2006 @@ -0,0 +1,26 @@ + +from zope.interface import Interface +from zope.schema import Text +from zope.app.container.interfaces import IContained, IContainer + +class IXMLSite(IContainer): + """The XMLSite folder is the base object for our package.""" + + description = Text( + title=u"Description", + description=u"A detailed description of the content of the xml site.", + default=u"", + required=False) + +class IXMLPage(IContained): + """Take an XML document from DBXML and make a component""" + + xmlstring = Text( + title=u"xmlstring", + description=u"A blog of XML.", + default=u"", + required=False) + +class IBDBXMLConnection(Interface): + """Fake stuff""" + Added: z3/bdbxml/trunk/xmlsite/xmldbcontainer.py ============================================================================== --- (empty file) +++ z3/bdbxml/trunk/xmlsite/xmldbcontainer.py Mon Jun 12 08:52:57 2006 @@ -0,0 +1,159 @@ +from zope.app.container.contained import Contained + +from xmlpage import XMLPage +from interfaces import IXMLSite, IBDBXMLConnection +from bsddb3 import * +from dbxml import * + +from zope.component import getUtility +from zope.component.interfaces import IFactory +from zope.interface import implementedBy, implements + + +class BDBXMLConnectionFactory: + implements(IFactory) + title = u"Re-use database connections" + description = u"This factory instantiates" + + def __init__(self): + fn = "var/stuff.dbxml" + self.mgr = XmlManager() + self.container = self.mgr.openContainer(fn) + self.container.addAlias("content") + + def __call__(self): + return BDBXMLConnection(self.mgr, self.container) + + def getInterfaces(self): + return implementedBy(BDBXMLConnection) + + +class BDBXMLConnection(object): + implements(IBDBXMLConnection) + + def __init__(self, mgr, container): + self.mgr = mgr + self.container = container + + def listDocumentIDs(self): + """Provide a list of the ids in the database""" + + qc = self.mgr.createQueryContext() + querystring = "collection('content')/*" + results = self.mgr.query(querystring, qc) + response = [unicode(result.asDocument().getName()) for result in results] + return response + + def countDocuments(self): + """Provide a count of documents in the database""" + + qc = self.mgr.createQueryContext() + querystring = "collection('content')/*" + results = self.mgr.query(querystring, qc) + return results.size() + + def getDocument(self, name): + """Given an document identifier, get a string representation""" + + document = self.container.getDocument(str(name)) + xmlstring = unicode(document.getContent()) + return xmlstring + + def getAllDocuments(self): + """Provide a mapping of all documents in the database""" + + qc = self.mgr.createQueryContext() + querystring = "collection('content')/*" + results = self.mgr.query(querystring, qc) + data = {} + for result in results: + doc = result.asDocument() + docname = doc.getName() + thispage = result.asString() + data[docname] = thispage + + return data + +class XMLSite(Contained): + """A very simple implementation of an xmlsite using Berkeley DB XML. + """ + + implements(IXMLSite) + + description = u'' + docname = u"Some Document Here" + + def getConnection(self): + bdbxml_factory = getUtility(IFactory, u"xmlsite.BDBXMLConnection") + connection = bdbxml_factory() + return connection + + def keys(self): + '''See interface `IReadContainer`''' + connection = self.getConnection() + return connection.listDocumentIDs() + + def __iter__(self): + connection = self.getConnection() + return iter(connection.getAllDocuments()) + + def __getitem__(self, key): + '''See interface `IReadContainer`''' + + connection = self.getConnection() + xmlstring = connection.getDocument(key) + + page = XMLPage() + page.__parent__ = self + page.__name__ = key + page.init(xmlstring) + return page + + def get(self, key, default=None): + '''See interface `IReadContainer`''' + + return self.__getitem__(key) + + def values(self): + '''See interface `IReadContainer`''' + connection = self.getConnection() + return connection.getAllDocuments().values() + + def __len__(self): + '''See interface `IReadContainer`''' + connection = self.getConnection() + return connection.countDocuments() + + def items(self): + '''See interface `IReadContainer`''' + connection = self.getConnection() + return connection.getAllDocuments().items() + + def __contains__(self, key): + '''See interface `IReadContainer`''' + + # TODO: Make a bettery XQuery than this brute force + connection = self.getConnection() + return connection.getAllDocuments().has_key(key) + + has_key = __contains__ + + def __setitem__(self, key, object): + '''See interface `IWriteContainer`''' + x127 + setitem(self, self.__data.__setitem__, key, object) + + def __delitem__(self, key): + '''See interface `IWriteContainer`''' + + x128 + uncontained(self.__data[key], self, key) + del self.__data[key] + +def main(): + + xmlsite = XMLSite() + connection = xmlsite.getConnection() + connection.listDocumentIDs() + +if __name__ == "__main__": main() \ No newline at end of file Added: z3/bdbxml/trunk/xmlsite/xmlpage.py ============================================================================== --- (empty file) +++ z3/bdbxml/trunk/xmlsite/xmlpage.py Mon Jun 12 08:52:57 2006 @@ -0,0 +1,22 @@ +""" +Simple representation of a page to return to the publisher. + +""" + +from zope.app.container.contained import Contained +from interfaces import IXMLPage +from zope.interface import implements + + +class XMLPage(Contained): + + implements(IXMLPage) + xmlstring = u"

Default from the class...

" + + def init(self, xmlstring): + self.xmlstring = xmlstring + + def __call__(self): + response = self.context.xmlstring + return '%s' % response + From paul at codespeak.net Mon Jun 12 10:32:28 2006 From: paul at codespeak.net (paul at codespeak.net) Date: Mon, 12 Jun 2006 10:32:28 +0200 (CEST) Subject: [z3-checkins] r28696 - z3/bdbxml/trunk/xmlsite Message-ID: <20060612083228.634411000C@code0.codespeak.net> Author: paul Date: Mon Jun 12 10:32:22 2006 New Revision: 28696 Removed: z3/bdbxml/trunk/xmlsite/xmlpage.py Modified: z3/bdbxml/trunk/xmlsite/__init__.py z3/bdbxml/trunk/xmlsite/configure.zcml z3/bdbxml/trunk/xmlsite/interfaces.py z3/bdbxml/trunk/xmlsite/xmldbcontainer.py Log: Refactored into parts that use Zope 3 (__init__.py) and parts that do not (xmldbcontainer.py) Modified: z3/bdbxml/trunk/xmlsite/__init__.py ============================================================================== --- z3/bdbxml/trunk/xmlsite/__init__.py (original) +++ z3/bdbxml/trunk/xmlsite/__init__.py Mon Jun 12 10:32:22 2006 @@ -1 +1,139 @@ -# Make a Python package +""" +Publish content from an XML DB. + +This package makes a Berkeley DB XML database into a Zope 3 folder/site. URLs turn into XQuery statements +that calculate results and retrieve documents. The documents are then converted into XHTML and a theme is +applied. + +This __init__.py module provides all the Zope-specific wiring. The other modules can be run from the command +line or via the doctests. + +""" + +from zope.app.container.contained import Contained +from zope.component import getUtility +from zope.component.interfaces import IFactory +from zope.interface import implementedBy, implements + +from xmldbcontainer import BDBXMLContainer, openDatabase +from interfaces import IXMLSite, IXMLPage, IBDBXMLConnection + + +class BDBXMLConnectionFactory: + implements(IFactory) + title = u"Re-use BDBXML Managers and Containers across requests" + description = u"This utility keeps a connection open to the xml db." + + def __init__(self): + fn = "var/samplesite.dbxml" + self.environment, self.mgr, self.container = openDatabase(fn, True) + + def __call__(self): + return BDBXMLConnection(self.environment, self.mgr, self.container) + + def getInterfaces(self): + return implementedBy(BDBXMLConnection) + + +class BDBXMLConnection(BDBXMLContainer): + implements(IBDBXMLConnection) + + +class XMLSite(Contained): + """A very simple implementation of an xmlsite using Berkeley DB XML. + """ + + implements(IXMLSite) + + description = u'' + docname = u"Some Document Here" + + def getConnection(self): + bdbxml_factory = getUtility(IFactory, u"xmlsite.BDBXMLConnection") + connection = bdbxml_factory() + return connection + + def keys(self): + '''See interface `IReadContainer`''' + connection = self.getConnection() + return connection.listDocumentIDs() + + def __iter__(self): + connection = self.getConnection() + return iter(connection.getAllDocuments()) + + def __getitem__(self, key): + '''See interface `IReadContainer`''' + + connection = self.getConnection() + xmlstring = connection.getDocument(key) + + page = XMLPage() + page.__parent__ = self + page.__name__ = key + page.init(xmlstring) + return page + + def get(self, key, default=None): + '''See interface `IReadContainer`''' + + return self.__getitem__(key) + + def values(self): + '''See interface `IReadContainer`''' + connection = self.getConnection() + return connection.getAllDocuments().values() + + def __len__(self): + '''See interface `IReadContainer`''' + connection = self.getConnection() + return connection.countDocuments() + + def items(self): + '''See interface `IReadContainer`''' + connection = self.getConnection() + return connection.getAllDocuments().items() + + def __contains__(self, key): + '''See interface `IReadContainer`''' + + # TODO: Make a bettery XQuery than this brute force + connection = self.getConnection() + return connection.getAllDocuments().has_key(key) + + has_key = __contains__ + + def __setitem__(self, key, object): + '''See interface `IWriteContainer`''' + x127 + setitem(self, self.__data.__setitem__, key, object) + + def __delitem__(self, key): + '''See interface `IWriteContainer`''' + + x128 + uncontained(self.__data[key], self, key) + del self.__data[key] + + +class XMLPage(Contained): + """Simple representation of a page to return to the publisher.""" + + implements(IXMLPage) + xmlstring = u"

Default from the class...

" + + def init(self, xmlstring): + self.xmlstring = xmlstring + + def __call__(self): + response = self.context.xmlstring + return '%s' % response + + +def main(): + + xmlsite = XMLSite() + connection = xmlsite.getConnection() + connection.listDocumentIDs() + +if __name__ == "__main__": main() \ No newline at end of file Modified: z3/bdbxml/trunk/xmlsite/configure.zcml ============================================================================== --- z3/bdbxml/trunk/xmlsite/configure.zcml (original) +++ z3/bdbxml/trunk/xmlsite/configure.zcml Mon Jun 12 10:32:22 2006 @@ -7,12 +7,12 @@ type="zope.app.content.interfaces.IContentType" /> - + - + @@ -78,7 +78,7 @@ Modified: z3/bdbxml/trunk/xmlsite/interfaces.py ============================================================================== --- z3/bdbxml/trunk/xmlsite/interfaces.py (original) +++ z3/bdbxml/trunk/xmlsite/interfaces.py Mon Jun 12 10:32:22 2006 @@ -12,6 +12,7 @@ default=u"", required=False) + class IXMLPage(IContained): """Take an XML document from DBXML and make a component""" @@ -21,6 +22,7 @@ default=u"", required=False) + class IBDBXMLConnection(Interface): - """Fake stuff""" + """Marker for the factory""" Modified: z3/bdbxml/trunk/xmlsite/xmldbcontainer.py ============================================================================== --- z3/bdbxml/trunk/xmlsite/xmldbcontainer.py (original) +++ z3/bdbxml/trunk/xmlsite/xmldbcontainer.py Mon Jun 12 10:32:22 2006 @@ -1,37 +1,43 @@ -from zope.app.container.contained import Contained +""" +Provide a mapping-like interface to a Berkeley DB XML database. -from xmlpage import XMLPage -from interfaces import IXMLSite, IBDBXMLConnection -from bsddb3 import * -from dbxml import * +""" -from zope.component import getUtility -from zope.component.interfaces import IFactory -from zope.interface import implementedBy, implements +import os +from bsddb3 import db +from dbxml import * +def openDatabase(fullfilename, makeDefaultContent=True): + """Open a bdbxml container and return a manager and container.""" -class BDBXMLConnectionFactory: - implements(IFactory) - title = u"Re-use database connections" - description = u"This factory instantiates" - - def __init__(self): - fn = "var/stuff.dbxml" - self.mgr = XmlManager() - self.container = self.mgr.openContainer(fn) - self.container.addAlias("content") + # TODO: Get more resilient way to grab an INSTANCE_HOME's var + sitedir = os.path.dirname(fullfilename) + dirname = os.path.join(sitedir, "sampledata") + os.chdir(sitedir) + containername = "samplesite.dbxml" + + # Make a transactional connection to the database + environment = db.DBEnv() + environment.open(None, db.DB_CREATE|db.DB_INIT_LOCK|db.DB_INIT_LOG|db.DB_INIT_MPOOL|db.DB_INIT_TXN, 0) + mgr = XmlManager(environment, 0) - def __call__(self): - return BDBXMLConnection(self.mgr, self.container) - - def getInterfaces(self): - return implementedBy(BDBXMLConnection) + if not os.path.exists(containername): + # Load some content using the function below + container = mgr.createContainer(containername, DBXML_TRANSACTIONAL) + container.addAlias("content") + if makeDefaultContent: + loadSampleContent(environment, mgr, container) + else: + # Database exists + container = mgr.openContainer(containername, DBXML_TRANSACTIONAL) + container.addAlias("content") + return environment, mgr, container -class BDBXMLConnection(object): - implements(IBDBXMLConnection) +class BDBXMLContainer(object): - def __init__(self, mgr, container): + def __init__(self, environment, mgr, container): + self.environment = environment self.mgr = mgr self.container = container @@ -74,86 +80,31 @@ return data -class XMLSite(Contained): - """A very simple implementation of an xmlsite using Berkeley DB XML. - """ +def loadSampleContent(environment, mgr, container): + """Utility function to bulk load some data""" - implements(IXMLSite) - - description = u'' - docname = u"Some Document Here" + sitedir = "/Users/paul/sandboxes/z3/bdbxml/trunk/examples/site1" + dirname = os.path.join(sitedir, "sampledata") - def getConnection(self): - bdbxml_factory = getUtility(IFactory, u"xmlsite.BDBXMLConnection") - connection = bdbxml_factory() - return connection - - def keys(self): - '''See interface `IReadContainer`''' - connection = self.getConnection() - return connection.listDocumentIDs() - - def __iter__(self): - connection = self.getConnection() - return iter(connection.getAllDocuments()) - - def __getitem__(self, key): - '''See interface `IReadContainer`''' - - connection = self.getConnection() - xmlstring = connection.getDocument(key) - - page = XMLPage() - page.__parent__ = self - page.__name__ = key - page.init(xmlstring) - return page + uc = mgr.createUpdateContext() - def get(self, key, default=None): - '''See interface `IReadContainer`''' - - return self.__getitem__(key) + for fn in os.listdir(dirname): + if fn[-4:] != ".xml": + continue + fullfn = os.path.join(dirname, fn) + xtxn = mgr.createTransaction(); + document = mgr.createDocument() + doc_content = open(fullfn).read() + document.setContent(doc_content) + document.setName(fn) + container.putDocument(xtxn, document, uc) + xtxn.commit() + del document - def values(self): - '''See interface `IReadContainer`''' - connection = self.getConnection() - return connection.getAllDocuments().values() - - def __len__(self): - '''See interface `IReadContainer`''' - connection = self.getConnection() - return connection.countDocuments() - - def items(self): - '''See interface `IReadContainer`''' - connection = self.getConnection() - return connection.getAllDocuments().items() - - def __contains__(self, key): - '''See interface `IReadContainer`''' - - # TODO: Make a bettery XQuery than this brute force - connection = self.getConnection() - return connection.getAllDocuments().has_key(key) - - has_key = __contains__ - - def __setitem__(self, key, object): - '''See interface `IWriteContainer`''' - x127 - setitem(self, self.__data.__setitem__, key, object) - - def __delitem__(self, key): - '''See interface `IWriteContainer`''' - - x128 - uncontained(self.__data[key], self, key) - del self.__data[key] + return def main(): + containername = "../examples/site1/var/samplesite.dbxml" + environment, mgr, container = openDatabase(containername, True) - xmlsite = XMLSite() - connection = xmlsite.getConnection() - connection.listDocumentIDs() - if __name__ == "__main__": main() \ No newline at end of file Deleted: /z3/bdbxml/trunk/xmlsite/xmlpage.py ============================================================================== --- /z3/bdbxml/trunk/xmlsite/xmlpage.py Mon Jun 12 10:32:22 2006 +++ (empty file) @@ -1,22 +0,0 @@ -""" -Simple representation of a page to return to the publisher. - -""" - -from zope.app.container.contained import Contained -from interfaces import IXMLPage -from zope.interface import implements - - -class XMLPage(Contained): - - implements(IXMLPage) - xmlstring = u"

Default from the class...

" - - def init(self, xmlstring): - self.xmlstring = xmlstring - - def __call__(self): - response = self.context.xmlstring - return '%s' % response - From faassen at codespeak.net Thu Jun 15 15:08:29 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 15:08:29 +0200 (CEST) Subject: [z3-checkins] r28812 - z3/hurry.workflow Message-ID: <20060615130829.6188E10074@code0.codespeak.net> Author: faassen Date: Thu Jun 15 15:08:28 2006 New Revision: 28812 Added: z3/hurry.workflow/ Log: Create separate hurry.workflow package. From faassen at codespeak.net Thu Jun 15 15:08:45 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 15:08:45 +0200 (CEST) Subject: [z3-checkins] r28813 - z3/hurry.workflow/trunk Message-ID: <20060615130845.3D9B41007D@code0.codespeak.net> Author: faassen Date: Thu Jun 15 15:08:44 2006 New Revision: 28813 Added: z3/hurry.workflow/trunk/ - copied from r28812, z3/hurry/trunk/ Log: Separate out hurry.workflow package in preparation for eggification. From faassen at codespeak.net Thu Jun 15 15:14:21 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 15:14:21 +0200 (CEST) Subject: [z3-checkins] r28814 - in z3/hurry.workflow/trunk: . src/hurry src/hurry/file src/hurry/query Message-ID: <20060615131421.9F20610063@code0.codespeak.net> Author: faassen Date: Thu Jun 15 15:14:20 2006 New Revision: 28814 Added: z3/hurry.workflow/trunk/hurry.workflow-configure.zcml Removed: z3/hurry.workflow/trunk/VERSION.txt z3/hurry.workflow/trunk/hurry-configure.zcml z3/hurry.workflow/trunk/src/hurry/configure.zcml z3/hurry.workflow/trunk/src/hurry/file/ z3/hurry.workflow/trunk/src/hurry/query/ z3/hurry.workflow/trunk/zc.catalog-configure.zcml Modified: z3/hurry.workflow/trunk/CHANGES.txt z3/hurry.workflow/trunk/CREDITS.txt z3/hurry.workflow/trunk/INSTALL.txt z3/hurry.workflow/trunk/LICENSE.txt z3/hurry.workflow/trunk/README.txt z3/hurry.workflow/trunk/src/hurry/__init__.py Log: Lots of cleanups to separate out hurry.workflow from hurry. Modified: z3/hurry.workflow/trunk/CHANGES.txt ============================================================================== --- z3/hurry.workflow/trunk/CHANGES.txt (original) +++ z3/hurry.workflow/trunk/CHANGES.txt Thu Jun 15 15:14:20 2006 @@ -1,5 +1,12 @@ -hurry changes -============= +hurry.workflow changes +====================== + +unreleased +---------- + +* separate out from hurry package into hurry.workflow + +* eggification work 0.8 (2006-05-01) ---------------- Modified: z3/hurry.workflow/trunk/CREDITS.txt ============================================================================== --- z3/hurry.workflow/trunk/CREDITS.txt (original) +++ z3/hurry.workflow/trunk/CREDITS.txt Thu Jun 15 15:14:20 2006 @@ -4,5 +4,5 @@ Martijn Faassen - initial and main developer Jan-Wijbrand Kolman - suggestions and feedback -The hurry library for Zope 3 was originally developed at Infrae -(http://www.infrae.com). +The hurry.workflow library for Zope 3 was originally developed at +Infrae (http://www.infrae.com). Modified: z3/hurry.workflow/trunk/INSTALL.txt ============================================================================== --- z3/hurry.workflow/trunk/INSTALL.txt (original) +++ z3/hurry.workflow/trunk/INSTALL.txt Thu Jun 15 15:14:20 2006 @@ -1,14 +1,8 @@ Installation ------------ -Hurry needs Zope 3.1 or Zope 3.2. +hurry.workflow needs Zope 3.3. -Make sure hurry's src directory is on the Python path somehow, and -then copy hurry-configure.zcml into your Zope's `etc/package-includes` -directory. - -hurry.query also has support for zc.catalog SetIndexes in -hurry.query.set. If you want to use this extension, you need to -install zc.catalog. It can be found in Zope's SVN repository. You -then also need to copy `zc.catalog-configure.zcml` into your Zope's +Make sure hurry.workflow's src directory is on the Python path +somehow, and then copy hurry.workflow-configure.zcml into your Zope's `etc/package-includes` directory. Modified: z3/hurry.workflow/trunk/LICENSE.txt ============================================================================== --- z3/hurry.workflow/trunk/LICENSE.txt (original) +++ z3/hurry.workflow/trunk/LICENSE.txt Thu Jun 15 15:14:20 2006 @@ -1,4 +1,4 @@ -Copyright (c) 2005 Infrae. All rights reserved. +Copyright (c) 2005-2006 Infrae. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are Modified: z3/hurry.workflow/trunk/README.txt ============================================================================== --- z3/hurry.workflow/trunk/README.txt (original) +++ z3/hurry.workflow/trunk/README.txt Thu Jun 15 15:14:20 2006 @@ -1,17 +1,2 @@ -Packages that could be generic and eventually might, in changed form, -end up in the Zope 3 core or Zope 3 ECM, but that we (at Infrae) built -in isolation for now, as we're in a hurry to use them. - -It includes: - -hurry.query - higher level query system built on top of the Zope 3 - catalog. Some inspiration came from Dieter Maurer's - AdvancedQuery. See src/hurry/query/query.txt for - documentation. - hurry.workflow - a simple but quite nifty workflow system. See src/hurry/workflow/workflow.txt for documentation. - -hurry.file - advanced file widget which tries its best to behave like - other widgets. See the doctest in - src/hurry/file/browser/file.txt for some documentation. Deleted: /z3/hurry.workflow/trunk/VERSION.txt ============================================================================== --- /z3/hurry.workflow/trunk/VERSION.txt Thu Jun 15 15:14:20 2006 +++ (empty file) @@ -1 +0,0 @@ -0.8 Deleted: /z3/hurry.workflow/trunk/hurry-configure.zcml ============================================================================== --- /z3/hurry.workflow/trunk/hurry-configure.zcml Thu Jun 15 15:14:20 2006 +++ (empty file) @@ -1,3 +0,0 @@ - - Added: z3/hurry.workflow/trunk/hurry.workflow-configure.zcml ============================================================================== --- (empty file) +++ z3/hurry.workflow/trunk/hurry.workflow-configure.zcml Thu Jun 15 15:14:20 2006 @@ -0,0 +1,3 @@ + + \ No newline at end of file Modified: z3/hurry.workflow/trunk/src/hurry/__init__.py ============================================================================== --- z3/hurry.workflow/trunk/src/hurry/__init__.py (original) +++ z3/hurry.workflow/trunk/src/hurry/__init__.py Thu Jun 15 15:14:20 2006 @@ -1 +1,5 @@ -# this is a package +# this is a namespace package +try: + __import__('pkg_resources').declare_namespace(__name__) +except ImportError: + pass Deleted: /z3/hurry.workflow/trunk/src/hurry/configure.zcml ============================================================================== --- /z3/hurry.workflow/trunk/src/hurry/configure.zcml Thu Jun 15 15:14:20 2006 +++ (empty file) @@ -1,11 +0,0 @@ - - - - - - - - - Deleted: /z3/hurry.workflow/trunk/zc.catalog-configure.zcml ============================================================================== --- /z3/hurry.workflow/trunk/zc.catalog-configure.zcml Thu Jun 15 15:14:20 2006 +++ (empty file) @@ -1,5 +0,0 @@ - - From faassen at codespeak.net Thu Jun 15 15:15:04 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 15:15:04 +0200 (CEST) Subject: [z3-checkins] r28815 - z3/hurry.file Message-ID: <20060615131504.2288110063@code0.codespeak.net> Author: faassen Date: Thu Jun 15 15:15:03 2006 New Revision: 28815 Added: z3/hurry.file/ Log: Create separate hurry.file package. From faassen at codespeak.net Thu Jun 15 15:15:38 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 15:15:38 +0200 (CEST) Subject: [z3-checkins] r28816 - z3/hurry.file/trunk Message-ID: <20060615131538.D736410063@code0.codespeak.net> Author: faassen Date: Thu Jun 15 15:15:38 2006 New Revision: 28816 Added: z3/hurry.file/trunk/ - copied from r28815, z3/hurry/trunk/ Log: Prepare for separation of hurry.file from the hurry package. From faassen at codespeak.net Thu Jun 15 15:18:44 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 15:18:44 +0200 (CEST) Subject: [z3-checkins] r28817 - in z3/hurry.file/trunk: . src/hurry src/hurry/query src/hurry/workflow Message-ID: <20060615131844.DA1A210063@code0.codespeak.net> Author: faassen Date: Thu Jun 15 15:18:43 2006 New Revision: 28817 Added: z3/hurry.file/trunk/hurry.file-configure.zcml - copied, changed from r28816, z3/hurry.file/trunk/hurry-configure.zcml Removed: z3/hurry.file/trunk/VERSION.txt z3/hurry.file/trunk/hurry-configure.zcml z3/hurry.file/trunk/src/hurry/configure.zcml z3/hurry.file/trunk/src/hurry/query/ z3/hurry.file/trunk/src/hurry/workflow/ z3/hurry.file/trunk/zc.catalog-configure.zcml Modified: z3/hurry.file/trunk/CHANGES.txt z3/hurry.file/trunk/CREDITS.txt z3/hurry.file/trunk/INSTALL.txt z3/hurry.file/trunk/LICENSE.txt z3/hurry.file/trunk/README.txt z3/hurry.file/trunk/src/hurry/__init__.py Log: Separating hurry.file from the rest of hurry. Modified: z3/hurry.file/trunk/CHANGES.txt ============================================================================== --- z3/hurry.file/trunk/CHANGES.txt (original) +++ z3/hurry.file/trunk/CHANGES.txt Thu Jun 15 15:18:43 2006 @@ -1,5 +1,14 @@ -hurry changes -============= +hurry.file changes +================== + +unreleased +---------- + +* separation from general hurry package into hurry.file + +* eggification + +* now require Zope 3.3 0.8 (2006-05-01) ---------------- Modified: z3/hurry.file/trunk/CREDITS.txt ============================================================================== --- z3/hurry.file/trunk/CREDITS.txt (original) +++ z3/hurry.file/trunk/CREDITS.txt Thu Jun 15 15:18:43 2006 @@ -4,5 +4,5 @@ Martijn Faassen - initial and main developer Jan-Wijbrand Kolman - suggestions and feedback -The hurry library for Zope 3 was originally developed at Infrae +The hurry.file library for Zope 3 was originally developed at Infrae (http://www.infrae.com). Modified: z3/hurry.file/trunk/INSTALL.txt ============================================================================== --- z3/hurry.file/trunk/INSTALL.txt (original) +++ z3/hurry.file/trunk/INSTALL.txt Thu Jun 15 15:18:43 2006 @@ -1,14 +1,8 @@ Installation ------------ -Hurry needs Zope 3.1 or Zope 3.2. +hurry.file requires Zope 3.3. -Make sure hurry's src directory is on the Python path somehow, and -then copy hurry-configure.zcml into your Zope's `etc/package-includes` -directory. - -hurry.query also has support for zc.catalog SetIndexes in -hurry.query.set. If you want to use this extension, you need to -install zc.catalog. It can be found in Zope's SVN repository. You -then also need to copy `zc.catalog-configure.zcml` into your Zope's +Make sure hurry.file's src directory is on the Python path somehow, +and then copy hurry.file-configure.zcml into your Zope's `etc/package-includes` directory. Modified: z3/hurry.file/trunk/LICENSE.txt ============================================================================== --- z3/hurry.file/trunk/LICENSE.txt (original) +++ z3/hurry.file/trunk/LICENSE.txt Thu Jun 15 15:18:43 2006 @@ -1,4 +1,4 @@ -Copyright (c) 2005 Infrae. All rights reserved. +Copyright (c) 2005-2006 Infrae. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are Modified: z3/hurry.file/trunk/README.txt ============================================================================== --- z3/hurry.file/trunk/README.txt (original) +++ z3/hurry.file/trunk/README.txt Thu Jun 15 15:18:43 2006 @@ -1,17 +1,3 @@ -Packages that could be generic and eventually might, in changed form, -end up in the Zope 3 core or Zope 3 ECM, but that we (at Infrae) built -in isolation for now, as we're in a hurry to use them. - -It includes: - -hurry.query - higher level query system built on top of the Zope 3 - catalog. Some inspiration came from Dieter Maurer's - AdvancedQuery. See src/hurry/query/query.txt for - documentation. - -hurry.workflow - a simple but quite nifty workflow system. See - src/hurry/workflow/workflow.txt for documentation. - hurry.file - advanced file widget which tries its best to behave like other widgets. See the doctest in src/hurry/file/browser/file.txt for some documentation. Deleted: /z3/hurry.file/trunk/VERSION.txt ============================================================================== --- /z3/hurry.file/trunk/VERSION.txt Thu Jun 15 15:18:43 2006 +++ (empty file) @@ -1 +0,0 @@ -0.8 Deleted: /z3/hurry.file/trunk/hurry-configure.zcml ============================================================================== --- /z3/hurry.file/trunk/hurry-configure.zcml Thu Jun 15 15:18:43 2006 +++ (empty file) @@ -1,3 +0,0 @@ - - Copied: z3/hurry.file/trunk/hurry.file-configure.zcml (from r28816, z3/hurry.file/trunk/hurry-configure.zcml) ============================================================================== --- z3/hurry.file/trunk/hurry-configure.zcml (original) +++ z3/hurry.file/trunk/hurry.file-configure.zcml Thu Jun 15 15:18:43 2006 @@ -1,3 +1,3 @@ - + Modified: z3/hurry.file/trunk/src/hurry/__init__.py ============================================================================== --- z3/hurry.file/trunk/src/hurry/__init__.py (original) +++ z3/hurry.file/trunk/src/hurry/__init__.py Thu Jun 15 15:18:43 2006 @@ -1 +1,5 @@ -# this is a package +# this is a namespace package +try: + __import__('pkg_resources').declare_namespace(__name__) +except ImportError: + pass Deleted: /z3/hurry.file/trunk/src/hurry/configure.zcml ============================================================================== --- /z3/hurry.file/trunk/src/hurry/configure.zcml Thu Jun 15 15:18:43 2006 +++ (empty file) @@ -1,11 +0,0 @@ - - - - - - - - - Deleted: /z3/hurry.file/trunk/zc.catalog-configure.zcml ============================================================================== --- /z3/hurry.file/trunk/zc.catalog-configure.zcml Thu Jun 15 15:18:43 2006 +++ (empty file) @@ -1,5 +0,0 @@ - - From faassen at codespeak.net Thu Jun 15 15:37:07 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 15:37:07 +0200 (CEST) Subject: [z3-checkins] r28818 - z3/hurry.workflow/trunk Message-ID: <20060615133707.140BA10053@code0.codespeak.net> Author: faassen Date: Thu Jun 15 15:37:06 2006 New Revision: 28818 Added: z3/hurry.workflow/trunk/setup.py Modified: z3/hurry.workflow/trunk/CHANGES.txt Log: eggification. Modified: z3/hurry.workflow/trunk/CHANGES.txt ============================================================================== --- z3/hurry.workflow/trunk/CHANGES.txt (original) +++ z3/hurry.workflow/trunk/CHANGES.txt Thu Jun 15 15:37:06 2006 @@ -1,13 +1,15 @@ hurry.workflow changes ====================== -unreleased ----------- +0.9 (2006-06-15) +---------------- * separate out from hurry package into hurry.workflow * eggification work +* Zope 3.3 compatibility work + 0.8 (2006-05-01) ---------------- Added: z3/hurry.workflow/trunk/setup.py ============================================================================== --- (empty file) +++ z3/hurry.workflow/trunk/setup.py Thu Jun 15 15:37:06 2006 @@ -0,0 +1,24 @@ +from setuptools import setup, find_packages + +setup( + name="hurry.workflow", + version="0.9", + packages=find_packages('src', exclude=["*.tests", "*.ftests"]), + + package_dir= {'':'src'}, + + namespace_packages=['hurry'], + package_data = { + '': ['*.txt', '*.zcml'], + }, + + zip_safe=False, + author='Infrae', + author_email='faassen at infrae.com', + description="""\ +hurry.workflow is a simple workflow system. It can be used to +implement stateful multi-version workflows for Zope 3 applications. +""", + license='BSD', + keywords="zope zope3", + ) From reebalazs at codespeak.net Thu Jun 15 16:02:58 2006 From: reebalazs at codespeak.net (reebalazs at codespeak.net) Date: Thu, 15 Jun 2006 16:02:58 +0200 (CEST) Subject: [z3-checkins] r28821 - in z3/jsonserver/branch/merge/configfeature: . tests Message-ID: <20060615140258.63C2510036@code0.codespeak.net> Author: reebalazs Date: Thu Jun 15 16:02:55 2006 New Revision: 28821 Added: z3/jsonserver/branch/merge/configfeature/ z3/jsonserver/branch/merge/configfeature/README z3/jsonserver/branch/merge/configfeature/__init__.py z3/jsonserver/branch/merge/configfeature/configure.zcml z3/jsonserver/branch/merge/configfeature/directives.py z3/jsonserver/branch/merge/configfeature/fiveconfig.py z3/jsonserver/branch/merge/configfeature/fiveconfig.zcml z3/jsonserver/branch/merge/configfeature/meta.py z3/jsonserver/branch/merge/configfeature/meta.zcml z3/jsonserver/branch/merge/configfeature/tests/ z3/jsonserver/branch/merge/configfeature/tests/__init__.py z3/jsonserver/branch/merge/configfeature/tests/__parent__.py z3/jsonserver/branch/merge/configfeature/tests/configtest.py z3/jsonserver/branch/merge/configfeature/tests/test_directive.py z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py Log: Adding configfeature directive to tree Added: z3/jsonserver/branch/merge/configfeature/README ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/README Thu Jun 15 16:02:55 2006 @@ -0,0 +1,35 @@ + +Objectives +---------- + +The goal of the program is to enable defining a feature based on +configuration values set from python code. The directive imports +a python object and uses an attribute of it as a boolean value +to declare a feature or not. + + + + + +Instance can be used as a module itself (in which case a module level +attribute can be looked up) or a class instance (in this case an attribute +of the instance will be used). If there is no such attribute on the instance, +a dictionary key access will be attempted, allowing dictionaries to be used. + +The given attribute is used as a boolean value. It must exist, or else +an error is raised. + +The featured fiveconfig.zcml serves both as an example and also can be +used to identify which version of five is in effect. The configuration +can be used both by zope configuration (by using the features), or +from python code, by directly importing the module that forms the base +for the feature setup. + +The negate attribute is only necessary to overcome the lack of negation +feature in zcml:condition. + Added: z3/jsonserver/branch/merge/configfeature/__init__.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/__init__.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,3 @@ +'''\ +Product init +''' Added: z3/jsonserver/branch/merge/configfeature/configure.zcml ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/configure.zcml Thu Jun 15 16:02:55 2006 @@ -0,0 +1,7 @@ + + + + + + Added: z3/jsonserver/branch/merge/configfeature/directives.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/directives.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,34 @@ +from zope.interface import Interface +from zope.configuration.fields import GlobalObject, Bool +from zope.schema import ASCII +from zope.app.publisher.browser.metadirectives import IBasicResourceInformation + +class IConfigFeature(IBasicResourceInformation): + """ + Defines a feature based on a python configuration + """ + + feature = ASCII( + title = u"Feature", + description = u"Name of the feature to define", + required = True, + ) + + instance = GlobalObject( + title = u'Object instance', + description = u'Dotted name of the object that holds the attribute.', + required = True, + ) + + attribute = ASCII( + title = u"Attribute", + description = u"Attribute name within the object.", + required = True, + ) + + negate = Bool( + title = u'Negate', + description = u'If to negate the boolean value, default False', + default = False, + required = False, + ) Added: z3/jsonserver/branch/merge/configfeature/fiveconfig.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/fiveconfig.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,73 @@ +'''\ +Compatibility configuration switches + +This is a transitional solution to attack the problem +of quickly changing Zope3 and Five APIs. + +Import checks are done centrally from here. +The point is that compatibility imports should fail here, +if anything goes wrong. Components should only check +the switches set from here. + +Corresponding configuration features are also set up +from the compat.zcml file. The idea is that all switches +are accessible both from python and zcml. + + +Supported versions: +------------------- + +Zope 2.9, 2.10 +Zope 3.2, 3.3 + +Compatibility matrix +-------------------- + +The following table shows which Five version can and should be used +with which Zope 2 and Zope 3 versions. + +. Zope 2.8 Zope 2.9 Zope 2.10 +. Zope X3 3.0 Zope 3.2 Zope 3.3 +Five 1.0 included +Five 1.2 X +Five 1.3 included +Five 1.4 X +Five trunk included + +''' + +__all__ = ('__compat__', ) + +class DictLike(object): + pass + +__compat__ = DictLike() + +try: + import zope.component.interface + import zope.component.location + __compat__.zope_pre_3_3 = False +except ImportError: + # The only supported pre_3_3 version is 3.2 + import zope.app.component.interface + import zope.app.location + __compat__.zope_pre_3_3 = True + +try: + import Products.Five +except ImportError: + __compat__.five = False +else: + __compat__.five = True + try: + # Zope 2.8 / Five 1.0.2 + from Products.Five.resource import Resource + __compat__.five_pre_1_3 = True + except ImportError: + # Zope 2.9 / Five 1.3 + from Products.Five.browser.resource import Resource + __compat__.five_pre_1_3 = False + +# Unsupported versions. +if __compat__.five and __compat__.five_pre_1_3: + raise Exception, 'Zope 2.8 or prior versions (Five 1.2 or prior versions) are unsupported, please upgrade!' Added: z3/jsonserver/branch/merge/configfeature/fiveconfig.zcml ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/fiveconfig.zcml Thu Jun 15 16:02:55 2006 @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + Added: z3/jsonserver/branch/merge/configfeature/meta.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/meta.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,99 @@ + +from zope.configuration.exceptions import ConfigurationError + +def configfeature(_context, feature, instance, attribute, negate=False): + """Imports a python object and uses an attribute of it as a boolean value + to declare a feature or not. + + Usage + ----- + + We can have an object with attributes, + + >>> class dictlike(object): + ... pass + >>> conf1 = dictlike() + >>> conf1.this = True + >>> conf1.that = False + + and its attributes can defined a feature if they evaluate to True. + The feature will not be defined if the value evaluates to False. + + >>> from zope.configuration.config import ConfigurationContext + >>> c = ConfigurationContext() + >>> configfeature(c, 'f1', conf1, 'this') + >>> c.hasFeature('f1') + True + >>> configfeature(c, 'f2', conf1, 'that') + >>> c.hasFeature('f2') + False + + The boolean value can be negated, this allows it + to overcome the shortage of negating possibilit of zcml:condition. + + >>> configfeature(c, 'f3', conf1, 'this', True) + >>> c.hasFeature('f3') + False + >>> configfeature(c, 'f4', conf1, 'that', True) + >>> c.hasFeature('f4') + True + + Instead of an object with attributes, a dictionary can also be used: + + >>> dconf = {} + >>> dconf['this'] = True + >>> dconf['that'] = False + + >>> configfeature(c, 'f5', dconf, 'this') + >>> c.hasFeature('f5') + True + >>> configfeature(c, 'f6', dconf, 'that') + >>> c.hasFeature('f6') + False + + + Error handling + -------------- + + If there is an unexistent attribute, an error is reported. + + >>> configfeature(c, 'f7', conf1, 'nosuch') #doctest: +ELLIPSIS + Traceback (most recent call last): + ... + ConfigurationError: Object ... does not have attribute or key "nosuch" + + >>> configfeature(c, 'f8', dconf, 'nosuch') #doctest: +ELLIPSIS + Traceback (most recent call last): + ... + ConfigurationError: Object ... does not have attribute or key "nosuch" + + + Finally, like with the "provides" directive normally: + Spaces are not allowed in feature names (this is reserved for providing + many features with a single directive in the futute). + + >>> configfeature(c, 'two words', conf1, 'this') + Traceback (most recent call last): + ... + ValueError: Only one feature name allowed + + """ + + try: + value = getattr(instance, attribute) + except AttributeError: + # also try as dictionary value + try: + value = instance[attribute] + except (TypeError, ValueError, KeyError): + raise ConfigurationError, 'Object %s does not have attribute or key "%s"' % (instance, attribute) + + value = bool(value) + if negate: + value = not value + + if len(feature.split()) > 1: + raise ValueError("Only one feature name allowed") + + if value: + _context.provideFeature(feature) Added: z3/jsonserver/branch/merge/configfeature/meta.zcml ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/meta.zcml Thu Jun 15 16:02:55 2006 @@ -0,0 +1,15 @@ + + + + + + + + + Added: z3/jsonserver/branch/merge/configfeature/tests/__init__.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/tests/__init__.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,4 @@ +'''\ +Module init +''' + Added: z3/jsonserver/branch/merge/configfeature/tests/__parent__.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/tests/__parent__.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,9 @@ +import sys + +def __parent__(modulename, level=1): + 'Figure out parent module' + for i in range(level): + if not isinstance(modulename, basestring): + modulename = modulename.__name__ + modulename = sys.modules['.'.join(modulename.split('.')[:-1])] + return modulename Added: z3/jsonserver/branch/merge/configfeature/tests/configtest.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/tests/configtest.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,18 @@ + +# module level +conf1 = True +conf2 = False + +class dictlike(object): + pass + +# an object +cobj = dictlike() +cobj.conf3 = True +cobj.conf4 = False + +# a dict +dobj = {} +dobj['conf5'] = True +dobj['conf6'] = False + Added: z3/jsonserver/branch/merge/configfeature/tests/test_directive.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/tests/test_directive.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,228 @@ + +import sys +import unittest +from zope.testing.doctestunit import DocTestSuite +from __parent__ import __parent__ +configfeature = __parent__(__name__, 2) + +def test_module_level(): + """ + Module level access. + + >>> import zope.configuration.tests + >>> import zope.configuration.xmlconfig + >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + + >>> import tempfile + >>> fn = tempfile.mktemp('.zcml') + >>> zcml = open(fn, 'w') + >>> zcml.write(''' + ... + ... + ... + ... + ... + ... ''') + >>> zcml.close() + + >>> context = zope.configuration.xmlconfig.file(fn, configfeature.tests, context) + + >>> context.hasFeature('conf1') + True + >>> context.hasFeature('conf2') + False + >>> context.hasFeature('conf2n') + True + + """ + + +def test_objectlevel(): + """ + Object level access. + + >>> import zope.configuration.tests + >>> import zope.configuration.xmlconfig + >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + + >>> import tempfile + >>> fn = tempfile.mktemp('.zcml') + >>> zcml = open(fn, 'w') + >>> zcml.write(''' + ... + ... + ... + ... + ... + ... ''') + >>> zcml.close() + + >>> context = zope.configuration.xmlconfig.file(fn, configfeature.tests, context) + + >>> context.hasFeature('conf3') + True + >>> context.hasFeature('conf4') + False + >>> context.hasFeature('conf4n') + True + + """ + + +def test_dict_level(): + """ + Dictionary level access. + + >>> import zope.configuration.tests + >>> import zope.configuration.xmlconfig + >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + + >>> import tempfile + >>> fn = tempfile.mktemp('.zcml') + >>> zcml = open(fn, 'w') + >>> zcml.write(''' + ... + ... + ... + ... + ... + ... ''') + >>> zcml.close() + + >>> context = zope.configuration.xmlconfig.file(fn, configfeature.tests, context) + + >>> context.hasFeature('conf5') + True + >>> context.hasFeature('conf6') + False + >>> context.hasFeature('conf6n') + True + + """ + + +def test_errors(): + """ + Testing errors. + + >>> import zope.configuration.tests + >>> import zope.configuration.xmlconfig + >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + + No such instance: raises an error. + + >>> import tempfile + >>> fn = tempfile.mktemp('.zcml') + >>> zcml = open(fn, 'w') + >>> zcml.write(''' + ... + ... + ... + ... ''') + >>> zcml.close() + + >>> context = zope.configuration.xmlconfig.file(fn, configfeature.tests, context) #doctest: +ELLIPSIS + Traceback (most recent call last): + ... + ZopeXMLConfigurationError: ... + ConfigurationError: ... + + No such attribute: an error too + + >>> fn = tempfile.mktemp('.zcml') + >>> zcml = open(fn, 'w') + >>> zcml.write(''' + ... + ... + ... + ... ''') + >>> zcml.close() + + >>> context = zope.configuration.xmlconfig.file(fn, configfeature.tests, context) #doctest: +ELLIPSIS + Traceback (most recent call last): + ... + ZopeXMLConfigurationError: ... + ConfigurationError: Object ... does not have attribute or key "nosuch" + + No such key: an error too + + >>> fn = tempfile.mktemp('.zcml') + >>> zcml = open(fn, 'w') + >>> zcml.write(''' + ... + ... + ... + ... ''') + >>> zcml.close() + + >>> context = zope.configuration.xmlconfig.file(fn, configfeature.tests, context) #doctest: +ELLIPSIS + Traceback (most recent call last): + ... + ZopeXMLConfigurationError: ... + ConfigurationError: Object ... does not have attribute or key "nosuch" + + """ + + +def test_suite(): + return unittest.TestSuite(( + DocTestSuite(configfeature.__name__ + '.meta'), + DocTestSuite(), + )) Added: z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py Thu Jun 15 16:02:55 2006 @@ -0,0 +1,23 @@ + +import sys +import unittest +from zope.testing.doctestunit import DocTestSuite +from __parent__ import __parent__ +configfeature = __parent__(__name__, 2) + +def test_fiveconfig(): + """ + The fiveconfig.zcml file declares various Five compatibility features. + We only test that the configuration file can be run. + + >>> import zope.configuration.tests + >>> import zope.configuration.xmlconfig + >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + >>> context = zope.configuration.xmlconfig.file('fiveconfig.zcml', configfeature, context) + """ + + +def test_suite(): + return unittest.TestSuite(( + DocTestSuite(), + )) From reebalazs at codespeak.net Thu Jun 15 17:04:10 2006 From: reebalazs at codespeak.net (reebalazs at codespeak.net) Date: Thu, 15 Jun 2006 17:04:10 +0200 (CEST) Subject: [z3-checkins] r28827 - in z3/jsonserver/branch/merge/configfeature: . tests Message-ID: <20060615150410.DD1A110036@code0.codespeak.net> Author: reebalazs Date: Thu Jun 15 17:04:08 2006 New Revision: 28827 Added: z3/jsonserver/branch/merge/configfeature/metacore.zcml Modified: z3/jsonserver/branch/merge/configfeature/configure.zcml z3/jsonserver/branch/merge/configfeature/meta.zcml z3/jsonserver/branch/merge/configfeature/tests/test_directive.py z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py Log: Small fixes Modified: z3/jsonserver/branch/merge/configfeature/configure.zcml ============================================================================== --- z3/jsonserver/branch/merge/configfeature/configure.zcml (original) +++ z3/jsonserver/branch/merge/configfeature/configure.zcml Thu Jun 15 17:04:08 2006 @@ -1,7 +1,4 @@ - - - Modified: z3/jsonserver/branch/merge/configfeature/meta.zcml ============================================================================== --- z3/jsonserver/branch/merge/configfeature/meta.zcml (original) +++ z3/jsonserver/branch/merge/configfeature/meta.zcml Thu Jun 15 17:04:08 2006 @@ -2,14 +2,9 @@ xmlns:meta="http://namespaces.zope.org/meta" i18n_domain="zope"> - + - - - + + Added: z3/jsonserver/branch/merge/configfeature/metacore.zcml ============================================================================== --- (empty file) +++ z3/jsonserver/branch/merge/configfeature/metacore.zcml Thu Jun 15 17:04:08 2006 @@ -0,0 +1,15 @@ + + + + + + + + + Modified: z3/jsonserver/branch/merge/configfeature/tests/test_directive.py ============================================================================== --- z3/jsonserver/branch/merge/configfeature/tests/test_directive.py (original) +++ z3/jsonserver/branch/merge/configfeature/tests/test_directive.py Thu Jun 15 17:04:08 2006 @@ -11,7 +11,7 @@ >>> import zope.configuration.tests >>> import zope.configuration.xmlconfig - >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature) >>> import tempfile >>> fn = tempfile.mktemp('.zcml') @@ -57,7 +57,7 @@ >>> import zope.configuration.tests >>> import zope.configuration.xmlconfig - >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature) >>> import tempfile >>> fn = tempfile.mktemp('.zcml') @@ -103,7 +103,7 @@ >>> import zope.configuration.tests >>> import zope.configuration.xmlconfig - >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature) >>> import tempfile >>> fn = tempfile.mktemp('.zcml') @@ -149,7 +149,7 @@ >>> import zope.configuration.tests >>> import zope.configuration.xmlconfig - >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature) No such instance: raises an error. Modified: z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py ============================================================================== --- z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py (original) +++ z3/jsonserver/branch/merge/configfeature/tests/test_fiveconfig.py Thu Jun 15 17:04:08 2006 @@ -12,8 +12,12 @@ >>> import zope.configuration.tests >>> import zope.configuration.xmlconfig - >>> context = zope.configuration.xmlconfig.file('meta.zcml', configfeature) + >>> context = zope.configuration.xmlconfig.file('metacore.zcml', configfeature) >>> context = zope.configuration.xmlconfig.file('fiveconfig.zcml', configfeature, context) + + >>> context.hasFeature('compat_five') or context.hasFeature('compat_not_five') + True + """ From reebalazs at codespeak.net Thu Jun 15 17:04:49 2006 From: reebalazs at codespeak.net (reebalazs at codespeak.net) Date: Thu, 15 Jun 2006 17:04:49 +0200 (CEST) Subject: [z3-checkins] r28828 - z3/jsonserver/branch/merge Message-ID: <20060615150449.33AEF10036@code0.codespeak.net> Author: reebalazs Date: Thu Jun 15 17:04:47 2006 New Revision: 28828 Modified: z3/jsonserver/branch/merge/__init__.py z3/jsonserver/branch/merge/configure.zcml z3/jsonserver/branch/merge/jsonrpc.py z3/jsonserver/branch/merge/meta.zcml z3/jsonserver/branch/merge/metaconfigure.py Log: Make jsonserver use configfeature. At themoment it needs yet to be tested on z3. Modified: z3/jsonserver/branch/merge/__init__.py ============================================================================== --- z3/jsonserver/branch/merge/__init__.py (original) +++ z3/jsonserver/branch/merge/__init__.py Thu Jun 15 17:04:47 2006 @@ -1,7 +1,5 @@ #python package -import __compat__ - # Debugging #from AccessControl import allow_module #allow_module('pdb') Modified: z3/jsonserver/branch/merge/configure.zcml ============================================================================== --- z3/jsonserver/branch/merge/configure.zcml (original) +++ z3/jsonserver/branch/merge/configure.zcml Thu Jun 15 17:04:47 2006 @@ -12,11 +12,11 @@ - + - + - + + + + - + - + Modified: z3/jsonserver/branch/merge/metaconfigure.py ============================================================================== --- z3/jsonserver/branch/merge/metaconfigure.py (original) +++ z3/jsonserver/branch/merge/metaconfigure.py Thu Jun 15 17:04:47 2006 @@ -21,7 +21,7 @@ jwashin 2005-06-06 """ -from __compat__ import __compat__ +from configfeature.fiveconfig import __compat__ import zope.interface from zope.interface import Interface From faassen at codespeak.net Thu Jun 15 17:51:40 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 17:51:40 +0200 (CEST) Subject: [z3-checkins] r28833 - in z3/hurry.file/trunk: . src Message-ID: <20060615155140.6A3F710064@code0.codespeak.net> Author: faassen Date: Thu Jun 15 17:51:39 2006 New Revision: 28833 Added: z3/hurry.file/trunk/setup.py Modified: z3/hurry.file/trunk/ (props changed) z3/hurry.file/trunk/src/ (props changed) Log: eggification work. Added: z3/hurry.file/trunk/setup.py ============================================================================== --- (empty file) +++ z3/hurry.file/trunk/setup.py Thu Jun 15 17:51:39 2006 @@ -0,0 +1,25 @@ +from setuptools import setup, find_packages + +setup( + name="hurry.file", + version="0.9", + packages=find_packages('src', exclude=["*.tests", "*.ftests"]), + + package_dir= {'':'src'}, + + namespace_packages=['hurry'], + package_data = { + '': ['*.txt', '*.zcml'], + }, + + zip_safe=False, + author='Infrae', + author_email='faassen at infrae.com', + 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. +""", + license='BSD', + keywords="zope zope3", + ) From faassen at codespeak.net Thu Jun 15 17:55:28 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 17:55:28 +0200 (CEST) Subject: [z3-checkins] r28834 - z3/hurry.query/trunk/src/hurry/query Message-ID: <20060615155528.4CFB610064@code0.codespeak.net> Author: faassen Date: Thu Jun 15 17:55:27 2006 New Revision: 28834 Modified: z3/hurry.query/trunk/src/hurry/query/query.txt Log: unnecessary import. Modified: z3/hurry.query/trunk/src/hurry/query/query.txt ============================================================================== --- z3/hurry.query/trunk/src/hurry/query/query.txt (original) +++ z3/hurry.query/trunk/src/hurry/query/query.txt Thu Jun 15 17:55:27 2006 @@ -43,7 +43,6 @@ We use a fake int id utility here so we can test independent of the full-blown zope environment:: - >>> from zope.interface import verify >>> from zope import interface >>> import zope.app.intid.interfaces >>> from zope.app.testing import ztapi From faassen at codespeak.net Thu Jun 15 17:55:52 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 17:55:52 +0200 (CEST) Subject: [z3-checkins] r28835 - in z3/hurry.query/trunk: . src Message-ID: <20060615155552.ED3AE10064@code0.codespeak.net> Author: faassen Date: Thu Jun 15 17:55:52 2006 New Revision: 28835 Modified: z3/hurry.query/trunk/ (props changed) z3/hurry.query/trunk/src/ (props changed) Log: ignore some things created by egg machinery From faassen at codespeak.net Thu Jun 15 17:57:33 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 17:57:33 +0200 (CEST) Subject: [z3-checkins] r28836 - in z3/hurry.workflow/trunk: . src Message-ID: <20060615155733.3AF6610064@code0.codespeak.net> Author: faassen Date: Thu Jun 15 17:57:32 2006 New Revision: 28836 Modified: z3/hurry.workflow/trunk/ (props changed) z3/hurry.workflow/trunk/src/ (props changed) Log: Ignore some egg related directories. From faassen at codespeak.net Thu Jun 15 18:42:15 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 18:42:15 +0200 (CEST) Subject: [z3-checkins] r28839 - z3/hurry.workflow/trunk/src/hurry/workflow Message-ID: <20060615164215.5F85610034@code0.codespeak.net> Author: faassen Date: Thu Jun 15 18:42:12 2006 New Revision: 28839 Modified: z3/hurry.workflow/trunk/src/hurry/workflow/interfaces.py z3/hurry.workflow/trunk/src/hurry/workflow/tests.py z3/hurry.workflow/trunk/src/hurry/workflow/workflow.py z3/hurry.workflow/trunk/src/hurry/workflow/workflow.txt Log: Fix deprecation warnings. Modified: z3/hurry.workflow/trunk/src/hurry/workflow/interfaces.py ============================================================================== --- z3/hurry.workflow/trunk/src/hurry/workflow/interfaces.py (original) +++ z3/hurry.workflow/trunk/src/hurry/workflow/interfaces.py Thu Jun 15 18:42:12 2006 @@ -1,5 +1,5 @@ from zope.interface import Interface, Attribute -from zope.app.event.interfaces import IObjectEvent +from zope.component.interfaces import IObjectEvent MANUAL = 0 AUTOMATIC = 1 Modified: z3/hurry.workflow/trunk/src/hurry/workflow/tests.py ============================================================================== --- z3/hurry.workflow/trunk/src/hurry/workflow/tests.py (original) +++ z3/hurry.workflow/trunk/src/hurry/workflow/tests.py Thu Jun 15 18:42:12 2006 @@ -2,8 +2,8 @@ from zope.testing import doctest from zope.app.testing import placelesssetup, ztapi -from zope.app.annotation import interfaces as annotation_interfaces -from zope.app.annotation import attribute +from zope.annotation import interfaces as annotation_interfaces +from zope.annotation import attribute from hurry.workflow import interfaces, workflow class WorkflowVersions(workflow.WorkflowVersions): Modified: z3/hurry.workflow/trunk/src/hurry/workflow/workflow.py ============================================================================== --- z3/hurry.workflow/trunk/src/hurry/workflow/workflow.py (original) +++ z3/hurry.workflow/trunk/src/hurry/workflow/workflow.py Thu Jun 15 18:42:12 2006 @@ -8,9 +8,10 @@ from zope.security.checker import CheckerPublic from zope.app import zapi -from zope.app.annotation.interfaces import IAnnotations +from zope.annotation.interfaces import IAnnotations from zope.app.container.contained import Contained -from zope.app.event.objectevent import ObjectEvent, ObjectModifiedEvent +from zope.lifecycleevent import ObjectModifiedEvent +from zope.component.interfaces import ObjectEvent from hurry.workflow import interfaces from hurry.workflow.interfaces import MANUAL, AUTOMATIC, SYSTEM Modified: z3/hurry.workflow/trunk/src/hurry/workflow/workflow.txt ============================================================================== --- z3/hurry.workflow/trunk/src/hurry/workflow/workflow.txt (original) +++ z3/hurry.workflow/trunk/src/hurry/workflow/workflow.txt Thu Jun 15 18:42:12 2006 @@ -11,7 +11,7 @@ >>> from zope.interface import implements, Attribute - >>> from zope.app.annotation.interfaces import IAttributeAnnotatable + >>> from zope.annotation.interfaces import IAttributeAnnotatable >>> class IDocument(IAttributeAnnotatable): ... title = Attribute('Title') >>> class Document(object): From faassen at codespeak.net Thu Jun 15 18:44:23 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 18:44:23 +0200 (CEST) Subject: [z3-checkins] r28840 - z3/hurry.file/trunk Message-ID: <20060615164423.8438210034@code0.codespeak.net> Author: faassen Date: Thu Jun 15 18:44:22 2006 New Revision: 28840 Modified: z3/hurry.file/trunk/CHANGES.txt Log: Prepare for 0.9 release. Modified: z3/hurry.file/trunk/CHANGES.txt ============================================================================== --- z3/hurry.file/trunk/CHANGES.txt (original) +++ z3/hurry.file/trunk/CHANGES.txt Thu Jun 15 18:44:22 2006 @@ -1,15 +1,13 @@ hurry.file changes ================== -unreleased ----------- +0.9 (2006-06-15) +---------------- * separation from general hurry package into hurry.file * eggification -* now require Zope 3.3 - 0.8 (2006-05-01) ---------------- From faassen at codespeak.net Thu Jun 15 18:45:31 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 18:45:31 +0200 (CEST) Subject: [z3-checkins] r28841 - z3/hurry.workflow/tag Message-ID: <20060615164531.D24B110034@code0.codespeak.net> Author: faassen Date: Thu Jun 15 18:45:30 2006 New Revision: 28841 Added: z3/hurry.workflow/tag/ Log: Create hurry.workflow tags directory. From faassen at codespeak.net Thu Jun 15 18:45:54 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 18:45:54 +0200 (CEST) Subject: [z3-checkins] r28842 - z3/hurry.workflow/tag/hurry.workflow-0.9 Message-ID: <20060615164554.2500A10034@code0.codespeak.net> Author: faassen Date: Thu Jun 15 18:45:51 2006 New Revision: 28842 Added: z3/hurry.workflow/tag/hurry.workflow-0.9/ - copied from r28841, z3/hurry.workflow/trunk/ Log: Create 0.9 tag for hurry.workflow. From faassen at codespeak.net Thu Jun 15 18:51:51 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 18:51:51 +0200 (CEST) Subject: [z3-checkins] r28843 - z3/hurry.file/tag Message-ID: <20060615165151.898BB10034@code0.codespeak.net> Author: faassen Date: Thu Jun 15 18:51:50 2006 New Revision: 28843 Added: z3/hurry.file/tag/ Log: Create tag directory. From faassen at codespeak.net Thu Jun 15 18:52:18 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Thu, 15 Jun 2006 18:52:18 +0200 (CEST) Subject: [z3-checkins] r28844 - z3/hurry.file/tag/hurry.file-0.9 Message-ID: <20060615165218.B792E10034@code0.codespeak.net> Author: faassen Date: Thu Jun 15 18:52:17 2006 New Revision: 28844 Added: z3/hurry.file/tag/hurry.file-0.9/ - copied from r28843, z3/hurry.file/trunk/ Log: Create 0.9 tag. From faassen at codespeak.net Fri Jun 16 16:59:38 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Fri, 16 Jun 2006 16:59:38 +0200 (CEST) Subject: [z3-checkins] r28887 - z3/hurry.query/trunk Message-ID: <20060616145938.6B41A10060@code0.codespeak.net> Author: faassen Date: Fri Jun 16 16:59:37 2006 New Revision: 28887 Modified: z3/hurry.query/trunk/CHANGES.txt z3/hurry.query/trunk/setup.py Log: Make zc.catalog a dependency. Modified: z3/hurry.query/trunk/CHANGES.txt ============================================================================== --- z3/hurry.query/trunk/CHANGES.txt (original) +++ z3/hurry.query/trunk/CHANGES.txt Fri Jun 16 16:59:37 2006 @@ -1,6 +1,11 @@ hurry changes ============= +0.9.1 (2006-06-16) +------------------ + +* Make zc.catalog a dependency of hurry.query. + 0.9 (2006-05-16) ---------------- Modified: z3/hurry.query/trunk/setup.py ============================================================================== --- z3/hurry.query/trunk/setup.py (original) +++ z3/hurry.query/trunk/setup.py Fri Jun 16 16:59:37 2006 @@ -2,9 +2,10 @@ setup( name="hurry.query", - version="0.9", + version="0.9.1", packages=find_packages('src', exclude=["*.tests", "*.ftests"]), - + install_requires=['zc.catalog == 0.1.1'], + dependency_links=['http://download.zope.org/distribution/',], package_dir= {'':'src'}, namespace_packages=['hurry'], From faassen at codespeak.net Mon Jun 19 14:15:31 2006 From: faassen at codespeak.net (faassen at codespeak.net) Date: Mon, 19 Jun 2006 14:15:31 +0200 (CEST) Subject: [z3-checkins] r28943 - z3/hurry/trunk Message-ID: <20060619121531.418A110069@code0.codespeak.net> Author: faassen Date: Mon Jun 19 14:15:29 2006 New Revision: 28943 Added: z3/hurry/trunk/SEE_ELSEWHERE.txt Modified: z3/hurry/trunk/CHANGES.txt z3/hurry/trunk/README.txt Log: Remark where to look now. Modified: z3/hurry/trunk/CHANGES.txt ============================================================================== --- z3/hurry/trunk/CHANGES.txt (original) +++ z3/hurry/trunk/CHANGES.txt Mon Jun 19 14:15:29 2006 @@ -1,6 +1,16 @@ hurry changes ============= +discontinued +------------ + +hurry.file, hurry.workflow and hurry.query are now maintained in their +own packages (compliant with Zope 3.3). See here: + +http://codespeak.net/svn/z3/hurry.query/ +http://codespeak.net/svn/z3/hurry.workflow/ +http://codespeak.net/svn/z3/hurry.file/ + 0.8 (2006-05-01) ---------------- Modified: z3/hurry/trunk/README.txt ============================================================================== --- z3/hurry/trunk/README.txt (original) +++ z3/hurry/trunk/README.txt Mon Jun 19 14:15:29 2006 @@ -1,3 +1,6 @@ +Note: these packages have been split up: see CHANGES.txt for their new + location in SVN. + Packages that could be generic and eventually might, in changed form, end up in the Zope 3 core or Zope 3 ECM, but that we (at Infrae) built in isolation for now, as we're in a hurry to use them. Added: z3/hurry/trunk/SEE_ELSEWHERE.txt ============================================================================== --- (empty file) +++ z3/hurry/trunk/SEE_ELSEWHERE.txt Mon Jun 19 14:15:29 2006 @@ -0,0 +1,6 @@ +These packages have been split up and are maintained separately now in +SVN (as of Zope 3.3): + +http://codespeak.net/svn/z3/hurry.query/ +http://codespeak.net/svn/z3/hurry.workflow/ +http://codespeak.net/svn/z3/hurry.file/ \ No newline at end of file

') - body = body.replace('

[location/date of presentation]

[slide show title here]

[slide show title here]

[name of presenter]

[affiliation of presenter]

[slide title]

Default from the class...

Default from the class...

Default from the class...