[sylvain] r51088 - in buildout/silva/trunk: profiles templates

[email protected] Thu, 26 Sep 2013 14:59:56 +0200 (CEST)
Newsgroups gmane.comp.web.zope.silva.cvs
Message-ID <[email protected]> 
Author: sylvain
Date: Thu Sep 26 14:59:56 2013
New Revision: 51088

Modified:
   buildout/silva/trunk/profiles/base.cfg
   buildout/silva/trunk/profiles/development.cfg
   buildout/silva/trunk/profiles/silva-development.cfg
   buildout/silva/trunk/profiles/versions.cfg
   buildout/silva/trunk/templates/debug.ini
   buildout/silva/trunk/templates/deploy.ini
   buildout/silva/trunk/templates/mobi-debug.ini
   buildout/silva/trunk/templates/mobi-deploy.ini
Log:
Update buildout in order to get a working instance.


Modified: buildout/silva/trunk/profiles/base.cfg
==============================================================================
--- buildout/silva/trunk/profiles/base.cfg	(original)
+++ buildout/silva/trunk/profiles/base.cfg	Thu Sep 26 14:59:56 2013
@@ -116,9 +116,6 @@
   <product-config silva>
     mime_types ${buildout:directory}/mime.types
   </product-config>
-  <product-config zeam.form.silva>
-    upload-directory ${buildout:directory}/var/uploads/storage
-  </product-config>
 
 # Those package doesn't include properly their dependencies in ZCML
 # and breaks everything
@@ -127,8 +124,7 @@
 [upload]
 recipe = z3c.recipe.mkdir
 paths =
-  var/uploads/storage
-  var/uploads/tmp
+  var/uploads
 remove-on-update = yes
 
 [cache]

Modified: buildout/silva/trunk/profiles/development.cfg
==============================================================================
--- buildout/silva/trunk/profiles/development.cfg	(original)
+++ buildout/silva/trunk/profiles/development.cfg	Thu Sep 26 14:59:56 2013
@@ -65,6 +65,7 @@
   Products.SilvaMetadata
   Products.SilvaNews [test]
   Products.SilvaPoll [test]
+  infrae.wsgi [test]
   silva.app.document [test]
   silva.app.forest [test]
   silva.app.mediacontent [test]
@@ -72,8 +73,8 @@
   silva.app.page [test]
   silva.app.redirectlink [test]
   silva.app.shorturl [test]
-  silva.app.subscriptions [test]
   silva.app.sitemap [test]
+  silva.app.subscriptions [test]
   silva.captcha [test]
   silva.core.cache [test]
   silva.core.conf
@@ -84,9 +85,10 @@
   silva.core.references [test]
   silva.core.services [test]
   silva.core.smi [test]
-  silva.core.xml
   silva.core.upgrade [test]
   silva.core.views [test]
+  silva.core.xml
+  silva.fanstatic [test]
   silva.pas.base [test]
   silva.security.addables [test]
   silva.security.logging [test]
@@ -95,7 +97,6 @@
   zeam.form.base [test]
   zeam.form.composed [test]
   zeam.form.silva [test]
-  infrae.wsgi [test]
 defaults = ['--tests-pattern', '^f?tests$', '-v']
 
 #   silva.app.sitemap [test]

Modified: buildout/silva/trunk/profiles/silva-development.cfg
==============================================================================
--- buildout/silva/trunk/profiles/silva-development.cfg	(original)
+++ buildout/silva/trunk/profiles/silva-development.cfg	Thu Sep 26 14:59:56 2013
@@ -4,24 +4,23 @@
     silva-all
 
 [sources]
-#Products.Formulator = svn https://svn.infrae.com/Products.Formulator/trunk
+Products.Formulator = svn https://svn.infrae.com/Products.Formulator/trunk
 Products.Silva = hg https://hg.infrae.com/Products.Silva#2.4
-#Products.SilvaDocument = hg https://hg.infrae.com/Products.SilvaDocument#2.4
+Products.SilvaDocument = hg https://hg.infrae.com/Products.SilvaDocument#2.4
 Products.SilvaExternalSources = hg https://hg.infrae.com/Products.SilvaExternalSources#2.4
