[Zope3-checkins] CVS: Zope3/lib/python/Zope/App - event-meta.zcml:1.2 event.zcml:1.2 i18n-meta.zcml:1.2 i18n.zcml:1.2 configure.zcml:1.8 meta.zcml:1.6

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App
In directory cvs.zope.org:/tmp/cvs-serv11465/lib/python/Zope/App

Modified Files:
	configure.zcml meta.zcml 
Added Files:
	event-meta.zcml event.zcml i18n-meta.zcml i18n.zcml 
Log Message:

Two changes that were far reaching and interdependent.

- Changed existing directives that mention interfaces to register
  those interfaces with the global interface service.

- Moved all configuration support (except that in Zope.Configuration)
  into Zope.App. This was necessary to get the order of execution such
  that the interface service was defined before directives that used
  interfaces were used.  This is a change that has been needed for
  some time.



=== Zope3/lib/python/Zope/App/event-meta.zcml 1.1 => 1.2 ===
--- /dev/null	Tue Nov 19 18:25:43 2002
+++ Zope3/lib/python/Zope/App/event-meta.zcml	Tue Nov 19 18:25:12 2002
@@ -0,0 +1,10 @@
+<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
+
+  <directives namespace="http://namespaces.zope.org/event">
+
+    <directive name="subscribe" attributes="subscriber event_types filter"
+       handler="Zope.Event.metaConfigure.subscribe" />
+
+  </directives>
+
+</zopeConfigure>


=== Zope3/lib/python/Zope/App/event.zcml 1.1 => 1.2 ===
--- /dev/null	Tue Nov 19 18:25:43 2002
+++ Zope3/lib/python/Zope/App/event.zcml	Tue Nov 19 18:25:12 2002
@@ -0,0 +1,12 @@
+<zopeConfigure
+   xmlns='http://namespaces.zope.org/zope'
+   xmlns:browser='http://namespaces.zope.org/browser'
+>
+
+<serviceType id='Events' 
+             interface='Zope.Event.IEventService.' />
+
+<service serviceType='Events'
+         component='Zope.Event.GlobalEventService.eventService' />
+
+</zopeConfigure>


=== Zope3/lib/python/Zope/App/i18n-meta.zcml 1.1 => 1.2 ===
--- /dev/null	Tue Nov 19 18:25:43 2002
+++ Zope3/lib/python/Zope/App/i18n-meta.zcml	Tue Nov 19 18:25:12 2002
@@ -0,0 +1,14 @@
+<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
+  <!-- Zope.I18n -->
+  <directives namespace="http://namespaces.zope.org/gts">
+
+    <directive name="registerTranslations"
+               attributes="directory"
+               handler="Zope.I18n.metaConfigure.registerTranslations" />
+
+    <directive name="defaultLanguages"
+               attributes="languages"
+               handler="Zope.I18n.metaConfigure.defaultLanguages" />
+
+  </directives>
+</zopeConfigure>


=== Zope3/lib/python/Zope/App/i18n.zcml 1.1 => 1.2 ===
--- /dev/null	Tue Nov 19 18:25:43 2002
+++ Zope3/lib/python/Zope/App/i18n.zcml	Tue Nov 19 18:25:12 2002
@@ -0,0 +1,30 @@
+<zopeConfigure
+   xmlns="http://namespaces.zope.org/zope"
+   xmlns:service="http://namespaces.zope.org/service"
+   xmlns:gts="http://namespaces.zope.org/gts"
+   package="Zope.I18n"
+   >
+
+<!-- Setup language negotiation -->
+<serviceType id="LanguageNegotiation" interface=".INegotiator." />
+
+<service serviceType="LanguageNegotiation" 
+    component=".Negotiator.negotiator" />
+
+<adapter factory="Zope.Publisher.Browser.BrowserLanguages."
+    for="Zope.Publisher.Browser.IBrowserRequest."
+    provides="Zope.I18n.IUserPreferredLanguages." />
+
+<!-- Setup charset negotiation -->
+<adapter factory="Zope.Publisher.HTTP.HTTPCharsets."
+    for="Zope.Publisher.HTTP.IHTTPRequest."
+    provides="Zope.I18n.IUserPreferredCharsets." />
+
+<!-- Setup Translation Service -->
+<serviceType id="Translation" interface=".ITranslationService." />
+
+<service serviceType="Translation"
+    permission="Zope.Public"
+    component=".GlobalTranslationService.translationService" />
+
+</zopeConfigure>


=== Zope3/lib/python/Zope/App/configure.zcml 1.7 => 1.8 ===
--- Zope3/lib/python/Zope/App/configure.zcml:1.7	Mon Nov 18 17:25:16 2002
+++ Zope3/lib/python/Zope/App/configure.zcml	Tue Nov 19 18:25:12 2002
@@ -1,11 +1,15 @@
 <zopeConfigure xmlns='http://namespaces.zope.org/zope' >
 
+  <include file="meta.zcml" />
+
   <include package=".ComponentArchitecture" />
+  <include file="event.zcml" />
+  <include file="i18n.zcml" />
+  <include package=".Security" />
   <include package=".Publisher" />
   <include package=".ZMI" />
   <include package=".OFS" />
   <include package=".RDB" />
-  <include package=".Security" />
   <include package=".Traversing" />
   <include package=".ZopePublication" />
   <include package=".Undo" />
@@ -13,5 +17,6 @@
   <include package=".Caching" />
   <include package=".DublinCore" />
   <include package=".DependencyFramework" />
+  <include package=".StartUp" />
 
 </zopeConfigure>


=== Zope3/lib/python/Zope/App/meta.zcml 1.5 => 1.6 ===
--- Zope3/lib/python/Zope/App/meta.zcml:1.5	Mon Nov 11 15:54:03 2002
+++ Zope3/lib/python/Zope/App/meta.zcml	Tue Nov 19 18:25:12 2002
@@ -1,5 +1,8 @@
 <zopeConfigure xmlns='http://namespaces.zope.org/zope'>
 
+<!-- Standard configuration directives -->
+<include package="Zope.Configuration" file="meta.zcml" />
+
 <include package=".ComponentArchitecture" file="meta.zcml" />
 <include package=".Publisher" file="meta.zcml" />
 <include package=".Traversing" file="meta.zcml" />
@@ -7,5 +10,8 @@
 <include package=".Forms.Browser" file="meta.zcml" />
 <include package=".OFS" file="meta.zcml" />
 <include package=".ContentDirective" file="meta.zcml" />
+<include file="event-meta.zcml" />
+<include file="i18n-meta.zcml" />
+<include package=".StartUp" file="meta.zcml" />
 
 </zopeConfigure>