Prep for release of 2.7.0b2.

doc/CHANGES.txt

@@ -4,6 +4,16 @@ Zope Changes
   Change information for previous versions of Zope can be found in the
   file HISTORY.txt.
 
+  HEAD only
+
+    Bugs fixed
+
+     - PathIndex and TopicIndex are now using a counter for the number
+       of indexed objects instead of using a very expensive calculation
+       based on the keys of their indexes. 
+
+  2.7.0b2
+
     Features added
 
      - New zopectl feature: adduser.  Instead of using the inituser
@@ -11,11 +21,51 @@ Zope Changes
        with the 'Manager' role to your site.  This is useful both
        interactively and for packagers.
 
-   Bugs fixed
+     - New top-level package: nt_svcutils.  This takes the place of
+       the Zope.Startup.nt package to allow for reuse outside of Zope.
 
-     - PathIndex and TopicIndex are now using a counter for the number
-       of indexed objects instead of using a very expensive calculation
-       based on the keys of their indexes. 
+     - Renamed the "service file" for a Zope instance under Windows
+       from ntservice.py to zopeservice.py to allow a ZEO server
+       instance to share the same instance home as a Zope instance
+       (the ZEO service file will be called zeoservice.py).
+
+     - The TemporaryStorage module was moved from
+       Products/TemporaryFolder to a new top-level package named
+       tempstorage.
+
+     - Split functionality of mkzopeinstance into two separate
+       modules: mkzopeinstance.py and copyzopeskel.py.
+       copyzopeskel.py can be used directly by packagers to install
+       custom skeleton directories or mkzopeinstance can use a custom
+       skeleton directory via the '--skelsrc' flag.
+
+     - Added 'environment' and 'path' directives to config file directive
+       list.  'environment' is a section which allows the user to specify
+       environment variables within the config file.  'path' allows the
+       user to specify additional directories to insert into sys.path
+       when configuration is processed.
+
+     - Moved temporary storage related files into their own module
+       within lib/python, out of Products.TemporaryStorage.  This was
+       necessary in order to prevent the configuration machinery from
+       prematurely importing some modules that it didn't need to
+       during startup (the transitive set of all imported modules
+       within Products.TemporaryStorage).
+
+     - Add a check to the configurator to ensure that the Python found
+       has an expat parser.
+
+    Bugs fixed
+
+     - The Products directory in an instance home was not
+       automatically added to the Products.__path__ (it needed to be
+       specified manually).  It is now automatically added at instance
+       startup.
+
+     - The Windows runzope.bat file generated by mkzopeinstance from
+       the default skeleton directory now uses python.exe instead of
+       pythonw.exe, so you can actually see output from the Zope
+       process when you run it interactively.
 
      - backport of TAL fixes from z3
 
@@ -26,6 +76,28 @@ Zope Changes
 
      - Collector #1017: reST has been broken
 
+     - backward compatibility for i18n:attributes
+
+       if items are separated with spaces and there are more than two items,
+       all are treated as attributes plus deprecation warning
+
+       if items are separated with spaces and there are two items :
+
+       * i18n:attributes="value msg_id;" (with semicolon) will always be
+         treated as <attr> <msg_id>
+
+       * i18n:attributes="value title" will be treated as <attr> <attr> 
+         as long as title exist as attribute (both as static or in 
+         tal:attributes) plus deprecation warning
+
+     - deny attributes being both part of tal:attributes
+       and having a messageid in i18n:attributes
+
+     - Fixed failing Zope.Startup tests caused by import of
+       nonexistent Startup.getSchema function.
+
+     - VHM: manage_edit has been broken
+
      - The container-class keyword to database sections
        didn't work.
 
@@ -47,9 +119,6 @@ Zope Changes
        the new Interfaces package. Added back a simple stub module 
        and changed a constructor to allow these ZClasses to work.
 
-     - deny attributes being both part of tal:attributes
-       and having a messageid in i18n:attributes
-
      - Bugfix: if zopectl is run as the root user, the debug, run, and
        adduser commands will cause the Python process which performs
        those actions to switch users to the effective user.  This
@@ -61,8 +130,40 @@ Zope Changes
        zdrun should run from the Zope config file.  This is necessary
        if the file is moved out of a "single-directory-as-instance"
        instance home.
-    
-     - VHM: manage_edit has been broken    
+
+     - Various fixes to content of ZopeTutorial to deal with URLs moving
+       on new.zope.org (thanks to Stefane Fermigier).
+
+     - Added optparse and textwrap modules to docutils package to prevent
+       ReST barfage (AJ).
+
+     - Added a sample zeoclient and tempstorage stanzas to the default
+       config file (zope.conf.in).
+
+     - Various tweaks to the dbtab configuration code (Shane).
+
+     - Various fixes/enhancements to ZODB/ZEO (PythonLabs).
+
+     - Removed 'inst/Zope.spec' Zope RPM spec file in favor of placing
+       it in a separate internal ZC repository.  It will be available
+       in the SRPM.
+
+     - Fix for Collector 823 (XML RPC exception values were always
+       converted to strings and thus turned into a Fault object).
+       Thanks to Sandor Palfy for the patch.
+
+     - Remove --zeo/-z flags from mkzopeinstance.py, as custom_zodb.py
+       is no longer the preferred method of configuring custom
+       storages now that we have DBTab in the core, and you should be
+       able to create a custom skeleton dir with the right
+       zope.conf.in that has a zeo client storage set up if you need
+       to.
+
+     - 'make sdist' now creates a file with an extension of '.tgz'
+       rather than .'.tar.gz' (mainly to meet the expectations of
+       Zope.org about file names).
+
+     - moved 'zpasswd.py' into utilities directory in source tree.
 
   2.7.0b1
 