-#Products.SilvaFind = hg https://hg.infrae.com/Products.SilvaFind#1.4
-#Products.SilvaForum =  hg https://hg.infrae.com/Products.SilvaForum#2.5
-Products.SilvaMetadata = hg https://hg.infrae.com/Products.SilvaMetadata#2.4
+Products.SilvaFind = hg https://hg.infrae.com/Products.SilvaFind#1.4
+Products.SilvaForum =  hg https://hg.infrae.com/Products.SilvaForum#2.5
+#Products.SilvaMetadata = hg https://hg.infrae.com/Products.SilvaMetadata#2.4
 #Products.SilvaNews = hg https://hg.infrae.com/Products.SilvaNews#2.4
-Products.SilvaPoll = hg https://hg.infrae.com/Products.SilvaPoll#2.4
-#Products.SilvaSoftwarePackage = hg https://hg.infrae.com/Products.SilvaSoftwarePackage#2.4
+#Products.SilvaPoll = hg https://hg.infrae.com/Products.SilvaPoll#2.4
 Products.ZSQLiteDA = git git://github.com/thefunny42/Products.ZSQLiteDA.git
+#Products.SilvaSoftwarePackage = hg https://hg.infrae.com/Products.SilvaSoftwarePackage#2.4
 #Sprout = hg https://hg.infrae.com/Sprout
 #chameleon = git https://github.com/malthe/chameleon.git
 #dolmen.relations = git git://devel.dolmen-project.org/dolmen.relations.git branch=1.0
-#fanstatic = hg https://bitbucket.org/fanstatic/fanstatic
+fanstatic = hg https://bitbucket.org/fanstatic/fanstatic
 #five.grok = svn svn://svn.zope.org/repos/main/five.grok/trunk
 #five.intid = svn https://svn.plone.org/svn/collective/five.intid/trunk
-#gp.fileupload = hg https://bitbucket.org/gawel/gpfileupload/
 #grokcore.annotation = svn svn+ssh://svn.zope.org/repos/main/grokcore.annotation/trunk
 #grokcore.chameleon = svn svn://svn.zope.org/repos/main/grokcore.chameleon/trunk
 #grokcore.component = svn svn://svn.zope.org/repos/main/grokcore.component/trunk
@@ -33,41 +32,42 @@
 #infrae.cache = hg https://hg.infrae.com/infrae.cache
 #infrae.comethods = hg https://hg.infrae.com/infrae.comethods
 #infrae.i18nextract = svn https://svn.infrae.com/buildout/infrae.i18nextract/trunk
+infrae.fileupload = hg https://hg.infrae.com/infrae.fileupload
 #infrae.rest = hg https://hg.infrae.com/infrae.rest
 #infrae.testbrowser = hg https://hg.infrae.com/infrae.testbrowser
 #infrae.testing = hg https://hg.infrae.com/infrae.testing
-#infrae.wsgi = hg https://hg.infrae.com/infrae.wsgi#2.0
+infrae.wsgi = hg https://hg.infrae.com/infrae.wsgi#2.0
 #js.ckeditor = hg https://bitbucket.org/fanstatic/js.ckeditor
 #js.jqueryui = hg https://bitbucket.org/fanstatic/js.jqueryui
 #megrok.pagetemplate = git git://devel.dolmen-project.org/megrok.pagetemplate.git
-#silva.app.document = hg https://hg.infrae.com/silva.app.document
+silva.app.document = hg https://hg.infrae.com/silva.app.document
 #silva.app.forest = hg https://hg.infrae.com/silva.app.forest
-#silva.app.mediacontent = hg https://hg.infrae.com/silva.app.mediacontent
-#silva.app.news = hg https://hg.infrae.com/silva.app.news#2.4
-#silva.app.page = hg https://hg.infrae.com/silva.app.page#2.4
+silva.app.mediacontent = hg https://hg.infrae.com/silva.app.mediacontent
+silva.app.news = hg https://hg.infrae.com/silva.app.news#2.4
+silva.app.page = hg https://hg.infrae.com/silva.app.page#2.4
 #silva.app.photogallery = hg https://hg.infrae.com/silva.app.photogallery
 #silva.app.redirectlink = hg https://hg.infrae.com/silva.app.redirectlink#2.4
