[Zope-Checkins] SVN: Zope/trunk/ Simplified instance skeleton, removing old `Extensions`, `import`, `lib/python` and `Products` from the default. You can continue to manually add these back.

[Hanno Schlichting]

Log message for revision 122059:
  Simplified instance skeleton, removing old `Extensions`, `import`, `lib/python` and `Products` from the default. You can continue to manually add these back.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Zope2/Startup/zopeschema.xml
  D   Zope/trunk/src/Zope2/utilities/skel/Products/
  U   Zope/trunk/src/Zope2/utilities/skel/README.txt
  U   Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in
  D   Zope/trunk/src/Zope2/utilities/skel/import/
  D   Zope/trunk/src/Zope2/utilities/skel/lib/

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2011-07-02 15:58:58 UTC (rev 122058)
+++ Zope/trunk/doc/CHANGES.rst	2011-07-02 16:12:36 UTC (rev 122059)
@@ -31,6 +31,10 @@
 Restructuring
 +++++++++++++
 
+- Simplified instance skeleton, removing old `Extensions`, `import`,
+  `lib/python` and `Products` from the default. You can continue to manually
+  add these back.
+
 - Removed the rarely used support for the `++skin++` traverser. You can enable
   it in your own applications by defining::
 

Modified: Zope/trunk/src/Zope2/Startup/zopeschema.xml
===================================================================
--- Zope/trunk/src/Zope2/Startup/zopeschema.xml	2011-07-02 15:58:58 UTC (rev 122058)
+++ Zope/trunk/src/Zope2/Startup/zopeschema.xml	2011-07-02 16:12:36 UTC (rev 122059)
@@ -311,11 +311,7 @@
        required="yes">
     <description>
       The top-level directory which contains the "instance" data for the
-      application server.  Typically this is a directory which
-      may contain a "Products" subdirectory (which holds instance-local
-      Zope Products), an "Extensions" subdirectory (which holds instance-local
-      external methods), and an "import" directory (which holds instance-local
-      importable ZODB exports).  It may also contain "etc", "bin", "log",
+      application server. It may also contain "etc", "bin", "log",
       and "var" directories depending on how you've configured your Zope
       instance.
     </description>
@@ -348,32 +344,26 @@
 
   <multikey name="products" datatype="existing-directory">
     <description>
-      This specifies additional product directories which are added to
-      Products.__path__.  Directories are added in the order in which
-      they are specified.
+      This specifies a product directory which is added to Products.__path__.
+      Directories are added in the order in which they are specified.
     </description>
-    <metadefault>$instancehome/Products</metadefault>
+    <metadefault></metadefault>
   </multikey>
 
 
   <key name="extensions" datatype="existing-directory">
     <description>
-      This overrides the path to the Extensions directory.
+      This provides a path to an Extensions directory.
     </description>
-    <metadefault>$instancehome/Extensions</metadefault>
+    <metadefault></metadefault>
   </key>
   
   <multikey name="path" datatype="string">
     <description>
       This specifies additional paths directories which are inserted into
-      the beginning of Python's module search path.  The set of directories
-      specified is inserted into the beginning of the module search path in
-      the order which they are specified here.  Note that the processing of
-      this directive may happen too late under some circumstances; it is
-      recommended that you use the PYTHONPATH environment variable if
-      using this directive doesn't work for you.
+      the beginning of Python's module search path.
     </description>
-    <metadefault>$instancehome/lib/python</metadefault>
+    <metadefault></metadefault>
   </multikey>
 
   <key name="pid-filename" datatype="existing-dirpath">

Modified: Zope/trunk/src/Zope2/utilities/skel/README.txt
===================================================================
--- Zope/trunk/src/Zope2/utilities/skel/README.txt	2011-07-02 15:58:58 UTC (rev 122058)
+++ Zope/trunk/src/Zope2/utilities/skel/README.txt	2011-07-02 16:12:36 UTC (rev 122059)
@@ -4,6 +4,4 @@
   bin/         Scripts used to control the Zope instance
   etc/         Configuration files
   log/         Log files
-  lib/python/  Installed Python packages specific to the instance
-  Products/    Installed Zope Products specific to the instance
   var/         Run-time data files, including the object database

Modified: Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in
===================================================================
--- Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in	2011-07-02 15:58:58 UTC (rev 122058)
+++ Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in	2011-07-02 16:12:36 UTC (rev 122059)
@@ -50,61 +50,6 @@
 #    clienthome /home/chrism/projects/sessions/var
 
 
-# Directive: path
-#
-# Description:
-#     Name of a directory which should be inserted into the
-#     the beginning of Python's module search path.  This directive
-#     may be specified as many times as needed to insert additional
-#     directories.  The set of directories specified is inserted into the
-#     beginning of the module search path in the order which they are specified
-#     here.  Note that the processing of this directive may happen too late
-#     under some circumstances; it is recommended that you use the PYTHONPATH
-#     environment variable if using this directive doesn't work for you.
-#
-# Default: $INSTANCE/lib/python
-#
-# Example:
-#
-#    path $INSTANCE/mypymodules
-
-
-# Directive: products
-#
-# Description:
-#     Name of a directory that contains additional Product packages.  This
-#     directive may be used as many times as needed to add additional
-#     collections of products.  Each directory identified will be
-#     added to the __path__ of the Products package.  All Products are
-#     initialized in ascending alphabetical order by product name.  If
-#     two products with the same name exist in two Products directories,
-#     the order in which the packages appear here defines the load
-#     order.  The master Products directory exists in Zope's software home,
-#     and cannot be removed from the products path (and should not be added
-#     to it here).
-#
-# Default: $INSTANCE/Products
-#
-# Example:
-#
-#    products /home/chrism/projects/myproducts
-
-
-# Directive: extensions
-#
-# Description:
-#     Name of a directory that contains additional "extensions"
-#     (implementations of ExternalMethods or catalog brains). This
-#     directive will be searched before the 'Extensions' directory
-#     of the 'instancehome'.
-#
-# Default: unset
-#
-# Example:
-#
-#    extensions /home/chrism/extensions
-
-
 # Directive: environment
 #
 # Description: