1 files changed, 13 insertions, 19 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/GroupLogic.py b/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
index d74c16e8b..b60f60e65 100644
--- a/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
+++ b/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
@@ -6,30 +6,24 @@ import lxml.etree
 from threading import local
 import Bcfg2.Server.Plugin
 from Bcfg2.Server.Plugins.Metadata import MetadataGroup
-try:
-    from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile
-except ImportError:
-    # BundleTemplateFile missing means that genshi is missing.  we
-    # import genshi to get the _real_ error
-    import genshi  # pylint: disable=W0611
 
 
-class GroupLogicConfig(BundleTemplateFile):
+class GroupLogicConfig(Bcfg2.Server.Plugin.StructFile):
     """ Representation of the GroupLogic groups.xml file """
     create = lxml.etree.Element("GroupLogic",
                                 nsmap=dict(py="http://genshi.edgewall.org/"))
 
-    def __init__(self, name, fam):
-        BundleTemplateFile.__init__(self, name,
-                                    Bcfg2.Server.Plugin.Specificity(), None)
-        self.fam = fam
-        self.should_monitor = True
-        self.fam.AddMonitor(self.name, self)
+    def _match(self, item, metadata, *args):
+        if item.tag == 'Group' and not len(item.getchildren()):
+            return [item]
+        return Bcfg2.Server.Plugin.StructFile._match(self, item, metadata,
+                                                     *args)
 
-    def _match(self, item, metadata):
+    def _xml_match(self, item, metadata, *args):
         if item.tag == 'Group' and not len(item.getchildren()):
             return [item]
-        return BundleTemplateFile._match(self, item, metadata)
+        return Bcfg2.Server.Plugin.StructFile._xml_match(self, item, metadata,
+                                                         *args)
 
 
 class GroupLogic(Bcfg2.Server.Plugin.Plugin,
@@ -41,11 +35,11 @@ class GroupLogic(Bcfg2.Server.Plugin.Plugin,
     # use groups set by them
     sort_order = 1000
 
-    def __init__(self, core, datastore):
-        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
+    def __init__(self, core):
+        Bcfg2.Server.Plugin.Plugin.__init__(self, core)
         Bcfg2.Server.Plugin.Connector.__init__(self)
         self.config = GroupLogicConfig(os.path.join(self.data, "groups.xml"),
-                                       core.fam)
+                                       should_monitor=True)
         self._local = local()
 
     def get_additional_groups(self, metadata):
@@ -66,7 +60,7 @@ class GroupLogic(Bcfg2.Server.Plugin.Plugin,
             return []
         self._local.building.add(metadata.hostname)
         rv = []
-        for el in self.config.get_xml_value(metadata).findall("Group"):
+        for el in self.config.XMLMatch(metadata).findall("Group"):
             if el.get("category"):
                 rv.append(MetadataGroup(el.get("name"),
                                         category=el.get("category")))