-#silva.app.shorturl = hg https://hg.infrae.com/silva.app.shorturl
+silva.app.shorturl = hg https://hg.infrae.com/silva.app.shorturl
 #silva.app.sitemap = hg https://hg.infrae.com/silva.app.sitemap
 #silva.app.subscriptions = hg https://hg.infrae.com/silva.app.subscriptions#2.4
 #silva.batch = hg https://hg.infrae.com/silva.batch
 #silva.captcha = hg https://hg.infrae.com/silva.captcha
 #silva.core.cache = hg https://hg.infrae.com/silva.core.cache#2.4
-#silva.core.conf = hg https://hg.infrae.com/silva.core.conf#2.4
-#silva.core.contentlayout = hg https://hg.infrae.com/silva.core.contentlayout#2.4
+silva.core.conf = hg https://hg.infrae.com/silva.core.conf#2.4
+silva.core.contentlayout = hg https://hg.infrae.com/silva.core.contentlayout#2.4
 silva.core.editor = hg https://hg.infrae.com/silva.core.editor
-#silva.core.interfaces = hg https://hg.infrae.com/silva.core.interfaces#2.4
-silva.core.layout = hg https://hg.infrae.com/silva.core.layout#2.4
+silva.core.interfaces = hg https://hg.infrae.com/silva.core.interfaces#2.4
+#silva.core.layout = hg https://hg.infrae.com/silva.core.layout#2.4
 #silva.core.messages = hg https://hg.infrae.com/silva.core.messages
 #silva.core.references = hg https://hg.infrae.com/silva.core.references#2.4
-#silva.core.services = hg https://hg.infrae.com/silva.core.services#2.4
-#silva.core.smi = hg https://hg.infrae.com/silva.core.smi#2.4
-#silva.core.upgrade = hg https://hg.infrae.com/silva.core.upgrade#2.4
+silva.core.services = hg https://hg.infrae.com/silva.core.services#2.4
+silva.core.smi = hg https://hg.infrae.com/silva.core.smi#2.4
+silva.core.upgrade = hg https://hg.infrae.com/silva.core.upgrade#2.4
 #silva.core.views = hg https://hg.infrae.com/silva.core.views#2.4
 #silva.core.xml = hg https://hg.infrae.com/silva.core.xml
 #silva.demo.contentlayout = hg https://hg.infrae.com/silva.demo.contentlayout
 #silva.export.html = hg https://hg.infrae.com/silva.export.html
-#silva.fanstatic = hg https://hg.infrae.com/silva.fanstatic
+silva.fanstatic = hg https://hg.infrae.com/silva.fanstatic
 #silva.pas.base = hg https://hg.infrae.com/silva.pas.base#2.4
 #silva.pas.membership = svn https://svn.infrae.com/silva.pas.membership/trunk
 #silva.pas.openid = hg https://hg.infrae.com/silva.pas.openid#2.4
@@ -87,10 +87,10 @@
 #zeam.form.autofields = git git://github.com/thefunny42/Zeam-Form-AutoFields.git
 #zeam.form.base = git git://github.com/thefunny42/Zeam-Form.git
 #zeam.form.composed = git git://github.com/thefunny42/Zeam-Form-Composed.git
-#zeam.form.silva = hg https://hg.infrae.com/zeam.form.silva#2.4
+zeam.form.silva = hg https://hg.infrae.com/zeam.form.silva#2.4
 #zeam.form.table = git git://github.com/thefunny42/Zeam-Form-Table.git
 #zeam.form.viewlet = git git://github.com/thefunny42/Zeam-Form-Viewlet.git
-zeam.form.ztk = git git://github.com/thefunny42/Zeam-Form-ZTK.git
+#zeam.form.ztk = git git://github.com/thefunny42/Zeam-Form-ZTK.git
 #zeam.jsontemplate = git git://github.com/thefunny42/Zeam-JsonTemplate.git
 #zeam.utils.batch = git git://github.com/thefunny42/Zeam-Utils-Batch.git
 #zodbupdate = svn svn://svn.zope.org/repos/main/zodbupdate/trunk
@@ -99,25 +99,26 @@
 output-package = silva.translations
 
 [instance]
