8 files changed, 25 insertions, 158 deletions
diff --git a/examples/Bundler/dirvish.xml b/examples/Bundler/dirvish.xml
new file mode 100644
index 000000000..47bf8cf54
--- /dev/null
+++ b/examples/Bundler/dirvish.xml
@@ -0,0 +1,20 @@
+<Bundle xmlns:py="http://genshi.edgewall.org/">
+  <py:for each="user in metadata.Properties['dirvish.xml'].xdata.find('users')">
+    <!-- Generate configs for all users in dirvish.xml -->
+    <BoundPath
+        name='/backup/homes/${user.tag}/dirvish/default.conf'
+        owner='root'
+        group='root'
+        perms='0644'>client: nfs-host
+tree: /export/homes/${user.text}
+exclude:
+	*~
+	.nfs*
+    </BoundPath>
+  </py:for>
+
+  <Package name='dirvish'/>
+  <Path name='/etc/cron.d/dirvish'/>
+  <Path name='/etc/dirvish/dirvish-cronjob'/>
+  <Path name='/etc/dirvish/master.conf'/>
+</Bundle>
diff --git a/examples/Bundler/sgenshi-dirvish.genshi b/examples/Bundler/sgenshi-dirvish.genshi
deleted file mode 100644
index b4ea08f2c..000000000
--- a/examples/Bundler/sgenshi-dirvish.genshi
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-vim: ft=xml
--->
-<Bundle name='sgenshi-dirvish' xmlns:py="http://genshi.edgewall.org/">
-<py:for each="user in metadata.Properties['dirvish.xml'].xdata.find('users')">
-<!-- Generate configs for all users in dirvish.xml -->
-<BoundPath
-	name='/backup/homes/${user.tag}/dirvish/default.conf'
-	owner='root'
-	group='root'
-	perms='0644'>client: nfs-host
-tree: /export/homes/${user.text}
-exclude:
-	*~
-	.nfs*
-</BoundPath>
-</py:for>
-
-<Package name='dirvish'/>
-<Path name='/etc/cron.d/dirvish'/>
-<Path name='/etc/dirvish/dirvish-cronjob'/>
-<Path name='/etc/dirvish/master.conf'/>
-</Bundle>
diff --git a/examples/TGenshi/etc/dirvish/master.conf/template.newtxt b/examples/Cfg/etc/dirvish/master.conf/master.conf.genshi
index 6c9750f9d..6c9750f9d 100644
--- a/examples/TGenshi/etc/dirvish/master.conf/template.newtxt
+++ b/examples/Cfg/etc/dirvish/master.conf/master.conf.genshi
diff --git a/examples/TGenshi/etc/motd/template.newtxt b/examples/TGenshi/etc/motd/template.newtxt
deleted file mode 100644
index ca3cc5f18..000000000
--- a/examples/TGenshi/etc/motd/template.newtxt
+++ /dev/null
@@ -1,31 +0,0 @@
-------------------------------------------------------------------------
-                    GOALS FOR SERVER MANAGED BY BCFG2
-------------------------------------------------------------------------
-Hostname is ${metadata.hostname}
-
-Groups:
-{% for group in metadata.groups %}\
- * ${group}
-{% end %}\
-
-{% if metadata.categories %}\
-Categories:
-{% for category in metadata.categories %}\
- * ${category}
-{% end %}\
-{% end %}\
-
-
-{% if metadata.Probes %}\
-Probes:
-{% for probe, value in metadata.Probes.iteritems() %}\
- * ${probe} \
-   ${value}
-{% end %}\
-{% end %}\
-
-------------------------------------------------------------------------
-                        ITOPS MOTD
-------------------------------------------------------------------------
-Please create a Ticket for any system level changes you need from IT.
-
diff --git a/examples/TGenshi/tmp/bar/template.txt b/examples/TGenshi/tmp/bar/template.txt
deleted file mode 100644
index dbf482c22..000000000
--- a/examples/TGenshi/tmp/bar/template.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[communication]
-protocol = xmlrpc/ssl
-#if metadata.uuid != None
-user = $metadata.uuid
-#end
-#choose
-#when metadata.password is not None
-password = $metadata.password
-#end
-#when metadata.password is None
-password = GlobalPassword
-#end
-#end
-
-[client]
-drivers = Action,Chkconfig,POSIX,YUMng
-
-[components]
-bcfg2 = https://config.example.com:6789
diff --git a/examples/TGenshi/tmp/foo/template.xml b/examples/TGenshi/tmp/foo/template.xml
deleted file mode 100644
index 522c6e7fe..000000000
--- a/examples/TGenshi/tmp/foo/template.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/">
-  <head>
-    <title>${name}</title>
-  </head>
-  <body>
-    <table>
-      <tr><th>Name:</th><td>${name}</td></tr>
-      <tr><th>Hostname:</th><td>${metadata.hostname}</td></tr>
-      <tr><th>Toolset:</th><td>${metadata.hostname}</td></tr>
-      <tr><th>UUID:</th><td>${metadata.uuid}</td></tr>
-      <tr><th>Password:</th><td>${metadata.password}</td></tr>
-      <tr>
-	<th>Bundles:</th>
-	<td>
-	  <table>
-	    <tr py:for="bundle in metadata.bundles"><td>${bundle}</td></tr>
-	  </table>
-	</td>
-      </tr>
-      <tr>
-	<th>Groups:</th>
-	<td>
-	  <table>
-	    <tr py:for="group in metadata.groups"><td>${group}</td></tr>
-	  </table>
-	</td>
-      </tr>
-      <tr>
-	<th>Categories:</th>
-	<td>
-	  <table>
-	    <tr py:for="category in metadata.categories"><td>${category}</td></tr>
-	  </table>
-	</td>
-      </tr>
-      <tr>
-	<th>Probes:</th>
-	<td>
-	  <table>
-	    <tr py:for="probe in metadata.probes"><td>${probe}</td><td>${metadata.probes[probe]}</td></tr>
-	  </table>
-	</td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/examples/TemplateHelper/include.py b/examples/TemplateHelper/include.py
index be0034f52..fcdb42ac9 100644
--- a/examples/TemplateHelper/include.py
+++ b/examples/TemplateHelper/include.py
@@ -5,14 +5,13 @@ Synopsis:
 
   {% python
   import os
-  include = metadata.TemplateHelper['include']
-  custom = include.IncludeHelper(metadata, path).files(os.path.basename(name))
+  custom = IncludeHelper(metadata, path).files(os.path.basename(name))
   %}\
   {% for file in custom %}\
 
