[Checkins] SVN: CMF/branches/2.3/ - removed trunk specific files

Yvo Schubbe cvs-admin at zope.org
Mon Apr 2 10:41:27 UTC 2012


Log message for revision 124878:
  - removed trunk specific files
  - switched default buildout from Zope trunk to 2.13 branch
  - changed text to CMF 2.3 (but still pointing to CMF trunks because 2.3 branches will be created later)

Changed:
  D   CMF/branches/2.3/CODINGSTYLE.txt
  D   CMF/branches/2.3/OLD_INSTALL.txt
  D   CMF/branches/2.3/OLD_INSTALL_SVN.txt
  D   CMF/branches/2.3/OLD_README.txt
  D   CMF/branches/2.3/OLD_RELEASE.txt
  U   CMF/branches/2.3/README.txt
  U   CMF/branches/2.3/buildout-zope213.cfg
  U   CMF/branches/2.3/buildout.cfg
  U   CMF/branches/2.3/sources.cfg
  _U  CMF/branches/2.3/src/

-=-
Deleted: CMF/branches/2.3/CODINGSTYLE.txt
===================================================================
--- CMF/branches/2.3/CODINGSTYLE.txt	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/CODINGSTYLE.txt	2012-04-02 10:41:24 UTC (rev 124878)
@@ -1,87 +0,0 @@
-================
-CMF Coding Style
-================
-
-Here are some CMF specific guidelines. This is an incomplete first cut.
-
------------------------
-``unicode`` vs. ``str``
------------------------
-
-Zope 2 and CMF normally use encoded strings. CMF sites have a
-``default_charset`` property. All persistent strings edited through the CMF
-user interface use the encoding defined in ``default_charset``.
-
-Persistent strings edited through the ZMI might have a different encoding.
-Usually only tool settings are edited through the ZMI and tool settings can
-always be ASCII strings, so this is not a big issue.
-
-CMF will be migrated to unicode step by step. Recent versions of CMF depend
-on some ZTK libraries that expect unicode strings. That made it necessary to
-start using unicode in the following areas: PageTemplates, browser views and
-i18n messages.
-
-Areas that use unicode have to be separated consequently from areas that use
-encoded strings. If you pass encoded strings to PageTemplates and browser views
-or if you return unicode from formlib based forms the values have to be
-converted:
-
-- For PageTemplates in skins and for normal browser views the ``decode``
-  function from ``Products.CMFDefault.utils`` is used.
-
-- Schema adapters are used for formlib based forms. These provide a clean
-  interface that returns and accepts only unicode. Don't use any encoded
-  strings in form code.
-
-Never write unicode to objects that are implemented for encoded strings.
-
------------------------------
-``datetime`` vs. ``DateTime``
------------------------------
-
-Zope 2 and CMF normally use ``DateTime`` objects. These are not the same as
-the ``datetime`` objects usually used in Python. But converting them is
-possible.
-
-Try to use always offset-naive datetime and DateTime values. Using mixed
-values sometimes causes trouble. This is how you can test and normalize them:
-
-    >>> from DateTime.DateTime import DateTime
-    >>> local_tz = DateTime().timezone()
-    >>> aware_DT = DateTime('2002/02/02 02:02:02 ' + local_tz)
-    >>> aware_DT.timezoneNaive()
-    False
-    >>> aware_dt = aware_DT.asdatetime()
-    >>> aware_dt.tzinfo is None
-    False
-
-    >>> naive_DT = DateTime(str(aware_DT).rsplit(' ', 1)[0])
-    >>> naive_DT.timezoneNaive()
-    True
-    >>> naive_dt = aware_dt.replace(tzinfo=None)
-    >>> naive_dt.tzinfo is None
-    True
-
-CMF will be migrated to datetime step by step. Formlib based forms already
-require datetime objects. The same schema adapters used for adapting encoded
-strings should also be used for adapting DateTime values. Don't use any
-DateTime values in form code.
-
-Never write datetime to objects that are implemented for DateTime values.
-
--------------
-upgrade steps
--------------
-
-If your code changes make it necessary to update persistent data, you have to
-write an upgrade step that allows to upgrade existing sites in an automated
-way without loosing any data.
-
-The current tests only catch changes that are visible in exports of empty
-default sites.
-
-=================
-Zope Coding Style
-=================
-
-See http://docs.zope.org/zopetoolkit/codingstyle/index.html

