[Checkins] SVN: z3c.boston/trunk/z3c Broke the module dependencies into a separate file and allowed

[Kevin Gill]

Log message for revision 92422:
  Broke the module dependencies into a separate file and allowed
  inclusion of the dependencies to be disabled via a meta:provides tag.
  
  

Changed:
  U   z3c.boston/trunk/z3c/boston/configure.zcml
  A   z3c.boston/trunk/z3c/boston/dependencies.zcml
  U   z3c.boston/trunk/z3c.boston.egg-info/PKG-INFO
  U   z3c.boston/trunk/z3c.boston.egg-info/SOURCES.txt

-=-
Modified: z3c.boston/trunk/z3c/boston/configure.zcml
===================================================================
--- z3c.boston/trunk/z3c/boston/configure.zcml	2008-10-21 10:46:12 UTC (rev 92421)
+++ z3c.boston/trunk/z3c/boston/configure.zcml	2008-10-21 10:47:38 UTC (rev 92422)
@@ -1,29 +1,15 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     xmlns:z3c="http://namespaces.zope.org/z3c"
     i18n_domain="z3c.boston">
 
-  <!-- Include the Boston Skin and its dependencies -->
-  <include package="zope.viewlet" file="meta.zcml" />
-  <include package="zope.contentprovider"/>
-  <include package="zope.app.boston" />
+  <include
+    zcml:condition="not-have z3c.boston:dependencies"
+    package="z3c.boston"
+    file="dependencies.zcml" />
 
-  <!-- dependencies for z3c.boston -->
-  <include package="z3c.zrtresource" file="meta.zcml"/>
-  <include package="z3c.form" file="meta.zcml" />
-  <include package="z3c.pagelet" file="meta.zcml" />
-  <include package="z3c.macro" file="meta.zcml" />
-  <include package="z3c.template" file="meta.zcml" />
-
-  <include package="z3c.pagelet" />
-  <include package="z3c.formui" />
-  <include package="z3c.form" />
-  <include package="jquery.layer" />
-  <include package="z3c.formjs"/>
-
-  <!-- Configuration the z3c.boston skin -->
-
   <interface
       interface=".IPageletLayer"
       type="zope.publisher.interfaces.browser.IBrowserSkinType"

Added: z3c.boston/trunk/z3c/boston/dependencies.zcml
===================================================================
--- z3c.boston/trunk/z3c/boston/dependencies.zcml	                        (rev 0)
+++ z3c.boston/trunk/z3c/boston/dependencies.zcml	2008-10-21 10:47:38 UTC (rev 92422)
@@ -0,0 +1,33 @@
+<!--
+This is a set of packages auomatically imported by z3c.boston,
+to support the packages that it needs, above and beyond the
+base installation created by zopeproject.
+
+Inclusion is condition on z3c.boston:dependencies not being defined.
+-->
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    >
+
+  <!-- Include the Boston Skin and its dependencies -->
+  <include package="zope.viewlet" file="meta.zcml" />
+  <include package="zope.contentprovider"/>
+  <include package="zope.app.boston" />
+
+  <!-- dependencies for z3c.boston -->
+  <include package="z3c.zrtresource" file="meta.zcml"/>
+  <include package="z3c.form" file="meta.zcml" />
+  <include package="z3c.pagelet" file="meta.zcml" />
+  <include package="z3c.macro" file="meta.zcml" />
+  <include package="z3c.template" file="meta.zcml" />
+
+  <include package="z3c.pagelet" />
+  <include package="z3c.formui" />
+  <include package="z3c.form" />
+  <include package="jquery.layer" />
+  <include package="z3c.formjs"/>
+
+  <meta:provides feature="z3c.boston:dependencies" />
+
+</configure>


Property changes on: z3c.boston/trunk/z3c/boston/dependencies.zcml
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: z3c.boston/trunk/z3c.boston.egg-info/PKG-INFO
===================================================================
--- z3c.boston/trunk/z3c.boston.egg-info/PKG-INFO	2008-10-21 10:46:12 UTC (rev 92421)
+++ z3c.boston/trunk/z3c.boston.egg-info/PKG-INFO	2008-10-21 10:47:38 UTC (rev 92422)
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: z3c.boston
-Version: 1.0.1devdev-r92402
+Version: 1.0.1devdev-r92403
 Summary: A version of the zope.app.boston skin which support pagelets.
 Home-page: http://pypi.python.org/pypi/z3c.boston
 Author: Kevin Gill and the Zope Community

Modified: z3c.boston/trunk/z3c.boston.egg-info/SOURCES.txt
===================================================================
--- z3c.boston/trunk/z3c.boston.egg-info/SOURCES.txt	2008-10-21 10:46:12 UTC (rev 92421)
+++ z3c.boston/trunk/z3c.boston.egg-info/SOURCES.txt	2008-10-21 10:47:38 UTC (rev 92422)
@@ -1,4 +1,6 @@
 README.txt
+bootstrap.py
+buildout.cfg
 setup.cfg
 setup.py
 docs/HISTORY.txt
@@ -16,6 +18,7 @@
 z3c/boston/configure.zcml
 z3c/boston/default_skin.zcml
 z3c/boston/demo.py
+z3c/boston/dependencies.zcml
 z3c/boston/ftesting.zcml
 z3c/boston/testing.py
 z3c/boston/tests.py