doc/TODO.txt

@@ -82,6 +82,29 @@ Server construction errors need to be better
   port cannot be bound, an error is raised.  The error currently doesn't
   include the port number, and should.
 
+I propose that we add two more options to the config file:
+
+  Create import-directory and extensions-directory directives
+
+  These would both be multikeys which specify some number of
+  directories that contained importable zexp files and external
+  methods, respectively.  This would allow us to not require any fixed
+  instance home directory.  Instead, each path required by each
+  subsystem is specifiable by itself in the config file.
+
+  I'm sure that utilizing these options in the config file will break
+  things that rely on having a monolithic INSTANCE_HOME such as
+  products that attempt to do something like "import_dir =
+  os.path.join(INSTANCE_HOME, 'import').
+
+  So I propose that the stock Zope instance home install continue to
+  follow the old pattern (where everything is installed into a single
+  instance home directory), but we provide the advanced config file
+  options for roll-your-own packagers and advanced users.
+
+  I would like to do the same thing for the software home, but I
+  haven't thought much about it yet.
+
 Review the Zope Book 2.6 Edition chapters and come up with revisions
 or at least create a Zope 2.7 Install HowTo
 
@@ -96,10 +119,6 @@ or at least create a Zope 2.7 Install HowTo
   At least create a HowTo which summarizes the differences between
   installing 2.6 and installing 2.7.
 
-More storage type examples in zope.conf.in
-
-  Temporary storage, bdbstorage, etc.
-
 ------------------------------
  MAYBE NEVER BUT NICE TO HAVE
 ------------------------------
@@ -122,29 +141,6 @@ textual representation of the configuration.
   (to aid GUI builders and to make it possible to have
    a meaningful 'zopectl showconfig' or somesuch).  
 
-RPM install should recompile .pycs
-
-  The RPM spec file (inst/Zope.spec.in) should delete and recompile
-  .pycs/.pyos during an RPM install to make sure tracebacks contain
-  real Zope filenames instead of filenames relative to the build
-  directory.  Alternately the RPM install should not contain .pycs or
-  .pyos.
-
-  XXX Not clear why this is actually needed; importing a module causes
-  the __file__ to be updated with the right filename.  A nice touch,
-  but not required.
-
-  AAA Is this a new Python feature or has it always been this way?
-  Tracebacks used to show the location of the .pyc where it had been
-  compiled, not where it actually lived.
-
-RPM install versioning scheme needs to be documented
-
-  The RPM builder has a versioning scheme via the generated Makefile
-  in order to allow for the install of multiple simultaneous versions
-  of Zope on a single system.  This versioning scheme should be
-  documented.
-
 ----------------------------------
 COMMUNITY CONCERNS (uncategorized)
 ----------------------------------
@@ -195,30 +191,22 @@ Lots of discussion!
    lockfile-name /var/lock/$HOSTNAME-lockfile
 
  - Give installaler an option to put libs in a user-specifiable
-   directory at software installation time.
+   directory at software home installation time.
 
  - Give installer an option to put docs in a user-specifiable directory
    at software home installation time.
 
- - Give installer an option to put instance skeleton files in a
-   user-specifiable directory at software home installation time.
-
  - Make it possible to install Zope-related Python libraries to
    The site-packages of the Python used to invoke setup.py.
 
  - Offer to install software home 'bin' scripts into a directory
    separate from the software home 'bin' directory.
 
- - To help binary distribution creators, mkzopeinstance probably needs
-   to make it easier to place instance files in separate directories
-   and needs to generate a zope.conf that reflects
-   logfile/lockfile/pidfile placement options that can be fed on the
-   command line.
-
- - Allow a custom Zope.conf.in to be used by someone invoking
-   mkzopeinstance?
-
  - Allow for the installation of platform-dependent files (basically
    Python extensions) to be installed to a place separate than that of
    platform independent files (as requested by Luca DeVitis).
 
+ - Upon failure of Windows service startup, it's possible for the
+   reason for the failure to not be logged anywhere.  This is because
+   we carefully wait til late in the startup process to write logfiles
+   so UNIX has a chance to setuid.  This is unnecessary for Windows.

inst/versions.py

@@ -4,4 +4,4 @@ ZOPE_BRANCH_NAME    = '$Name$'[6:] or 'no-branch'
 
 # always start prerelease branches with '0' to avoid upgrade
 # issues in RPMs
-VERSION_RELEASE_TAG = 'b1+'
+VERSION_RELEASE_TAG = 'b2+'