[Zope3-checkins] CVS: Zope3/src/zope/app/services - configure.zcml:1.1.2.3 viewpackage.py:1.1.2.4 error.gif:NONE error_service.gif:NONE event_service.gif:NONE hub.gif:NONE role.gif:NONE role_service.gif:NONE service.gif:NONE

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv29250/src/zope/app/services

Modified Files:
      Tag: NameGeddon-branch
	configure.zcml viewpackage.py 
Removed Files:
      Tag: NameGeddon-branch
	error.gif error_service.gif event_service.gif hub.gif role.gif 
	role_service.gif service.gif 
Log Message:
moved icon image files to the view hoerarchy and fixed up some zcml

=== Zope3/src/zope/app/services/configure.zcml 1.1.2.2 => 1.1.2.3 === (615/715 lines abridged)
--- Zope3/src/zope/app/services/configure.zcml:1.1.2.2	Tue Dec 24 07:51:17 2002
+++ Zope3/src/zope/app/services/configure.zcml	Tue Dec 24 18:20:26 2002
@@ -1,56 +1,63 @@
-<zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser="http://namespaces.zope.org/browser"
-   >
+<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
 
 <!-- Configuration registries -->
 
-<content class="zope.app.services.configuration.ConfigurationRegistry">
-   <require permission="zope.ManageServices"
-            interface="zope.app.interfaces.services.configuration.IConfigurationRegistry"
-            />
-</content>
+  <content class="zope.app.services.configuration.ConfigurationRegistry">
+    <require
+       permission="zope.ManageServices"
+       interface=
+       "zope.app.interfaces.services.configuration.IConfigurationRegistry"
+       />
+    </content>
 
 <!-- Adapter Service -->
 
-<content class="zope.app.services.adapter.AdapterService">
-    <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-    <factory id="zope.app.services.AdapterService"
-             permission="zope.ManageServices"
-             />
-    <require permission="zope.ManageServices"
-             interface="zope.app.interfaces.services.configuration.IConfigurable"
-             attributes="getRegisteredMatching"
-             />
-</content>
+  <content class="zope.app.services.adapter.AdapterService">
+    <implements
+       interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
+       />
+    <factory
+       id="zope.app.services.AdapterService"
+       permission="zope.ManageServices"
+       />
+    <require
+       permission="zope.ManageServices"
+       interface="zope.app.interfaces.services.configuration.IConfigurable"
+       attributes="getRegisteredMatching"
+       />
+    </content>

[-=- -=- -=- 615 lines omitted -=- -=- -=-]

-<!-- Authentication Service Directives -->
+<!-- Authentication Service -->
 
-<content class="zope.app.services.auth.AuthenticationService">
+  <content class="zope.app.services.auth.AuthenticationService">
  
     <factory id="AuthenticationService" permission="zope.ManageServices" />
 
@@ -497,27 +441,21 @@
         permission="zope.ManageServices"
         interface="zope.app.interfaces.container.IContainer" />
 
-    <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+    <implements
+       interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
 
-</content>
+    </content>
 
-
-<!-- User Directives -->
-
-<content class="zope.app.services.auth.User">
-  <factory id="User" permission="zope.ManageServices" />
-    <require
-        permission="zope.View"
-        interface="zope.app.interfaces.services.auth.IReadUser" />
-    <require
-        permission="zope.ManageContent"
-        interface="zope.app.interfaces.services.auth.IWriteUser" />
-    <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-</content>
-
-
-<!-- Further directives -->
-
-<include package=".Views" />
+  <content class="zope.app.services.auth.User">
+    <factory id="User" permission="zope.ManageServices" />
+      <require
+          permission="zope.View"
+          interface="zope.app.interfaces.services.auth.IReadUser" />
+      <require
+          permission="zope.ManageContent"
+          interface="zope.app.interfaces.services.auth.IWriteUser" />
+      <implements
+          interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+    </content>
 
 </zopeConfigure>


=== Zope3/src/zope/app/services/viewpackage.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/services/viewpackage.py:1.1.2.3	Tue Dec 24 07:51:17 2002
+++ Zope3/src/zope/app/services/viewpackage.py	Tue Dec 24 18:20:26 2002
@@ -29,7 +29,7 @@
 from zope.app.services.configuration import ConfigurationStatusProperty
 from zope.proxy.introspection import removeAllProxies
 from zope.app.services.view import PageConfiguration
-from zope.app.interfaces.services.servicemanager.interfaces import IViewPackage
+from zope.app.interfaces.services.service import IViewPackage
 
 class ViewPackage(BTreeContainer):
 

=== Removed File Zope3/src/zope/app/services/error.gif ===

=== Removed File Zope3/src/zope/app/services/error_service.gif ===

=== Removed File Zope3/src/zope/app/services/event_service.gif ===

=== Removed File Zope3/src/zope/app/services/hub.gif ===

=== Removed File Zope3/src/zope/app/services/role.gif ===

=== Removed File Zope3/src/zope/app/services/role_service.gif ===

=== Removed File Zope3/src/zope/app/services/service.gif ===