+eggs +=
+  infrae.fileupload
 
 [versions]
 #Chameleon =
-#Products.Formulator =
+Products.Formulator =
 Products.Silva =
-#Products.SilvaDocument =
+Products.SilvaDocument =
 Products.SilvaExternalSources =
-#Products.SilvaFind =
-#Products.SilvaForum =
-Products.SilvaMetadata =
-#Products.SilvaNews =
-Products.SilvaPoll =
+Products.SilvaFind =
+Products.SilvaForum =
+Products.SilvaMetadata = 3.0.1
+Products.SilvaNews = 3.0.1
+Products.SilvaPoll = 3.0
 #Sprout =
 #WebOb =
 #dolmen.relations =
-#fanstatic =
+fanstatic =
 #five.grok =
 #five.intid =
-#gp.fileupload =
 #grokcore.annotation =
 #grokcore.chameleon =
 #grokcore.component =
@@ -128,59 +129,59 @@
 #grokcore.viewlet =
 #infrae.i18nextract =
 #infrae.rest =
-#infrae.testbrowser =
+infrae.testbrowser =
 #infrae.testing =
-#infrae.wsgi =
+infrae.wsgi =
 #js.ckeditor =
-js.jquery = 1.9.1
-js.jqueryui = 1.10.3
+lxml = 3.2.1-infrae1
 #megrok.pagetemplate =
-#silva.app.document =
+silva.app.document =
 #silva.app.forest =
-#silva.app.mediacontent =
-#silva.app.news =
-#silva.app.page =
+silva.app.mediacontent =
+silva.app.news =
+silva.app.page =
 #silva.app.photogallery
 #silva.app.redirectlink =
-#silva.app.shorturl =
+silva.app.shorturl =
 #silva.app.sitemap =
 #silva.app.subscriptions =
 #silva.batch =
 #silva.core.cache =
-#silva.core.conf =
-#silva.core.contentlayout =
+silva.core.conf =
+silva.core.contentlayout =
 silva.core.editor =
-#silva.core.interfaces =
-silva.core.layout =
+silva.core.interfaces =
+silva.core.layout = 3.0.2
 #silva.core.messages =
-#silva.core.references =
-#silva.core.services =
-#silva.core.smi =
-#silva.core.upgrade =
+silva.core.references = 3.0.3
+silva.core.services =
+silva.core.smi =
+silva.core.upgrade =
 #silva.core.views =
 #silva.core.xml =
 #silva.demo.contentlayout =
 #silva.export.html =
-#silva.fanstatic =
-#silva.pas.base =
+silva.fanstatic =
+silva.pas.base = 3.0.3
 #silva.pas.openid =
 #silva.security.addables =
 #silva.security.logging =
 #silva.security.overview =
 #silva.security.renameusers =
-#silva.systems.utils =
+silva.system.utils = 1.4.2
 silva.translations =
 silva.ui =
-#silvatheme.standardissue =
+silvatheme.silvadocs = 1.0.2
+silvatheme.standardissue = 1.5
 #smitheme.industrial =
 #z3locales =
 #zeam.form.autofields =
 #zeam.form.base =
 #zeam.form.composed =
-#zeam.form.silva =
+zeam.form.silva =
 #zeam.form.table =
 #zeam.form.viewlet =
-zeam.form.ztk =
+#zeam.form.ztk =
 #zeam.utils.batch =
 #zodbupdate =
 Products.ZSQLiteDA =

Modified: buildout/silva/trunk/profiles/versions.cfg
==============================================================================
--- buildout/silva/trunk/profiles/versions.cfg	(original)
+++ buildout/silva/trunk/profiles/versions.cfg	Thu Sep 26 14:59:56 2013
@@ -6,7 +6,6 @@
    http://infrae.com/download/simple
 allow-hosts =
    *.python.org
-   *.zope.org
    *.infrae.com
    infrae.com
 versions = versions
@@ -78,8 +77,8 @@
 mobi.caching = 1.0
 mobi.devices = 1.0.1
 mobi.interfaces = 1.0
