[z3-checkins] r5278 - in z3/sqlos/trunk: . auth services
dreamcatcher at codespeak.net
dreamcatcher at codespeak.net
Thu Jun 24 22:21:20 MEST 2004
Author: dreamcatcher
Date: Thu Jun 24 22:21:20 2004
New Revision: 5278
Modified:
z3/sqlos/trunk/auth/configure.zcml
z3/sqlos/trunk/configure.zcml
z3/sqlos/trunk/meta.zcml
z3/sqlos/trunk/permissions.zcml
z3/sqlos/trunk/services/sqlfactoryservice.zcml
z3/sqlos/trunk/vocab.zcml
Log:
Apply zcml style.
Modified: z3/sqlos/trunk/auth/configure.zcml
==============================================================================
--- z3/sqlos/trunk/auth/configure.zcml (original)
+++ z3/sqlos/trunk/auth/configure.zcml Thu Jun 24 22:21:20 2004
@@ -4,55 +4,55 @@
<content class=".SQLObjectPrincipalSource">
<factory
- title="SQLObject Principal Source"
- />
+ title="SQLObject Principal Source"
+ />
<require
- permission="zope.View"
- interface="sqlos.interfaces.auth.ISQLObjectPrincipalSource"
- />
+ permission="zope.View"
+ interface="sqlos.interfaces.auth.ISQLObjectPrincipalSource"
+ />
<require
- permission="zope.View"
- interface="sqlos.interfaces.container.ISQLObjectContainerSchema"
- />
+ permission="zope.View"
+ interface="sqlos.interfaces.container.ISQLObjectContainerSchema"
+ />
<require
- permission="zope.ManageContent"
- set_schema="sqlos.interfaces.container.ISQLObjectContainerSchema"
- />
+ permission="zope.ManageContent"
+ set_schema="sqlos.interfaces.container.ISQLObjectContainerSchema"
+ />
<require
- permission="zope.ManageContent"
- interface="sqlos.interfaces.container.ISQLObjectFactory"
- />
+ permission="zope.ManageContent"
+ interface="sqlos.interfaces.container.ISQLObjectFactory"
+ />
</content>
<browser:addMenuItem
- title="SQLObject Principal Source"
- class=".SQLObjectPrincipalSource"
- permission="zope.ManageServices"
- view="AddSQLObjectPrincipalSourceForm.html"
- />
+ title="SQLObject Principal Source"
+ class=".SQLObjectPrincipalSource"
+ permission="zope.ManageServices"
+ view="AddSQLObjectPrincipalSourceForm.html"
+ />
<browser:addform
- schema="sqlos.interfaces.container.ISQLObjectContainerSchema"
- label="Add SQLObject Principal Source"
- content_factory=".SQLObjectPrincipalSource"
- arguments="classNames connectionName"
- name="AddSQLObjectPrincipalSourceForm.html"
- permission="zope.ManageContent"
- />
+ schema="sqlos.interfaces.container.ISQLObjectContainerSchema"
+ label="Add SQLObject Principal Source"
+ content_factory=".SQLObjectPrincipalSource"
+ arguments="classNames connectionName"
+ name="AddSQLObjectPrincipalSourceForm.html"
+ permission="zope.ManageContent"
+ />
<browser:editform
- schema="sqlos.interfaces.container.ISQLObjectContainerSchema"
- label="Edit SQLObject Principal Source"
- name="edit.html"
- menu="zmi_views"
- title="Edit"
- permission="zope.ManageContent"
- />
+ schema="sqlos.interfaces.container.ISQLObjectContainerSchema"
+ label="Edit SQLObject Principal Source"
+ name="edit.html"
+ menu="zmi_views"
+ title="Edit"
+ permission="zope.ManageContent"
+ />
</configure>
Modified: z3/sqlos/trunk/configure.zcml
==============================================================================
--- z3/sqlos/trunk/configure.zcml (original)
+++ z3/sqlos/trunk/configure.zcml Thu Jun 24 22:21:20 2004
@@ -1,8 +1,6 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:classService="http://namespaces.zope.org/class"
- i18n_domain="sqlobjectsupport">
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ i18n_domain="sqlos">
<include file="permissions.zcml" />
<include file="vocab.zcml" />
@@ -11,21 +9,20 @@
<browser:menuItem menu="add_content"
for="zope.app.container.interfaces.IAdding"
title="SQLObject Container"
- action="SQLObjectContainer"
+ action="SQLObjectContainer"
description="A container for SQLObject instances"
/>
<!-- ISQLObjectContainer Views -->
<browser:view
- name="+"
- for="sqlos.interfaces.container.ISQLObjectContainer"
- class=".container.SQLObjectAdding"
- permission="sqlos.AddContent"
- allowed_attributes="addingInfo"
- menu="zmi_actions"
- title="Add"
- >
+ name="+"
+ for="sqlos.interfaces.container.ISQLObjectContainer"
+ class=".container.SQLObjectAdding"
+ permission="sqlos.AddContent"
+ allowed_attributes="addingInfo"
+ menu="zmi_actions"
+ title="Add">
<browser:page name="index.html" template="add.pt" />
<browser:page name="action.html" attribute="action" />
</browser:view>
@@ -35,117 +32,116 @@
<implements interface="zope.app.container.interfaces.IContentContainer" />
<factory
- id="SQLObjectContainer"
- title="SQLObject Container"
- description="A container for SQLObject instances" />
+ id="SQLObjectContainer"
+ title="SQLObject Container"
+ description="A container for SQLObject instances" />
<require
- permission="zope.View"
- interface="zope.app.container.interfaces.IReadContainer"
- />
+ permission="zope.View"
+ interface="zope.app.container.interfaces.IReadContainer"
+ />
<require
- permission="zope.ManageContent"
- interface="zope.app.container.interfaces.IWriteContainer"
- />
+ permission="zope.ManageContent"
+ interface="zope.app.container.interfaces.IWriteContainer"
+ />
<require
- permission="zope.View"
- attributes="select"
- />
+ permission="zope.View"
+ attributes="select"
+ />
<require
- permission="zope.ManageContent"
- interface=".interfaces.container.ISQLObjectFactory"
- />
+ permission="zope.ManageContent"
+ interface=".interfaces.container.ISQLObjectFactory"
+ />
<require
- permission="zope.ManageContent"
- interface=".interfaces.container.ISQLObjectContainerSchema"
- set_schema=".interfaces.container.ISQLObjectContainerSchema"
- />
+ permission="zope.ManageContent"
+ interface=".interfaces.container.ISQLObjectContainerSchema"
+ set_schema=".interfaces.container.ISQLObjectContainerSchema"
+ />
</content>
<browser:defaultView
- for="sqlos.interfaces.container.ISQLObjectContainer"
- name="contents.html"
- />
+ for="sqlos.interfaces.container.ISQLObjectContainer"
+ name="contents.html"
+ />
<browser:page
- name="contents.html"
- menu="zmi_views" title="Contents"
- for=".interfaces.container.ISQLObjectContainer"
- permission="zope.ManageContent"
- class="zope.app.container.browser.contents.Contents"
- attribute="contents"
- />
+ name="contents.html"
+ menu="zmi_views" title="Contents"
+ for=".interfaces.container.ISQLObjectContainer"
+ permission="zope.ManageContent"
+ class="zope.app.container.browser.contents.Contents"
+ attribute="contents"
+ />
<browser:editform
- schema=".interfaces.container.ISQLObjectContainerSchema"
- name="edit.html"
- menu="zmi_views"
- label="Edit Content Settings"
- permission="zope.ManageContent"
- />
-
-
- <!-- Disable for now
-
- <adapter
- factory="
- sqlos.attributeannotations.SQLAttributeAnnotations"
- provides="zope.app.interfaces.annotation.IAnnotations"
- for="sqlos.interfaces.ISQLObject" />
-
- <adapter
- factory="
- sqlos.attributeannotations.SQLAttributeAnnotations"
- provides="zope.app.interfaces.annotation.IAnnotations"
- for="sqlos.interfaces.ISQLAttributeAnnotatable" />
+ schema=".interfaces.container.ISQLObjectContainerSchema"
+ name="edit.html"
+ menu="zmi_views"
+ label="Edit Content Settings"
+ permission="zope.ManageContent"
+ />
+
+
+ <!-- Disable for now -->
+
+ <!-- <adapter -->
+ <!-- factory=" -->
+ <!-- sqlos.attributeannotations.SQLAttributeAnnotations" -->
+ <!-- provides="zope.app.interfaces.annotation.IAnnotations" -->
+ <!-- for="sqlos.interfaces.ISQLObject" /> -->
+
+ <!-- <adapter -->
+ <!-- factory=" -->
+ <!-- sqlos.attributeannotations.SQLAttributeAnnotations" -->
+ <!-- provides="zope.app.interfaces.annotation.IAnnotations" -->
+ <!-- for="sqlos.interfaces.ISQLAttributeAnnotatable" /> -->
- -->
<class class=".adapter.MySQLAdapter">
<require
- permission="zope.Public"
- interface=".interfaces.IZopeSQLConnection"
- />
+ permission="zope.Public"
+ interface=".interfaces.IZopeSQLConnection"
+ />
</class>
<class class=".adapter.PostgresAdapter">
<require
- permission="zope.Public"
- interface=".interfaces.IZopeSQLConnection"
- />
+ permission="zope.Public"
+ interface=".interfaces.IZopeSQLConnection"
+ />
</class>
<class class=".adapter.SybaseAdapter">
<require
- permission="zope.Public"
- interface=".interfaces.IZopeSQLConnection"
- />
+ permission="zope.Public"
+ interface=".interfaces.IZopeSQLConnection"
+ />
</class>
<class class=".adapter.SQLiteAdapter">
<require
- permission="zope.Public"
- interface=".interfaces.IZopeSQLConnection"
- />
+ permission="zope.Public"
+ interface=".interfaces.IZopeSQLConnection"
+ />
</class>
<class class="sqlobject.cache.CacheSet">
<require
- permission="zope.Public"
- interface=".interfaces.ICacheSet"
- />
+ permission="zope.Public"
+ interface=".interfaces.ICacheSet"
+ />
</class>
<class class="sqlobject.main.SelectResults">
<require
- permission="zope.Public"
- interface=".interfaces.ISelectResults"
- />
+ permission="zope.Public"
+ interface=".interfaces.ISelectResults"
+ />
</class>
<!--
@@ -156,17 +152,17 @@
-->
<adapter
- provides=".interfaces.IZopeSQLConnection"
- for="zope.app.rdb.interfaces.IZopeConnection"
- permission="zope.Public"
- factory=".adapter.PostgresAdapter"
- />
+ provides=".interfaces.IZopeSQLConnection"
+ for="zope.app.rdb.interfaces.IZopeConnection"
+ permission="zope.Public"
+ factory=".adapter.PostgresAdapter"
+ />
<adapter
- provides="zope.app.container.interfaces.INameChooser"
- for="sqlos.interfaces.container.ISQLObjectContainer"
- permission="zope.Public"
- factory=".adapter.SQLObjectNameChooser"
- />
+ provides="zope.app.container.interfaces.INameChooser"
+ for="sqlos.interfaces.container.ISQLObjectContainer"
+ permission="zope.Public"
+ factory=".adapter.SQLObjectNameChooser"
+ />
</configure>
Modified: z3/sqlos/trunk/meta.zcml
==============================================================================
--- z3/sqlos/trunk/meta.zcml (original)
+++ z3/sqlos/trunk/meta.zcml Thu Jun 24 22:21:20 2004
@@ -1,5 +1,5 @@
<configure xmlns='http://namespaces.zope.org/zope'
- xmlns:meta="http://namespaces.zope.org/meta"
+ xmlns:meta="http://namespaces.zope.org/meta"
i18n_domain="sqlos">
<serviceType id='ClassService'
@@ -18,16 +18,16 @@
<meta:directives namespace="http://namespaces.sqlobject.org/sqlos">
<meta:directive
- name="factory"
- schema=".metadirectives.IFactoryDirective"
- handler=".metaconfigure.factory"
- />
+ name="factory"
+ schema=".metadirectives.IFactoryDirective"
+ handler=".metaconfigure.factory"
+ />
<meta:directive
- name="connectionName"
- schema=".metadirectives.IConnectionName"
- handler=".metaconfigure.connectionName"
- />
+ name="connectionName"
+ schema=".metadirectives.IConnectionName"
+ handler=".metaconfigure.connectionName"
+ />
</meta:directives>
Modified: z3/sqlos/trunk/permissions.zcml
==============================================================================
--- z3/sqlos/trunk/permissions.zcml (original)
+++ z3/sqlos/trunk/permissions.zcml Thu Jun 24 22:21:20 2004
@@ -1,14 +1,13 @@
-<configure
- xmlns="http://namespaces.zope.org/zope">
+<configure xmlns="http://namespaces.zope.org/zope">
<permission
- id="sqlos.AddContent"
- title="[add-content-permission] sqlos - Add Content"
- />
+ id="sqlos.AddContent"
+ title="[add-content-permission] sqlos - Add Content"
+ />
<!--
XXX Not defined by the time we are loaded
- <grant
+ <grant
permission="sqlos.AddContent"
role="zope.Manager" />
-->
Modified: z3/sqlos/trunk/services/sqlfactoryservice.zcml
==============================================================================
--- z3/sqlos/trunk/services/sqlfactoryservice.zcml (original)
+++ z3/sqlos/trunk/services/sqlfactoryservice.zcml Thu Jun 24 22:21:20 2004
@@ -4,55 +4,55 @@
<!-- start LocalSQLObjectFactoryService -->
<content
- class="sqlos.services.sqlfactoryservice.LocalSQLObjectFactoryService">
+ class="sqlos.services.sqlfactoryservice.LocalSQLObjectFactoryService">
<implements
- interface="sqlos.interfaces.services.ILocalSQLObjectFactoryService"
- />
+ interface="sqlos.interfaces.services.ILocalSQLObjectFactoryService"
+ />
<factory
- title="SQLObject Factory Service"
- description="A SQLObject Factory Service"
- />
+ title="SQLObject Factory Service"
+ description="A SQLObject Factory Service"
+ />
<require
- permission="zope.ManageServices"
- interface="sqlos.interfaces.container.ISQLObjectFactory"
- />
+ permission="zope.ManageServices"
+ interface="sqlos.interfaces.container.ISQLObjectFactory"
+ />
<require
- permission="zope.ManageServices"
- interface="sqlos.interfaces.container.ISQLObjectContainerSchema"
- />
+ permission="zope.ManageServices"
+ interface="sqlos.interfaces.container.ISQLObjectContainerSchema"
+ />
<require
- permission="zope.ManageServices"
- set_schema="sqlos.interfaces.container.ISQLObjectContainerSchema"
- />
+ permission="zope.ManageServices"
+ set_schema="sqlos.interfaces.container.ISQLObjectContainerSchema"
+ />
</content>
<browser:addMenuItem
- class="sqlos.services.sqlfactoryservice.LocalSQLObjectFactoryService"
- title="SQLObject Factory Service"
- description="A SQLObject Factory Service"
- permission="zope.ManageServices"
- />
+ class="sqlos.services.sqlfactoryservice.LocalSQLObjectFactoryService"
+ title="SQLObject Factory Service"
+ description="A SQLObject Factory Service"
+ permission="zope.ManageServices"
+ />
<serviceType
- id="SQLObjectFactory"
- interface="sqlos.interfaces.services.ILocalSQLObjectFactoryService"
- />
+ id="SQLObjectFactory"
+ interface="sqlos.interfaces.services.ILocalSQLObjectFactoryService"
+ />
<browser:addform
- schema="sqlos.interfaces.services.ILocalSQLObjectFactoryService"
- for="zope.app.container.interfaces.IAdding"
- name="AddFactoryService"
- label="Edit Connection Settings"
- permission="zope.ManageContent"
- content_factory="sqlos.services.sqlfactoryservice.LocalSQLObjectFactoryService"
- set_after_add="connectionName"
- />
+ schema="sqlos.interfaces.services.ILocalSQLObjectFactoryService"
+ for="zope.app.container.interfaces.IAdding"
+ name="AddFactoryService"
+ label="Edit Connection Settings"
+ permission="zope.ManageContent"
+ content_factory="sqlos.services.sqlfactoryservice.LocalSQLObjectFactoryService"
+ set_after_add="connectionName"
+ />
</configure>
Modified: z3/sqlos/trunk/vocab.zcml
==============================================================================
--- z3/sqlos/trunk/vocab.zcml (original)
+++ z3/sqlos/trunk/vocab.zcml Thu Jun 24 22:21:20 2004
@@ -1,9 +1,8 @@
-<configure
- xmlns="http://namespaces.zope.org/zope">
+<configure xmlns="http://namespaces.zope.org/zope">
<vocabulary
- name="sqlos.vocab.ClassNamesVocab"
- factory="sqlos.vocab.ClassNamesVocab"
- />
+ name="sqlos.vocab.ClassNamesVocab"
+ factory="sqlos.vocab.ClassNamesVocab"
+ />
</configure>
\ No newline at end of file
More information about the z3-checkins
mailing list