[Zope3-checkins]
SVN: Zope3/branches/srichter-twisted-integration2/src/zope/app/
Split the schema into an application and server part.
Stephan Richter
srichter at cosmos.phy.tufts.edu
Thu Sep 8 17:16:05 EDT 2005
Log message for revision 38411:
Split the schema into an application and server part.
Changed:
A Zope3/branches/srichter-twisted-integration2/src/zope/app/appsetup/schema.xml
U Zope3/branches/srichter-twisted-integration2/src/zope/app/server/schema.xml
U Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/schema.xml
-=-
Added: Zope3/branches/srichter-twisted-integration2/src/zope/app/appsetup/schema.xml
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/appsetup/schema.xml 2005-09-08 19:32:24 UTC (rev 38410)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/appsetup/schema.xml 2005-09-08 21:16:04 UTC (rev 38411)
@@ -0,0 +1,48 @@
+<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" />
+
+ <section type="ZODB.database" name="*" required="yes"
+ attribute="database">
+ <description>
+ The main application database that should be used.
+ </description>
+ </section>
+
+ <section type="eventlog" attribute="eventlog" name="*" required="yes">
+ <description>
+ Configuration for the eventlog.
+ </description>
+ </section>
+
+ <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>
+</schema>
Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/server/schema.xml
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/server/schema.xml 2005-09-08 19:32:24 UTC (rev 38410)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/server/schema.xml 2005-09-08 21:16:04 UTC (rev 38411)
@@ -1,16 +1,8 @@
-<schema>
- <description>
- Zope 3 configuration schema.
+<schema extends="../appsetup/schema.xml">
+ <!-- Zope 3 Application Server Configuration Schema -->
+ <import package="zope.app.appsetup" file="app.xml" />
- This schema describes the configuration options available to a
- site administrator via the zope.conf configuration file.
- </description>
-
- <!-- database and storage types -->
- <import package="ZODB" />
-
<!-- logging configuration -->
- <import package="ZConfig.components.logger" />
<import package="zope.app.server" file="accesslog.xml" />
<sectiontype name="server" datatype="zope.app.server.server.ServerFactory">
@@ -19,28 +11,6 @@
<key name="verbose" datatype="boolean" />
</sectiontype>
- <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 event log.
- </description>
- </section>
-
<section type="accesslog" attribute="accesslog" name="*"
required="yes">
<description>
@@ -50,13 +20,6 @@
<multisection type="server" name="*" attribute="servers" />
- <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>
-
<key name="interrupt-check-interval" datatype="integer" default="120"
attribute="check_interval">
<description>
@@ -83,16 +46,4 @@
</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>
</schema>
Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/schema.xml
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/schema.xml 2005-09-08 19:32:24 UTC (rev 38410)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/twisted/schema.xml 2005-09-08 21:16:04 UTC (rev 38411)
@@ -1,17 +1,6 @@
-<schema>
- <description>
- Zope 3 configuration schema.
-
- This schema describes the configuration options available to a
- site administrator via the zope.conf configuration file.
- </description>
-
- <!-- database and storage types -->
- <import package="ZODB" />
-
+<schema extends="../appsetup/schema.xml">
<!-- logging configuration -->
- <import package="ZConfig.components.logger" />
- <import package="zope.app.twisted" file="accesslog.xml" />
+ <import package="zope.app.server" file="accesslog.xml" />
<sectiontype name="server" datatype="zope.app.twisted.server.ServerFactory">
<key name="type" required="yes" />
@@ -33,19 +22,6 @@
<key name="hostkey" datatype="existing-file" required="yes" />
</sectiontype>
- <section type="ZODB.database" name="*" required="yes"
- attribute="database">
- <description>
- The main application database that should be used.
- </description>
- </section>
-
- <section type="eventlog" attribute="eventlog" name="*" required="yes">
- <description>
- Configuration for the event log.
- </description>
- </section>
-
<section type="accesslog" attribute="accesslog" name="*"
required="yes">
<description>
@@ -57,13 +33,6 @@
<multisection type="sslserver" name="*" attribute="sslservers" />
<multisection type="sshserver" name="*" attribute="sshservers" />
- <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>
-
<key name="interrupt-check-interval" datatype="integer" default="120"
attribute="check_interval">
<description>
@@ -89,17 +58,4 @@
for internal purposes.
</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>
</schema>
More information about the Zope3-Checkins
mailing list