[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ make schema.xml locally available in server implementation, so they can be installed as eggs, ZConfig does not provide the ability to reference schema files via package paths

Bernd Dorn bernd.dorn at lovelysystems.com
Wed Mar 28 10:55:24 EDT 2007


Log message for revision 73863:
  make schema.xml locally available in server implementation, so they can be installed as eggs, ZConfig does not provide the ability to reference schema files via package paths

Changed:
  D   Zope3/trunk/src/zope/app/appsetup/schema.xml
  U   Zope3/trunk/src/zope/app/publication/ftesting.zcml
  _U  Zope3/trunk/src/zope/app/server/
  U   Zope3/trunk/src/zope/app/server/schema.xml
  _U  Zope3/trunk/src/zope/app/twisted/
  U   Zope3/trunk/src/zope/app/twisted/schema.xml
  U   Zope3/trunk/src/zope/app/wsgi/__init__.py

-=-
Deleted: Zope3/trunk/src/zope/app/appsetup/schema.xml
===================================================================
--- Zope3/trunk/src/zope/app/appsetup/schema.xml	2007-03-28 14:54:01 UTC (rev 73862)
+++ Zope3/trunk/src/zope/app/appsetup/schema.xml	2007-03-28 14:55:23 UTC (rev 73863)
@@ -1,117 +0,0 @@
-<schema>
-  <description>
-    Zope 3 Application Server configuration schema.
-
-    This schema describes the configuration options available to a
-    site administrator via the zope.conf configuration file for the Zope
-    application server.
-  </description>
-
-  <!-- database and storage types -->
-  <import package="ZODB" />
-
-  <!-- logging configuration -->
-  <import package="ZConfig.components.logger" />
-
-  <abstracttype name="zope.product.base">
-    <!-- Poor name inherited from Zope 2.
-         This can't be changed since components refer to this in a
-         similar way as to public base classes.  Components that want
-         to work with both Zope 2 and Zope 3 need this to match the
-         existing Zope 2 name.
-         -->
-    <description>
-      Base type for component-specific configuration sections.
-
-      Specific products should implement configuration sections by
-      defining sections types that implement this abstract type and
-      using their own schema component to define meaningful settings.
-
-    </description>
-  </abstracttype>
-
-  <sectiontype name="product-config" implements="zope.product.base">
-    <description>
-    Component-specific configuration, expressed as arbitrary name-value pairs.
-    </description>
-
-    <key name="+"
-         attribute="mapping"
-         required="no"
-         />
-  </sectiontype>
-
-  <multisection type="zope.product.base" name="+"
-                attribute="product_config">
-    <description>
-      Component-specific configuration stanzas.
-
-      Products may use the &lt;product-config&gt; section type, or may supply
-      a component.xml which defines section types with their own schemas.
-
-      All sections for this multisection will be collected together into the
-      'product_config' attribute of the configuration object.
-    </description>
-  </multisection>
-
-  <multisection type="ZODB.database" name="*" required="yes"
-           attribute="databases">
-    <description>
-
-      Application database.
-
-      At least one database must be specified.  The first will be used
-      as the main database.  At most one of the databases can be unnamed.
-
-      All of the databases specified will be part of a multi-database.
-      See the ZODB documentation of multi-databases for details of how
-      this is useful.
-
-    </description>
-  </multisection>
-
-  <section type="eventlog" attribute="eventlog" name="*" required="yes">
-    <description>
-      Configuration for the eventlog.
-    </description>
-  </section>
-  
-  <multisection type="logger" attribute="loggers" name="*" required="no">
-    <description>
-      Additional loggers for specific subsystems
-    </description>
-  </multisection>
-
-  <key name="site-definition" default="site.zcml">
-    <description>
-      The name of the top-level ZCML file that defines the component
-      configuration used for this site.
-    </description>
-  </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.
-    </description>
-    <metadefault>$softwarehome/src</metadefault>
-  </multikey>
-
-  <key name="devmode" datatype="boolean" default="off">
-    <description>
-      Switches the Developer Mode on and off.
-
-      In developer mode, the web UI will provide useful utilities for
-      developers to work on Zope 3 applications.
-    </description>
-    <example>
-      devmode on
-    </example>
-    <metadefault>off</metadefault>
-  </key>
-</schema>

Modified: Zope3/trunk/src/zope/app/publication/ftesting.zcml
===================================================================
--- Zope3/trunk/src/zope/app/publication/ftesting.zcml	2007-03-28 14:54:01 UTC (rev 73862)
+++ Zope3/trunk/src/zope/app/publication/ftesting.zcml	2007-03-28 14:55:23 UTC (rev 73863)
@@ -8,12 +8,12 @@
   <!-- This file is the equivalent of site.zcml and it is -->
   <!-- used for functional testing setup -->
 
-  <include package="zope.app.dav" file="meta.zcml"/>
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
+   <include package="zope.app.dav" file="meta.zcml"/>
+   <include package="zope.app.securitypolicy" file="meta.zcml" />
 
   <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.dav"/>
-  <include package="zope.app.authentication" />
+   <include package="zope.app.dav"/>
+   <include package="zope.app.authentication" />
   <include package="zope.app.zptpage"/>
   <include package="zope.app.securitypolicy" />
 


Property changes on: Zope3/trunk/src/zope/app/server
___________________________________________________________________
Name: svn:externals
   + appsetupschema ../appsetup/schema


Modified: Zope3/trunk/src/zope/app/server/schema.xml
===================================================================
--- Zope3/trunk/src/zope/app/server/schema.xml	2007-03-28 14:54:01 UTC (rev 73862)
+++ Zope3/trunk/src/zope/app/server/schema.xml	2007-03-28 14:55:23 UTC (rev 73863)
@@ -1,4 +1,4 @@
-<schema extends="../appsetup/schema.xml">
+<schema extends="./appsetupschema/schema.xml">
 
   <!-- logging configuration -->
   <import package="zope.app.server" file="accesslog.xml" />


Property changes on: Zope3/trunk/src/zope/app/twisted
___________________________________________________________________
Name: svn:externals
   + appsetupschema ../appsetup/schema


Modified: Zope3/trunk/src/zope/app/twisted/schema.xml
===================================================================
--- Zope3/trunk/src/zope/app/twisted/schema.xml	2007-03-28 14:54:01 UTC (rev 73862)
+++ Zope3/trunk/src/zope/app/twisted/schema.xml	2007-03-28 14:55:23 UTC (rev 73863)
@@ -1,4 +1,4 @@
-<schema extends="../appsetup/schema.xml">
+<schema extends="./appsetupschema/schema.xml">
   <!-- logging configuration -->
   <import package="zope.app.server" file="accesslog.xml" />
 

Modified: Zope3/trunk/src/zope/app/wsgi/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/wsgi/__init__.py	2007-03-28 14:54:01 UTC (rev 73862)
+++ Zope3/trunk/src/zope/app/wsgi/__init__.py	2007-03-28 14:55:23 UTC (rev 73863)
@@ -90,7 +90,7 @@
     # Load the configuration schema
     if schemafile is None:
         schemafile = os.path.join(
-            os.path.dirname(appsetup.__file__), 'schema.xml')
+            os.path.dirname(appsetup.__file__), 'schema', 'schema.xml')
 
     # Let's support both, an opened file and path
     if isinstance(schemafile, basestring):



More information about the Zope3-Checkins mailing list