Index: /trunk/bcfg2/src/lib/Server/Plugins/Probes.py =================================================================== --- /trunk/bcfg2/src/lib/Server/Plugins/Probes.py (revision 5026) +++ /trunk/bcfg2/src/lib/Server/Plugins/Probes.py (revision 5036) @@ -9,5 +9,5 @@ fpattern = '[0-9A-Za-z_\-]+' self.plugin_name = plugin_name - Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path, True, + Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path, Bcfg2.Server.Plugin.SpecificData, encoding) Index: /trunk/bcfg2/src/lib/Server/Plugins/Cfg.py =================================================================== --- /trunk/bcfg2/src/lib/Server/Plugins/Cfg.py (revision 5011) +++ /trunk/bcfg2/src/lib/Server/Plugins/Cfg.py (revision 5036) @@ -50,6 +50,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): - def __init__(self, basename, path, props, entry_type, encoding): - Bcfg2.Server.Plugin.EntrySet.__init__(self, basename, path, props, entry_type, encoding) + def __init__(self, basename, path, entry_type, encoding): + Bcfg2.Server.Plugin.EntrySet.__init__(self, basename, path, entry_type, + encoding) self.specific = CfgMatcher(path.split('/')[-1]) @@ -132,5 +133,4 @@ __version__ = '$Id$' __author__ = 'bcfg-dev@mcs.anl.gov' - use_props = False es_cls = CfgEntrySet es_child_cls = Bcfg2.Server.Plugin.SpecificData Index: /trunk/bcfg2/src/lib/Server/Plugins/SGenshi.py =================================================================== --- /trunk/bcfg2/src/lib/Server/Plugins/SGenshi.py (revision 5025) +++ /trunk/bcfg2/src/lib/Server/Plugins/SGenshi.py (revision 5036) @@ -10,6 +10,5 @@ class SGenshiTemplateFile(Bcfg2.Server.Plugins.TGenshi.TemplateFile): def get_xml_value(self, metadata): - stream = self.template.generate(metadata=metadata, - properties=self.properties.properties).filter( \ + stream = self.template.generate(metadata=metadata,).filter( \ Bcfg2.Server.Plugins.TGenshi.removecomment) data = stream.render('xml') @@ -19,11 +18,5 @@ def __init__(self, path, fam, encoding): fpattern = '\S+\.xml' - try: - properties = Bcfg2.Server.Plugin.TemplateProperties( \ - '%s/../etc/properties.xml' % (path), fam) - except: - properties = Bcfg2.Server.Plugin.FakeProperties() - - Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path, properties, + Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path, SGenshiTemplateFile, encoding) fam.AddMonitor(path, self) Index: /trunk/bcfg2/src/lib/Server/Plugins/TGenshi.py =================================================================== --- /trunk/bcfg2/src/lib/Server/Plugins/TGenshi.py (revision 5004) +++ /trunk/bcfg2/src/lib/Server/Plugins/TGenshi.py (revision 5036) @@ -24,7 +24,6 @@ class TemplateFile: '''Template file creates Genshi template structures for the loaded file''' - def __init__(self, name, properties, specific, encoding): + def __init__(self, name, specific, encoding): self.name = name - self.properties = properties self.specific = specific self.encoding = encoding @@ -63,6 +62,6 @@ try: stream = self.template.generate( \ - name=fname, metadata=metadata, path=self.name, - properties=self.properties).filter(removecomment) + name=fname, metadata=metadata, + path=self.name).filter(removecomment) if have_ntt: ttypes = [TextTemplate, NewTextTemplate] @@ -100,5 +99,4 @@ __version__ = '$Id$' __author__ = 'jeff@ocjtech.us' - use_props = True filename_pattern = 'template\.(txt|newtxt|xml)' es_child_cls = TemplateFile Index: /trunk/bcfg2/src/lib/Server/Plugins/TCheetah.py =================================================================== --- /trunk/bcfg2/src/lib/Server/Plugins/TCheetah.py (revision 5004) +++ /trunk/bcfg2/src/lib/Server/Plugins/TCheetah.py (revision 5036) @@ -10,11 +10,9 @@ class TemplateFile: '''Template file creates Cheetah template structures for the loaded file''' - def __init__(self, name, properties, specific, encoding): + def __init__(self, name, specific, encoding): self.name = name - self.properties = properties self.specific = specific self.encoding = encoding self.template = None - self.searchlist = {'properties': properties} def handle_event(self, event): @@ -25,7 +23,5 @@ s = {'useStackFrames': False} self.template = Cheetah.Template.Template(open(self.name).read(), - compilerSettings=s, - searchList = [self.searchlist]) - self.template.properties = self.properties.properties + compilerSettings=s) except Cheetah.Parser.ParseError, perror: logger.error("Cheetah parse error for file %s" % (self.name)) @@ -63,3 +59,3 @@ filename_pattern = 'template' es_child_cls = TemplateFile - use_props = True + Index: /trunk/bcfg2/src/lib/Server/Plugin.py =================================================================== --- /trunk/bcfg2/src/lib/Server/Plugin.py (revision 5029) +++ /trunk/bcfg2/src/lib/Server/Plugin.py (revision 5036) @@ -492,5 +492,5 @@ class SpecificData(object): - def __init__(self, name, _, specific, encoding): + def __init__(self, name, specific, encoding): self.name = name self.specific = specific @@ -507,9 +507,8 @@ '''Entry sets deal with the host- and group-specific entries''' ignore = re.compile("^(\.#.*|.*~|\\..*\\.(tmp|sw[px]))$") - def __init__(self, basename, path, props, entry_type, encoding): + def __init__(self, basename, path, entry_type, encoding): self.path = path self.entry_type = entry_type self.entries = {} - self.properties = props self.metadata = default_file_metadata.copy() self.infoxml = None @@ -557,5 +556,4 @@ return self.entries[event.filename] = self.entry_type(fpath, - self.properties, spec, self.encoding) self.entries[event.filename].handle_event(event) @@ -645,21 +643,4 @@ raise PluginExecutionError -# GroupSpool plugin common code (for TGenshi, TCheetah, and Cfg) - -class TemplateProperties(SingleXMLFileBacked): - '''Class for Genshi properties''' - def Index(self): - '''Build data into an elementtree object for templating usage''' - try: - self.properties = lxml.etree.XML(self.data) - del self.data - except lxml.etree.XMLSyntaxError: - logger.error("Failed to parse properties.xml; disabling") - -class FakeProperties: - '''Dummy class used when properties dont exist''' - def __init__(self): - self.properties = lxml.etree.Element("Properties") - class GroupSpool(Plugin, Generator): '''The TGenshi generator implements a templating mechanism for configuration files''' @@ -667,5 +648,4 @@ __version__ = '$Id$' __author__ = 'bcfg-dev@mcs.anl.gov' - use_props = False filename_pattern = "" es_child_cls = object @@ -682,13 +662,4 @@ self.AddDirectoryMonitor('') self.encoding = core.encoding - if self.use_props: - try: - self.properties = TemplateProperties( \ - '%s/../etc/properties.xml' % (self.data), self.core.fam) - except: - self.properties = FakeProperties() - self.logger.info("%s properties disabled" % self.name) - else: - self.properties = FakeProperties() def HandleEvent(self, event): @@ -711,5 +682,4 @@ self.entries[ident] = self.es_cls(self.filename_pattern, dirpath, - self.properties, self.es_child_cls, self.encoding)