[Checkins] SVN: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/ re-add <autoinclude> and <autoincludeOverrides> directives by popular request but deprecate them.

[Ethan Jucovy]

Log message for revision 84938:
  re-add <autoinclude> and <autoincludeOverrides> directives by popular request but deprecate them.

Changed:
  U   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/meta.zcml
  U   z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/zcml.py

-=-
Modified: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/meta.zcml
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/meta.zcml	2008-03-25 16:44:28 UTC (rev 84937)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/meta.zcml	2008-03-25 16:57:57 UTC (rev 84938)
@@ -14,7 +14,19 @@
         handler=".zcml.autoIncludeOverridesDirective"
         />
 
+    <!-- deprecated -->
     <meta:directive
+        name="autoinclude"
+        schema=".zcml.IAutoIncludeDirective"
+        handler=".zcml.deprecatedAutoIncludeDirective"
+        />
+    <meta:directive
+        name="autoincludeOverrides"
+        schema=".zcml.IAutoIncludeDirective"
+        handler=".zcml.deprecatedAutoIncludeOverridesDirective"
+        />
+
+    <meta:directive
         name="includePlugins"
         schema=".zcml.IIncludePluginsDirective"
         handler=".zcml.includePluginsDirective"

Modified: z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/zcml.py
===================================================================
--- z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/zcml.py	2008-03-25 16:44:28 UTC (rev 84937)
+++ z3c.autoinclude/branches/adding-salt/src/z3c/autoinclude/zcml.py	2008-03-25 16:57:57 UTC (rev 84938)
@@ -40,7 +40,7 @@
 
     includeZCMLGroup(_context, dist, info, 'meta.zcml')
     includeZCMLGroup(_context, dist, info, 'configure.zcml')
-    
+
 class IIncludePluginsDirective(Interface):
     """Auto-include any ZCML in the dependencies of this package."""
     
@@ -62,3 +62,13 @@
     includeZCMLGroup(_context, dist, info, 'meta.zcml')
     includeZCMLGroup(_context, dist, info, 'configure.zcml')
     includeZCMLGroup(_context, dist, info, 'overrides.zcml', override=True)
+
+import warnings
+def deprecatedAutoIncludeDirective(_context, package):
+    warnings.warn("The <autoinclude> directive is deprecated and will be ignored in z3c.autoinclude 0.3. Please use <includeDependencies> instead.", DeprecationWarning, stacklevel=2)
+    autoIncludeDirective(_context, package)
+
+def deprecatedAutoIncludeOverridesDirective(_context, package):
+    warnings.warn("The <autoincludeOverrides> directive is deprecated and will be ignored in z3c.autoinclude 0.3. Please use <includeDependenciesOverrides> instead.", DeprecationWarning, stacklevel=2)
+    autoIncludeOverridesDirective(_context, package)
+