Deleted: CMF/branches/2.3/OLD_INSTALL.txt
===================================================================
--- CMF/branches/2.3/OLD_INSTALL.txt	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/OLD_INSTALL.txt	2012-04-02 10:41:24 UTC (rev 124878)
@@ -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.3/OLD_INSTALL_SVN.txt
===================================================================
--- CMF/branches/2.3/OLD_INSTALL_SVN.txt	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/OLD_INSTALL_SVN.txt	2012-04-02 10:41:24 UTC (rev 124878)
@@ -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.3/OLD_README.txt
===================================================================
--- CMF/branches/2.3/OLD_README.txt	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/OLD_README.txt	2012-04-02 10:41:24 UTC (rev 124878)
@@ -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.3/OLD_RELEASE.txt
===================================================================
--- CMF/branches/2.3/OLD_RELEASE.txt	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/OLD_RELEASE.txt	2012-04-02 10:41:24 UTC (rev 124878)
@@ -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.3/README.txt
===================================================================
--- CMF/branches/2.3/README.txt	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/README.txt	2012-04-02 10:41:24 UTC (rev 124878)
@@ -2,16 +2,16 @@
 CMF dev buildouts
 =================
 
---------------------------
-Build CMF 2.3 + Zope trunk
---------------------------
+--------------------------------
+Build CMF 2.3 + Zope 2.13 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.
+used for developing CMF 2.3 on its primary target platform: Zope 2.13 branch
+and five.localsitemanager trunk.
 
 Dependencies
 ============

Modified: CMF/branches/2.3/buildout-zope213.cfg
===================================================================
--- CMF/branches/2.3/buildout-zope213.cfg	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/buildout-zope213.cfg	2012-04-02 10:41:24 UTC (rev 124878)
@@ -1,4 +1,4 @@
-# CMF trunk + Zope 2.13 release
+# CMF 2.3 branch + Zope 2.13 release
 
 [buildout]
 extends =

Modified: CMF/branches/2.3/buildout.cfg
===================================================================
--- CMF/branches/2.3/buildout.cfg	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/buildout.cfg	2012-04-02 10:41:24 UTC (rev 124878)
@@ -1,9 +1,9 @@
-# CMF trunk + Zope trunk
+# CMF 2.3 branch + Zope 2.13 branch
 
 [buildout]
 extends =
     sources.cfg
-    http://svn.zope.org/repos/main/zopetoolkit/trunk/zopeapp-versions.cfg
+    http://download.zope.org/zopetoolkit/index/1.0.6/zopeapp-versions.cfg
     src/Zope2/versions.cfg
     versions.cfg
 allow-picked-versions = false

Modified: CMF/branches/2.3/sources.cfg
===================================================================
--- CMF/branches/2.3/sources.cfg	2012-04-02 09:51:41 UTC (rev 124877)
+++ CMF/branches/2.3/sources.cfg	2012-04-02 10:41:24 UTC (rev 124878)
@@ -1,7 +1,6 @@
 [buildout]
 extends =
-    http://svn.zope.org/repos/main/zopetoolkit/trunk/zopeapp-sources.cfg
-    http://svn.zope.org/repos/main/Zope/trunk/sources.cfg
+    http://svn.zope.org/repos/main/Zope/branches/2.13/sources.cfg
 svn-zope-org = ^
 
 [sources]
@@ -18,5 +17,5 @@
 five.globalrequest = svn ${buildout:svn-zope-org}/five.globalrequest/trunk
 five.localsitemanager = svn ${buildout:svn-zope-org}/five.localsitemanager/trunk
 Products.ZSQLMethods = svn ${buildout:svn-zope-org}/Products.ZSQLMethods/trunk
-Zope = svn ${buildout:svn-zope-org}/Zope/trunk
+Zope = svn ${buildout:svn-zope-org}/Zope/branches/2.13
 zope.globalrequest = svn ${buildout:svn-zope-org}/zope.globalrequest/trunk


Property changes on: CMF/branches/2.3/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.13 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




More information about the checkins mailing list