[CMF-checkins] SVN: CMF/branches/2.2/ - added branch for 2.2 dev buildout
Yvo Schubbe
y.2010 at wcm-solutions.de
Sat Sep 25 05:39:42 EDT 2010
Log message for revision 116819:
- added branch for 2.2 dev buildout
Changed:
A CMF/branches/2.2/
D CMF/branches/2.2/OLD_INSTALL.txt
D CMF/branches/2.2/OLD_INSTALL_SVN.txt
D CMF/branches/2.2/OLD_README.txt
D CMF/branches/2.2/OLD_RELEASE.txt
U CMF/branches/2.2/README.txt
D CMF/branches/2.2/buildout-zope212.cfg
A CMF/branches/2.2/buildout-zope213.cfg
U CMF/branches/2.2/buildout.cfg
_U CMF/branches/2.2/src/
-=-
Deleted: CMF/branches/2.2/OLD_INSTALL.txt
===================================================================
--- CMF/trunk/OLD_INSTALL.txt 2010-09-25 08:10:36 UTC (rev 116798)
+++ CMF/branches/2.2/OLD_INSTALL.txt 2010-09-25 09:39:42 UTC (rev 116819)
@@ -1,142 +0,0 @@
-Installing CMF 2.2
-
- Requirements
-
- - Zope v. 2.10.4 or later
-
- Assumptions
-
- - New installation
-
- - Zope configured using INSTANCE_HOME, /var/zope, and
- SOFTWARE_HOME, /usr/local/zope/Zope-2.10.4
-
- Procedure
-
- 1. Unpack the CMF-2.X.tar.gz tarball into a working
- directory. For instance::
-
- $ cd /usr/local/zope
- $ tar xzf /tmp/CMF-2.X.tar.gz
-
- Note for Windows users: if you are using WinZip to unpack
- the file, be *sure* to disable the "TAR file smart CR/LF
- expansion" option (thanks to Frank McGeough for tracking
- down this problem!)
-
-
- 2. Link (or copy/move) the CMF packages into
- $INSTANCE_HOME/Products (or into $SOFTWARE_HOME/lib/python/Products).
- For instance::
-
- $ cd /var/zope/Products # /var/zope is INSTANCE_HOME
- $ ln -s /usr/local/zope/CMF-2.X/CMFCore .
- $ ln -s /usr/local/zope/CMF-2.X/CMFDefault .
- $ ln -s /usr/local/zope/CMF-2.X/CMFTopic .
- $ ln -s /usr/local/zope/CMF-2.X/CMFActionIcons .
- $ ln -s /usr/local/zope/CMF-2.X/CMFCalendar .
- $ ln -s /usr/local/zope/CMF-2.X/CMFUid .
- $ ln -s /usr/local/zope/CMF-2.X/DCWorkflow .
- $ ln -s /usr/local/zope/CMF-2.X/GenericSetup .
-
- or, as a shortcut::
-
- $ ln -s /usr/local/zope/CMF-2.X/CMF* .
- $ ln -s /usr/local/zope/CMF-2.X/DCWorkflow .
- $ ln -s /usr/local/zope/CMF-2.X/GenericSetup .
-
- Since linking doesn't apply on Windows, you will need
- to cut or copy the files from the place where you unpacked
- them to the 'Products' directory of your Zope.
-
- 3. Restart Zope; verify that the CMF products loaded
- property, by examining them in Control_Panel/Product.
-
- 4. Create a CMF Site object. join, and begin adding content.
- Enjoy!
-
- 5. If you want to use addon functionalities such as CMFCalendar, CMFTopic
- or CMFUid choose the extension when you set up the CMF site object,
- or apply the extension from the portal_setup tool at any time after
- site creation.
-
-
-Installing Translations for CMF
-
- Assumptions
-
- - CMF is installed as described above.
-
- Procedure
-
- 1. Add a custom Zope product with the following subdirectories:
- 'locales/<locale>/LC_MESSAGES/' for each locale you want to support.
-
- 2. Translate the .pot files shipped with CMF using a catalog editor like
- poEdit or KBabel. Place the created .mo files in LC_MESSAGES.
-
- 3. Register your translations using the i18n:registerTranslations ZCML
- directive.
-
- 4. Restart Zope.
-
-
-Upgrading from Earlier Versions
-
- Install the New Software.
-
- 0. "Download":CMF-2.X.tar.gz the tarball.
-
- 1. Copy your "working" products off to one side (in case
- you need / choose to revert).
-
- 2. Unpack the tarball into a separate location; copy or
- link the subdirectories into the 'Products' directory of
- your INSTANCE_HOME.
-
- 3. Restart Zope.
-
- Follow additional version-specific information below.
-
-
-Upgrading from versions earlier than 2.1.0-beta
-
- In order to make CMF instances created in CMF versions prior to CMF 2.1
- work, you need to run a separate one-time upgrade script. After putting the
- new code in place as instructed above, please change into your instance
- home and execute the following as the user normally running this Zope
- instance:
-
- ./bin/zopectl run Products/CMFCore/Extensions/migrateToCMF21.py
-
- The script will print some diagnostic information to the console and
- inform you about CMF sites it finds and upgrades. Once the script has
- finished, you can start and use your Zope instance as before. This script
- only needs to be run a single time when you start using a CMF version
- 2.1.0-beta or higher.
-
-
-Upgrading from versions earlier than CMF 1.3
-
- Add New Metadata: "portal_type"
-
- From the ZMI of your CMFSite, go to the 'portal_catalog' tool, and
- select the "Metadata" tab. Add a Metadata for "portal_type".
-
- Add New Indexes: "path", "portal_type"
-
- In the Indexes tab of the 'portal_catalog' tool, add a "PathIndex"
- using the Add list, and give it an Id of "path". Then add a
- "FieldIndex" and give it an Id of "portal_type".
-
- Reindex the New Indexes
-
- In the Indexes tab of the 'portal_catalog' tool, select the two
- new indexes ("path" and "portal_type") and click "Reindex".
-
- Remove Unwanted Workflow Bindings
-
- In the Workflows tabl of the 'portal_workflow' tool, clear the
- "(Default)" value from the input fields for the "Folder" and
- "Topic" types and click "Change".
-
Deleted: CMF/branches/2.2/OLD_INSTALL_SVN.txt
===================================================================
--- CMF/trunk/OLD_INSTALL_SVN.txt 2010-09-25 08:10:36 UTC (rev 116798)
+++ CMF/branches/2.2/OLD_INSTALL_SVN.txt 2010-09-25 09:39:42 UTC (rev 116819)
@@ -1,107 +0,0 @@
-Overview
-
- This document describes the process of getting the CMF from the Subversion
- repository, and installing it into your Zope. It assumes the following:
-
- * You want to install the "latest-and-greatest" version of the CMF from
- a Subversion checkout.
-
- - See "Installing CMF":INSTALL.txt to install from a tarball.
-
- - See the note below [1] if you want to export or check out
- the sources for a specific version from Subversion.
-
- * Please note that the trunk version of the CMF requires Zope
- 2.10.4 or later.
-
- * For help with Subversion in general, see "Version Control with
- Subversion" at http://svnbook.red-bean.com/
-
- * For directions on using the Zope Subversion server, see "The Zope Public
- Subversion Repository", http://www.zope.org/DevHome/Subversion/FrontPage;
- substitute 'CMF' for 'Zope'.
-
-Installation
-
- 1. Fetch the CMF package from the Zope Subversion repository::
-
- $ cd /tmp
- $ svn co svn://svn.zope.org/repos/main/CMF/trunk CMF-trunk
-
- This checkout creates a directory, 'CMF-trunk', which contain several
- subdirectories:
-
- - CMFCore
-
- - CMFDefault
-
- - CMFTopic
-
- - CMFCalendar
-
- - DCWorkflow
-
- - GenericSetup
-
- ... and several others.
-
- 2. Copy or link each of these subdirectories into the 'Products' directory of
- your Zope server (either SOFTWARE_HOME or INSTANCE_HOME) e.g.::
-
- $ cd /var/zope/Products
- $ ln -s /tmp/CMF-head/CMFCore .
- $ ln -s /tmp/CMF-head/CMFDefault .
- $ ln -s /tmp/CMF-head/CMFTopic .
- $ ln -s /tmp/CMF-head/CMFActionIcons .
- $ ln -s /tmp/CMF-head/CMFUID .
- $ ln -s /tmp/CMF-head/DCWorkflow .
- $ ln -s /tmp/CMF-head/GenericSetup .
- ...
-
- 3. Verify filesystem products:
-
- Start or restart your Zope server. Check to see that the following
- products are present in the Control_Panel / Products list; each should
- show a "normal" (non-broken) icon, and should have a version number
- matching the release version of the snapshot:
-
- - CMFCore
-
- - CMFDefault
-
- - CMFTopic
-
- - CMFActionIcons
-
- - CMFUID
-
- - DCWorkflow
-
- - GenericSetup
-
- ...
-
- 4. Create a CMF Site:
-
- From the management interface, somewhere in the "main" section of your
- site (*not* the Control_Panel!), select "CMF Site" from the add list.
- Fill out the constructor form, and click the "Add" button.
-
-Refreshing your Checkout
-
- To refresh an existing Subversion sandbox, you should use 'svn up'.
-
-Fetching a Previous Version
-
-.. [1] A Subversion checkout as described above retrieves what is called
- the "head" (the latest revision for each file) from the "main
- trunk" (no unmerged branches).
-
- Retrieving Sources for a specific release
-
- Sources for prior releases are tagged, using the release version
- number. For instance, version 2.1.0 of the CMF was tagged as
- '2.1.0'. To fetch such a release from Subversion::
-
- $ svn co svn://svn.zope.org/repos/main/CMF/tags/2.1.0 CMF-2.1.0
-
Deleted: CMF/branches/2.2/OLD_README.txt
===================================================================
--- CMF/trunk/OLD_README.txt 2010-09-25 08:10:36 UTC (rev 116798)
+++ CMF/branches/2.2/OLD_README.txt 2010-09-25 09:39:42 UTC (rev 116819)
@@ -1,49 +0,0 @@
-Zope Content Management Framework (CMF) README
-
- What is the CMF?
-
- The Zope Content Management Framework provides a set of
- services and content objects useful for building highly
- dynamic, content-oriented portal sites. As packaged, the
- CMF generates a site much like the Zope.org site. The CMF is
- intended to be easily customizable, in terms of both the
- types of content used and the policies and services it
- provides.
-
- Resources
-
- General
-
- * The mailing list, zope-cmf at zope.org. List information and
- online signup are available at:
- http://lists.zope.org/mailman/listinfo/zope-cmf. Archives
- of the list are at: http://lists.zope.org/pipermail/zope-cmf.
-
- * The 'docs/' directory contains user-oriented documentation
-
- * Information about future developments can be found on the
- "Roadmap", http://www.zope.org/Products/CMF/docs/roadmap
-
- Developer
-
- * The CMFDefault package is an example application, built using
- the API and services defined in CMFCore. You will probably want to
- alter it. In the first instance, refer to the source of CMFDefault for
- usage examples, standard idioms, etc.
-
- * The API is documented in the 'interfaces/' directory of each
- package.
-
- * Refer to the unit tests in the 'tests/' directory of each package
- for usage examples.
-
- Known Issues
-
- * Please search the "CMF Collector", https://bugs.launchpad.net/zope-cmf/
- for issues which are open against the CMF. You can also report issues
- there. (please look for similar ones first!)
-
- Installation
-
- Please see "Installing CMF":INSTALL.txt
-
Deleted: CMF/branches/2.2/OLD_RELEASE.txt
===================================================================
--- CMF/trunk/OLD_RELEASE.txt 2010-09-25 08:10:36 UTC (rev 116798)
+++ CMF/branches/2.2/OLD_RELEASE.txt 2010-09-25 09:39:42 UTC (rev 116819)
@@ -1,59 +0,0 @@
-RELEASE.txt - how to create a CMF release
-
- **Important note**: Always run all CMF unit tests before even thinking of
- cutting a new release.
-
-
- **Naming conventions**
-
- In order to stay consistent the following naming conventions for CMF
- versions and for Subversion tags used to tag releases should be used,
- demonstrated with the help of a notional 1.8.4 release:
-
- - CMF beta versions are '1.8.4-beta' and '1.8.4-beta2' for the second
- beta. The same is true for alpha releases if one is desired.
- '1.8.4-alpha2' follows '1.8.4-alpha'. Alpha releases should only
- be necessary for the first release off a new release branch. The final
- version would then be '1.8.4'
-
- - Subversion tags are the same as the version number. So our CMF 1.8.4
- release would be tagged as '1.8.4'. '1.8.4-beta2' would indicate the
- second beta release.
-
- - Branch tags in Subversion look like '1.8' for the branch that
- would yield e.g. version 1.8.4. In essence, the branch tag only
- contains the major release number.
-
-
- **Preparing the branch**
-
- To release version '1.8.4-beta2' off the '1.8' branch the following
- steps are needed. It is assumed the release manager is using the tip
- of the '1.8' Subversion branch to make these changes:
-
- - At the top of 'CHANGES.txt', enter the current date as YYYY/MM/DD
- in parentheses next to the CMF version number.
-
- - Find all 'version.txt' files throughout the CMF package and adjust
- the version number, in this case 'CMF-1.8.4-beta2'.
-
- - Check these changes into the Subversion repository
-
- - Create the Subversion tag by svn copying the head of the release
- branch to the tag in the tags repository directory.
-
- - Even though checking into a tag is an insidious thing to do, it is
- OK for changing SVN Externals definitions. Specifically, a CMF
- release tag should not contain SVN Externals pointing to branches.
- If needed, a tag on the external package should be cut and then
- the external definition adjusted to point to the tag.
-
-
- **Announcing the release**
-
- An announcement email should go out to zope-announce at zope.org,
- zope-cmf at zope.org and zope at zope.org. Also, a NewsItem for the release
- should be created on the zope.org site. The existing News Items inside
- http://www.zope.org/Products/CMF can be used as models for your
- announcement.
-
Modified: CMF/branches/2.2/README.txt
===================================================================
--- CMF/trunk/README.txt 2010-09-25 08:10:36 UTC (rev 116798)
+++ CMF/branches/2.2/README.txt 2010-09-25 09:39:42 UTC (rev 116819)
@@ -1,16 +1,16 @@
=================
CMF dev buildouts
=================
---------------------------
-Build CMF 2.3 + Zope trunk
---------------------------
+--------------------------------
+Build CMF 2.2 + Zope 2.12 branch
+--------------------------------
Introduction
============
-Builds CMF 2.3 from develop eggs located in ``src``. This buildout is usually
-used for developing CMF 2.3 on its primary target platform: Zope trunk and
-five.localsitemanager trunk.
+Builds CMF 2.2 from develop eggs located in ``src``. This buildout is usually
+used for developing CMF 2.2 on its primary target platform: Zope 2.12 branch
+and five.localsitemanager trunk.
Dependencies
============
@@ -27,14 +27,14 @@
$ ./bin/instance
---------------------------------
-Build CMF 2.3 + Zope 2.12 release
+Build CMF 2.2 + Zope 2.13 release
---------------------------------
Introduction
============
-Builds CMF 2.3 from develop eggs located in ``src``. This buildout is usually
-used for testing CMF 2.3 on a different platform: The latest Zope 2.12 and
+Builds CMF 2.2 from develop eggs located in ``src``. This buildout is usually
+used for testing CMF 2.2 on a different platform: The latest Zope 2.13 and
five.localsitemanager 2.0 releases.
Dependencies
@@ -47,5 +47,5 @@
::
$ python2.6 bootstrap.py
- $ ./bin/buildout -c buildout-zope212.cfg
+ $ ./bin/buildout -c buildout-zope213.cfg
$ ./bin/test
Deleted: CMF/branches/2.2/buildout-zope212.cfg
===================================================================
--- CMF/trunk/buildout-zope212.cfg 2010-09-25 08:10:36 UTC (rev 116798)
+++ CMF/branches/2.2/buildout-zope212.cfg 2010-09-25 09:39:42 UTC (rev 116819)
@@ -1,58 +0,0 @@
-# CMF trunk + Zope 2.12 release
-
-[buildout]
-extends = http://download.zope.org/Zope2/index/2.12.11/versions.cfg
-allow-picked-versions = false
-parts =
- test
- scripts
- zopepy
-eggs =
- Products.CMFCalendar
- Products.CMFCore
- Products.CMFDefault
- Products.CMFTopic
- Products.CMFUid
- Products.DCWorkflow
- Products.GenericSetup
-develop =
- src/Products.CMFCalendar
- src/Products.CMFCore
- src/Products.CMFDefault
- src/Products.CMFTopic
- src/Products.CMFUid
- src/Products.DCWorkflow
- src/Products.GenericSetup
-
-
-[versions]
-five.localsitemanager = 2.0.4
-mailinglogger = 3.3.3 # required by uninstall
-plone.recipe.zope2instance = 4.0.4 # required by uninstall
-zc.buildout = 1.4.4 # override Zope 2.12.11 versions.cfg
-
-
-[test]
-recipe = zc.recipe.testrunner
-eggs =
- Products.CMFCalendar [test]
- Products.CMFCore
- Products.CMFDefault [test]
- Products.CMFTopic [test]
- Products.CMFUid
- Products.DCWorkflow
- Products.GenericSetup
-
-
-[scripts]
-recipe = zc.recipe.egg
-eggs =
- ${buildout:eggs}
- Zope2
-
-
-[zopepy]
-recipe = zc.recipe.egg
-eggs = ${buildout:eggs}
-interpreter = zopepy
-scripts = zopepy
Copied: CMF/branches/2.2/buildout-zope213.cfg (from rev 116798, CMF/trunk/buildout-zope212.cfg)
===================================================================
--- CMF/branches/2.2/buildout-zope213.cfg (rev 0)
+++ CMF/branches/2.2/buildout-zope213.cfg 2010-09-25 09:39:42 UTC (rev 116819)
@@ -0,0 +1,61 @@
+# CMF 2.2 branch + Zope 2.13 release
+
+[buildout]
+extends =
+ http://download.zope.org/Zope2/index/2.13.0a4/versions.cfg
+ http://download.zope.org/zopetoolkit/index/1.0a3/zopeapp-versions.cfg
+allow-picked-versions = false
+parts =
+ test
+ scripts
+ zopepy
+eggs =
+ Products.CMFCalendar
+ Products.CMFCore
+ Products.CMFDefault
+ Products.CMFTopic
+ Products.CMFUid
+ Products.DCWorkflow
+ Products.GenericSetup
+develop =
+ src/Products.CMFCalendar
+ src/Products.CMFCore
+ src/Products.CMFDefault
+ src/Products.CMFTopic
+ src/Products.CMFUid
+ src/Products.DCWorkflow
+ src/Products.GenericSetup
+
+
+[versions]
+five.formlib = 1.0.3
+five.localsitemanager = 2.0.4
+mailinglogger = 3.3.3 # required by uninstall
+plone.recipe.zope2instance = 4.0.4 # required by uninstall
+Products.ZSQLMethods = 2.13.3
+
+
+[test]
+recipe = zc.recipe.testrunner
+eggs =
+ Products.CMFCalendar [test]
+ Products.CMFCore [test]
+ Products.CMFDefault [test]
+ Products.CMFTopic [test]
+ Products.CMFUid
+ Products.DCWorkflow
+ Products.GenericSetup
+
+
+[scripts]
+recipe = zc.recipe.egg
+eggs =
+ ${buildout:eggs}
+ Zope2
+
+
+[zopepy]
+recipe = zc.recipe.egg
+eggs = ${buildout:eggs}
+interpreter = zopepy
+scripts = zopepy
Property changes on: CMF/branches/2.2/buildout-zope213.cfg
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: CMF/branches/2.2/buildout.cfg
===================================================================
--- CMF/trunk/buildout.cfg 2010-09-25 08:10:36 UTC (rev 116798)
+++ CMF/branches/2.2/buildout.cfg 2010-09-25 09:39:42 UTC (rev 116819)
@@ -1,9 +1,7 @@
-# CMF trunk + Zope trunk
+# CMF 2.2 branch + Zope 2.12 branch
[buildout]
-extends =
- src/Zope2/versions.cfg
- http://download.zope.org/zopetoolkit/index/1.0c1/zopeapp-versions.cfg
+extends = src/Zope2/versions.cfg
allow-picked-versions = false
parts =
test
@@ -35,10 +33,8 @@
[versions]
-five.formlib = 1.0.3
mailinglogger = 3.3.3
plone.recipe.zope2instance = 4.0.4
-Products.ZSQLMethods = 2.13.3
z3c.recipe.i18n = 0.7.0
@@ -47,7 +43,7 @@
eggs =
five.localsitemanager
Products.CMFCalendar [test]
- Products.CMFCore
+ Products.CMFCore [test]
Products.CMFDefault [test]
Products.CMFTopic [test]
Products.CMFUid
Property changes on: CMF/branches/2.2/src
___________________________________________________________________
Modified: svn:externals
- ^/Zope/trunk Zope2
^/Products.CMFCalendar/trunk Products.CMFCalendar
^/Products.CMFCore/trunk Products.CMFCore
^/Products.CMFDefault/trunk Products.CMFDefault
^/Products.CMFTopic/trunk Products.CMFTopic
^/Products.CMFUid/trunk Products.CMFUid
^/Products.DCWorkflow/trunk Products.DCWorkflow
^/Products.GenericSetup/trunk Products.GenericSetup
^/five.localsitemanager/trunk five.localsitemanager
+ ^/Zope/branches/2.12 Zope2
^/Products.CMFCalendar/branches/2.2 Products.CMFCalendar
^/Products.CMFCore/branches/2.2 Products.CMFCore
^/Products.CMFDefault/branches/2.2 Products.CMFDefault
^/Products.CMFTopic/branches/2.2 Products.CMFTopic
^/Products.CMFUid/branches/2.2 Products.CMFUid
^/Products.DCWorkflow/branches/2.2 Products.DCWorkflow
^/Products.GenericSetup/trunk Products.GenericSetup
^/five.localsitemanager/trunk five.localsitemanager
More information about the CMF-checkins
mailing list