-mr.developer = 1.19-infrae3
-plone.recipe.zope2instance = 4.2.10
+mr.developer = 1.20-infrae1
+plone.recipe.zope2instance = 4.2.12
 pyoai = 2.4.4
 python-Levenshtein = 0.10.1
 python-dateutil = 1.4.1
@@ -92,7 +91,7 @@
 silva.app.document = 3.0
 silva.app.forest = 3.0.1
 silva.app.mediacontent = 3.0.1
-silva.app.news = 3.0.1
+silva.app.news = 3.0.2
 silva.app.page = 3.0.1
 silva.app.photogallery = 1.0
 silva.app.redirectlink = 3.0
@@ -143,7 +142,7 @@
 z3c.recipe.mkdir = 0.3.1
 z3c.schema = 0.7.2
 z3locales = 0.4.1
-zc.buildout = 2.1.0-infrae1
+zc.buildout = 2.2.0-infrae1
 zc.relation = 1.0
 zeam.component = 1.0
 zeam.form.autofields = 1.0.1

Modified: buildout/silva/trunk/templates/debug.ini
==============================================================================
--- buildout/silva/trunk/templates/debug.ini	(original)
+++ buildout/silva/trunk/templates/debug.ini	Thu Sep 26 14:59:56 2013
@@ -12,14 +12,12 @@
 use = egg:fanstatic#fanstatic
 publisher_signature = ++static++
 debug = true
+injector = rules
 
 [filter:fileupload]
-use = egg:gp.fileupload
-tempdir = ${buildout:directory}/var/uploads/tmp
-upload_to = ${buildout:directory}/var/uploads/storage
-#MB
+use = egg:infrae.fileupload
+directory = ${buildout:directory}/var/uploads
 max_size = 100
-require_session = true
 
 [filter:scales]
 use = egg:infrae.scales

Modified: buildout/silva/trunk/templates/deploy.ini
==============================================================================
--- buildout/silva/trunk/templates/deploy.ini	(original)
+++ buildout/silva/trunk/templates/deploy.ini	Thu Sep 26 14:59:56 2013
@@ -17,14 +17,12 @@
 versioning = true
 versioning_use_md5 = true
 recompute_hashes = false
+injector = rules
 
 [filter:fileupload]
-use = egg:gp.fileupload
-tempdir = ${buildout:directory}/var/uploads/tmp
-upload_to = ${buildout:directory}/var/uploads/storage
-#MB
+use = egg:infrae.fileupload
+directory = ${buildout:directory}/var/uploads
 max_size = 100
-require_session = true
 
 [filter:scales]
 use = egg:infrae.scales

Modified: buildout/silva/trunk/templates/mobi-debug.ini
==============================================================================
--- buildout/silva/trunk/templates/mobi-debug.ini	(original)
+++ buildout/silva/trunk/templates/mobi-debug.ini	Thu Sep 26 14:59:56 2013
@@ -8,17 +8,15 @@
 use = egg:fanstatic#fanstatic
 publisher_signature = ++static++
 debug = true
+injector = rules
 
 [filter:pdb]
 use = egg:z3c.evalexception#ajax
 
 [filter:fileupload]
-use = egg:gp.fileupload
-tempdir = ${buildout:directory}/var/uploads/tmp
-upload_to = ${buildout:directory}/var/uploads/storage
-#MB
+use = egg:infrae.fileupload
+directory = ${buildout:directory}/var/uploads
 max_size = 100
-require_session = true
 
 [filter:devices]
 use = egg:mobi.devices#classifier

Modified: buildout/silva/trunk/templates/mobi-deploy.ini
==============================================================================
--- buildout/silva/trunk/templates/mobi-deploy.ini	(original)
+++ buildout/silva/trunk/templates/mobi-deploy.ini	Thu Sep 26 14:59:56 2013
@@ -14,14 +14,12 @@
 bundle = true
 versioning = true
 recompute_hashes = false
+injector = rules
 
 [filter:fileupload]
-use = egg:gp.fileupload
-tempdir = ${buildout:directory}/var/uploads/tmp
-upload_to = ${buildout:directory}/var/uploads/storage
-#MB
+use = egg:infrae.fileupload
+directory = ${buildout:directory}/var/uploads
 max_size = 100
-require_session = true
 
 [filter:devices]
 use = egg:mobi.devices#classifier