[Checkins] SVN: zam.skin/trunk/ Cleanup ftesting configuration, make it possbile to load ftesting.zcml

[Roger Ineichen]

Log message for revision 85326:
  Cleanup ftesting configuration, make it possbile to load ftesting.zcml
  additional to the app.zcml configuration.

Changed:
  U   zam.skin/trunk/CHANGES.txt
  U   zam.skin/trunk/buildout.cfg
  U   zam.skin/trunk/src/zam/skin/ftesting.zcml

-=-
Modified: zam.skin/trunk/CHANGES.txt
===================================================================
--- zam.skin/trunk/CHANGES.txt	2008-04-13 14:57:51 UTC (rev 85325)
+++ zam.skin/trunk/CHANGES.txt	2008-04-13 15:05:12 UTC (rev 85326)
@@ -5,7 +5,8 @@
 Version 0.5.1dev (unreleased)
 -----------------------------
 
-- ...
+- Cleanup ftesting configuration, make it possbile to load ftesting.zcml
+  additional to the app.zcml configuration.
 
 Version 0.5.0 (2008-04-13)
 --------------------------

Modified: zam.skin/trunk/buildout.cfg
===================================================================
--- zam.skin/trunk/buildout.cfg	2008-04-13 14:57:51 UTC (rev 85325)
+++ zam.skin/trunk/buildout.cfg	2008-04-13 15:05:12 UTC (rev 85326)
@@ -77,7 +77,7 @@
   <!-- Turn on the devmode -->
   <meta:provides feature="devmode" />
 
-  <!-- include ZAM app configuration -->
+  <!-- include app configuration -->
   <include package="zam.skin" file="app.zcml" />
 
   <!-- load other zcml files -->

Modified: zam.skin/trunk/src/zam/skin/ftesting.zcml
===================================================================
--- zam.skin/trunk/src/zam/skin/ftesting.zcml	2008-04-13 14:57:51 UTC (rev 85325)
+++ zam.skin/trunk/src/zam/skin/ftesting.zcml	2008-04-13 15:05:12 UTC (rev 85326)
@@ -7,14 +7,7 @@
   <!-- use ftesting configuration from zam.api -->
   <include package="zam.api" file="ftesting.zcml" />
 
+  <!-- include app configuration -->
+  <include package="zam.skin" file="app.zcml" />
 
-  <!-- zam skin configuration -->
-  <include package="zam.api" />
-  <include package="zam.skin" />
-
-
-  <!-- configure defaults -->
-  <browser:defaultSkin name="ZAM" />
-  <browser:defaultView name="index.html" />
-
 </configure>