-  ########## Start ${include.describe_specificity(file)} ##########
+  ########## Start ${describe_specificity(file)} ##########
   {% include ${file} %}
-  ########## End ${include.describe_specificity(file)} ##########
+  ########## End ${describe_specificity(file)} ##########
   {% end %}\
 
 This would let you include files with the same base name; e.g. in a
@@ -20,7 +19,7 @@ template for ''foo.conf'', the include files would be called
 ''foo.conf.G_<group>.genshi_include''.  If a template needs to include
 different files in different places, you can do that like so:
 
-  inc = metadata.TemplateHelper['include'].IncludeHelper(metadata, path)
+  inc = IncludeHelper(metadata, path)
   custom_bar = inc.files("bar")
   custom_baz = inc.files("baz")
 
@@ -33,7 +32,7 @@ from ''baz.conf.G_<group>.genshi_include''.
 import os
 import re
 
-__export__ = ["IncludeHelper", "get_specificity", "describe_specificity"]
+__default__ = ["IncludeHelper", "get_specificity", "describe_specificity"]
 
 
 class IncludeHelper(object):
diff --git a/examples/bcfg2.confHostbase b/examples/bcfg2.confHostbase
deleted file mode 100644
index c9420e34a..000000000
--- a/examples/bcfg2.confHostbase
+++ /dev/null
@@ -1,33 +0,0 @@
-[server]
-repository = /var/lib/bcfg2
-plugins = Bundler,Rules,Metadata,SSHbase,Cfg
-
-[statistics]
-sendmailpath = /usr/sbin/sendmail
-
-[communication]
-protocol = xmlrpc/ssl
-password = foobat
-key = /etc/bcfg2.key
-
-[components]
-bcfg2 = https://localhost:6789
-
-[hostbase]
-# postgresql, mysql, sqlite3 or ado_mssql
-database_engine = mysql
-# Or path to database file if using sqlite3.
-database_name = 
-# Not used with sqlite3.
-database_user = 
-# Not used with sqlite3.
-database_password =
-# Set to empty string for localhost. Not used with sqlite3.
-database_host = 
-# Set to empty string for default. Not used with sqlite3.
-database_port = 3306
-# enter an NIS group name you'd like to give access to edit hostbase records
-##authorized_group = support
-# default mx record for new hosts added to the database
-default_mx = mailserver.yourdomain.net
-priority = 30