Implementation of enhancements described in

    http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1597

1 files changed, 654 insertions, 372 deletions

diff --git a/cpp/config/makeprops.py b/cpp/config/makeprops.py
index 9ab92bbee23..b56d3132e30 100644
--- a/cpp/config/makeprops.py
+++ b/cpp/config/makeprops.py
@@ -10,398 +10,680 @@
 
 import os, sys, shutil, re, signal, time, string
 
+from xml.sax import make_parser
+from xml.sax.handler import feature_namespaces
+from xml.sax.handler import ContentHandler
+from xml.sax import saxutils
+from xml.sax import SAXException
+
 progname = os.path.basename(sys.argv[0])
-infile = ""
-classname = ""
-lineNum = 0
-errors = 0
-outputFiles = [] 
+contentHandler = None
+proxyProperties = [
+        "EndpointSelection", 
+        "ConnectionCached",
+        "PreferSecure", 
+        "LocatorCacheTimeout", 
+        "Locator", 
+        "Router", 
+        "CollocationOptimization", 
+        "ThreadPerConnection"
+        ]
+
+threadPoolProperties = [
+        "Size",
+        "SizeMax",
+        "SizeWarn",
+        "StackSize"
+        ]
+
+commonPreamble = """// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+// Generated by makeprops.py from file XXX- stuff needs to go here!
+
+// IMPORTANT: Do not edit this file -- any edits made here will be lost!
+"""
+
+cppHeaderPreamble = commonPreamble + """
+#ifndef ICE_INTERNAL_%(classname)s_H
+#define ICE_INTERNAL_%(classname)s_H
+
+#include <Ice/Config.h>
+
+namespace IceInternal
+{
+
+struct Property
+{
+    const char* pattern;
+    bool deprecated;
+    const char* deprecatedBy;
+
+    Property(const char* n, bool d, const char* b) :
+	pattern(n),
+	deprecated(d),
+	deprecatedBy(b)
+    {
+    }
+
+    Property() :
+        pattern(0),
+        deprecated(false),
+        deprecatedBy(0)
+    {
+    }
+
+};
+
+struct PropertyArray
+{
+    const Property* properties;
+    const int length;
+
+    PropertyArray(const Property* p, int len) :
+        properties(p),
+        length(len)
+    {
+    }
+};
+
+class %(classname)s
+{
+public:
+
+"""
+
+cppHeaderPostamble = """
+    static const PropertyArray IceInternal::%(classname)s::validProps[];
+    static const char * IceInternal::%(classname)s::clPropNames[];
+};
+
+}
+
+#endif
+"""
+
+cppSrcPreamble = commonPreamble + """
+#include <Ice/%(classname)s.h>
+
+"""
+
+javaPropertyClass = commonPreamble + """
+package IceInternal;
+
+class Property
+{
+    Property(String pattern, boolean deprecated, String deprecatedBy)
+    {
+        _pattern = pattern;
+        _deprecated = deprecated;
+        _deprecatedBy = deprecatedBy;
+    }
+
+    public String
+    pattern()
+    {
+        return _pattern;
+    }
+
+    public boolean
+    deprecated()
+    {
+        return _deprecated;
+    }
+
+    public String
+    deprecatedBy()
+    {
+        return _deprecatedBy;
+    }
+
+    private String _pattern;
+    private boolean _deprecated;
+    private String _deprecatedBy;
+}
+"""
+
+javaPreamble = commonPreamble + """
+package IceInternal;
+
+public final class %(classname)s
+{
+"""
+
+csPropertyClass = commonPreamble + """
+namespace IceInternal
+{
+    public sealed class Property
+    {
+        public Property(string pattern, bool deprecated, string deprecatedBy)
+        {
+            _pattern = pattern;
+            _deprecated = deprecated;
+            _deprecatedBy = deprecatedBy;
+        }
+
+        public string
+        pattern()
+        {
+            return _pattern;
+        }
+
+        public bool
+        deprecated()
+        {
+            return _deprecated;
+        }
+
+        public string
+        deprecatedBy()
+        {
+            return _deprecatedBy;
+        }
+
+        private string _pattern;
+        private bool _deprecated;
+        private string _deprecatedBy;
+    }
+}
+"""
+
+csPreamble = commonPreamble + """
+namespace IceInternal
+{
+    public sealed class %(classname)s
+    {
+"""
 
 def usage():
     global progname
     print >> sys.stderr, "Usage: " + progname + " [--{cpp|java|cs} file]"
 
-def fileError(msg):
-    global progname, infile, lineNum, errors
-    print >> sys.stderr, progname + ": " + infile + ':' + str(lineNum) + ": " + msg
-    errors += 1
-
 def progError(msg):
     global progname
     print >> sys.stderr, progname + ": " + msg
 
-def removeOutputFiles():
-    global outputFiles
-    for entry in outputFiles:
-        try:
-            if os.path.exists(entry[0]):
-                os.remove(entry[0])
-        except EnvironmentError, ex:
-            progError("warning: could not unlink `" + entry[0] + "': " + ex.strerror + \
-                " -- generated file contains errors");
-
 def handler(signum, frame):
-    removeOutputFiles()
+    """Installed as signal handler. Should cause an files that are in
+    use to be closed and removed"""
+    global contentHandler
+    contentHandler.cleanup()
     sys.exit(128 + signum)
 
-def openOutputFile(filename):
-    global outputFiles
-    try:
-        outfile = file(filename, 'w')
-        outputFiles.append([filename, outfile])
-    except IOError, ex:
-        progError("cannot open `" + filename + "' for writing: " + ex.strerror)
-        removeOutputFiles()
-        sys.exit(1)
-
-def writePreamble(lang):
-    global progname
-    global infile
-    global outputFiles
-    global classname
-
-    for entry in outputFiles:
-        file = entry[1]
-        file.write("// **********************************************************************\n")
-        file.write("//\n")
-        file.write("// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.\n")
-        file.write("//\n")
-        file.write("// This copy of Ice is licensed to you under the terms described in the\n")
-        file.write("// ICE_LICENSE file included in this distribution.\n")
-        file.write("//\n")
-        file.write("// **********************************************************************\n")
-        file.write("\n")
-        file.write("// Generated by " + progname + " from file `" + infile + "', " + time.ctime() + "\n")
-        file.write("\n")
-        file.write("// IMPORTANT: Do not edit this file -- any edits made here will be lost!\n");
-        if lang == "cpp":
-            continue
-        if lang == "java":
-            file.write("\n");
-            file.write("package IceInternal;\n")
-            file.write("\n")
-            file.write("public final class " + classname + '\n');
-            file.write("{\n")
-            continue
-        if lang == "cs":
-            file.write("\n");
-            file.write("namespace IceInternal\n")
-            file.write("{\n")
-            file.write("    public sealed class " + classname + '\n')
-            file.write("    {\n");
-            continue
-        progError("Internal error: impossible language: `" + lang + "'")
+class UnknownElementException(Exception):
+    def __init__(self, value):
+        self.value = value
+
+    def __str__(self):
+        return repr(self.value)
+
+class PropertyHandler(ContentHandler):
+
+    def __init__(self, className):
+        self.start = False
+        self.properties = {}
+        self.className = className
+        self.currentSection = None
+        self.sectionPropertyCount = 0
+        self.sections = []
+        self.cmdLineOptions = []
+
+    def cleanup(self):
+        """Needs to be overridden in derived class"""
+        pass
+
+    def startFiles(self):
+        """Needs to be overridden in derived class"""
+        pass
+
+    def closeFiles(self):
+        """Needs to be overridden in derived class"""
+        pass
+
+    def deprecatedImpl(self, propertyName):
+        """Needs to be overridden in derived class"""
+        pass
+
+    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
+        """Needs to be overridden in derived class"""
+        pass
+
+    def propertyImpl(self, propertyName):
+        """Needs to be overridden in derived class"""
+        pass
+
+    def newSection(self, sectionName):
+        """Needs to be overridden in derived class"""
+        pass
+
+    def moveFiles(self, location):
+        """Needs to be overridden in derived class"""
+        pass
+
+    def handleNewSection(self, sectionName, cmdLine):
+        self.currentSection = sectionName
+        self.sectionPropertyCount = 0
+        if cmdLine == "true":
+            self.cmdLineOptions.append(sectionName)
+        self.sections.append(sectionName)
+        self.newSection()
+        
+    def handleDeprecated(self, propertyName):
+        self.properties[propertyName] = None
+        self.deprecatedImpl(propertyName)
+        
+    def handleDeprecatedWithReplacement(self, propertyName, deprecatedBy):
+        self.properties[propertyName] = deprecatedBy
+        self.deprecatedImplWithReplacementImpl(propertyName, deprecatedBy)
+
+    def handleProperty(self, propertyName):
+        self.properties[propertyName] = ""
+        self.propertyImpl(propertyName)
+
+    def startElement(self, name, attrs):
+        if name == "properties":
+            self.start = True
+            self.startFiles()
+            return
+
+        if not self.start:
+            return
+        
+        if name == "section":
+            noCmdLine = attrs.get("noCmdLine", None)
+            self.handleNewSection(attrs.get("name"), noCmdLine)
+        
+        elif name == "property":
+            propertyName = attrs.get("name", None)
+
+            if attrs.get("threadpool", None) == "true":
+                #
+                # expand known thread pool properties.
+                #
+                for p in threadPoolProperties:
+                    self.startElement(name, { 'name': "%s.%s" % (propertyName, p)})
+                #
+                # We don't include a property for the property entry
+                # itself 
+                #
+                return
+
+            #
+            # != None implies deprecated == true
+            #
+            deprecatedBy = attrs.get("deprecatedBy", None)
+            if deprecatedBy != None:
+                self.handleDeprecatedWithReplacement(propertyName, deprecatedBy)
+                pass
+            elif attrs.get("deprecated", "false").lower() == "true" :
+                self.handleDeprecated(propertyName)
+            else:
+                self.handleProperty(propertyName)
+
+            if attrs.get("proxy", None) != None:
+                #
+                # expand known proxy properties.
+                #
+                for p in proxyProperties:
+                    self.startElement(name, {'name':"%s.%s" % (propertyName, p)})
+
+        else:
+            raise UnknownElementException(name)
+
+    def endElement(self, name):
+        if name == "properties":
+            self.closeFiles()
+        elif name == "section":
+            self.closeSection()
+
+class CppPropertyHandler(PropertyHandler):
+
+    def __init__(self, c):
+        PropertyHandler.__init__(self, c)
+        self.hFile = None
+        self.cppFile = None
+
+    def cleanup(self):
+        if self.hFile != None:
+            self.hFile.close()
+            if os.path.exists(self.className + ".h"):
+                os.remove(self.className + ".h")
+        if self.cppFile != None:
+            self.cppFile.close()
+            if os.path.exists(self.className + ".cpp"):
+                os.remove(self.className + ".cpp")
+
+    def startFiles(self):
+        self.hFile = open(self.className + ".h", "w")
+        self.cppFile = open(self.className + ".cpp", "w")
+        self.hFile.write(cppHeaderPreamble % {'classname' : self.className})
+        self.cppFile.write(cppSrcPreamble % {'classname' : self.className})
+
+    def closeFiles(self):
+        self.hFile.write(cppHeaderPostamble % {'classname' : self.className})
+        self.cppFile.write("\nconst IceInternal::PropertyArray "\
+                        "IceInternal::%(classname)s::validProps[] =\n" % \
+                {'classname' : self.className})
+
+        self.cppFile.write("{\n")
+        for s in self.sections:
+            self.cppFile.write("    %sProps,\n" % s)
+        self.cppFile.write("    IceInternal::PropertyArray(0,0)\n");
+        self.cppFile.write("};\n\n")
+
+        self.cppFile.write("\nconst char* IceInternal::%(classname)s::clPropNames[] =\n" % \
+                {'classname' : self.className})
+        self.cppFile.write("{\n")
+        for s in self.sections:
+            self.cppFile.write("    \"%s\",\n" % s)
+        self.cppFile.write("    0\n")
+        self.cppFile.write("};\n\n")
+        self.hFile.close()
+        self.cppFile.close()
+
+    def fix(self, propertyName):
+        return string.replace(propertyName, "<any>", "*")
+
+    def deprecatedImpl(self, propertyName):
+        self.cppFile.write("    IceInternal::Property(\"%s.%s\", true, 0),\n" % (self.currentSection, \
+                self.fix(propertyName)))
+
+    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
+        self.cppFile.write("    IceInternal::Property(\"%s.%s\", true, \"%s\"),\n" % (self.currentSection, \
+                self.fix(propertyName), deprecatedBy))
+
+    def propertyImpl(self, propertyName):
+        self.cppFile.write("    IceInternal::Property(\"%s.%s\", false, 0),\n" % \
+                (self.currentSection, self.fix(propertyName)))
+
+    def newSection(self):
+        self.hFile.write("    static const PropertyArray %sProps;\n" % self.currentSection)
+        self.cppFile.write("const IceInternal::Property %sPropsData[] = \n" % self.currentSection)
+        self.cppFile.write("{\n")
+        
+    def closeSection(self):
+        self.cppFile.write("};\n")
+        self.cppFile.write("""
+const IceInternal::PropertyArray
+    IceInternal::%(className)s::%(section)sProps(%(section)sPropsData,
+                                                sizeof(%(section)sPropsData)/sizeof(%(section)sPropsData[0]));
+
+""" % { 'className' : self.className, 'section': self.currentSection })
+
+    def moveFiles(self, location):
+        shutil.move(self.className + ".h", os.path.join(location, "src", "Ice"))
+        shutil.move(self.className + ".cpp", os.path.join(location, "src", "Ice"))
+
+class JavaPropertyHandler(PropertyHandler):
+    def __init__(self, c):
+        PropertyHandler.__init__(self, c)
+        self.srcFile = None
+
+    def cleanup(self):
+        if self.srcFile != None:
+            self.srcFile.close()
+            if os.path.exists(self.className + ".java"):
+                os.remove(self.className + ".java")
+        if os.path.exists("Property.java"):
+            os.remove("Property.java")
+
+    def startFiles(self):
+        self.srcFile = file(self.className + ".java", "w")
+        self.srcFile.write(javaPreamble % {'classname' : self.className})
+        propertyClassFile = file("Property.java", "w")
+        propertyClassFile.write(javaPropertyClass)
+        propertyClassFile.close()
+
+    def closeFiles(self):
+        self.srcFile.write("\n   public static final Property[] validProps[] = \n" % \
+                {'classname' : self.className})
+
+        self.srcFile.write("    {\n")
+        for s in self.sections:
+            self.srcFile.write("        %sProps,\n" % s)
+        self.srcFile.write("        null\n")
+        self.srcFile.write("    };\n\n")
+
+        self.srcFile.write("\n   public static final String clPropNames[] =\n" % \
+                {'classname' : self.className})
+        self.srcFile.write("    {\n")
+        for s in self.sections:
+            self.srcFile.write("        \"%s\",\n" % s)
+        self.srcFile.write("        null\n")
+        self.srcFile.write("    };\n\n")
+        self.srcFile.write("};\n\n")
+        self.srcFile.close()
+
+    def fix(self, propertyName):
+        #
+        # The Java property strings are actually regexp's that will be passed to Java's regexp facitlity.
+        #
+        propertyName = string.replace(propertyName, ".", "\\\\.")
+        return string.replace(propertyName, "<any>", "[^\\\\s]+")
+
+    def deprecatedImpl(self, propertyName):
+        self.srcFile.write("        new Property(\"%(section)s\\\\.%(pattern)s\", " \
+                "true, null),\n" % \
+                {"section" : self.currentSection, "pattern": self.fix(propertyName)})
+
+    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
+        self.srcFile.write("        new Property(\"%(section)s\\\\.%(pattern)s\", "\
+                "true, \"%(deprecatedBy)s\"),\n"  % \
+                {"section" : self.currentSection, "pattern": self.fix(propertyName),
+                    "deprecatedBy" : deprecatedBy})
+
+    def propertyImpl(self, propertyName):
+        self.srcFile.write("        new Property(\"%(section)s\\\\.%(pattern)s\", " \
+                "false, null),\n" % \
+                {"section" : self.currentSection, "pattern": self.fix(propertyName)} )
+
+    def newSection(self):
+        self.srcFile.write("    public static final Property %sProps[] = \n" % self.currentSection)
+        self.srcFile.write("    {\n")
+            
+    def closeSection(self):
+        self.srcFile.write("        null\n")
+        self.srcFile.write("    };\n\n")
+
+    def moveFiles(self, location):
+        shutil.move(self.className + ".java", os.path.join(location, "..", "icej", "src", "IceInternal"))
+        shutil.move("Property.java", os.path.join(location, "..", "icej", "src", "IceInternal"))
+
+class CSPropertyHandler(PropertyHandler):
+    def __init__(self, c):
+        PropertyHandler.__init__(self, c)
+        self.srcFile = None
+
+    def cleanup(self):
+        if self.srcFile != None:
+            self.srcFile.close()
+            if os.path.exists(self.className + ".cs"):
+                os.remove(self.className + ".cs")
+        if os.path.exists("Property.cs"):
+            os.remove("Property.cs")
+
+    def startFiles(self):
+        self.srcFile = file(self.className + ".cs", "w")
+        self.srcFile.write(csPreamble % {'classname' : self.className})
+        propertyClassFile = file("Property.cs", "w")
+        propertyClassFile.write(csPropertyClass)
+        propertyClassFile.close()
+
+    def closeFiles(self):
+        self.srcFile.write("        public static Property[][] validProps = \n" % \
+                {'classname' : self.className})
+
+        self.srcFile.write("        {\n")
+        for s in self.sections:
+            self.srcFile.write("            %sProps,\n" % s)
+        self.srcFile.write("            null\n")
+        self.srcFile.write("        };\n\n")
+
+        self.srcFile.write("        public static string[] clPropNames =\n" % \
+                {'classname' : self.className})
+        self.srcFile.write("        {\n")
+        for s in self.sections:
+            self.srcFile.write("            \"%s\",\n" % s)
+        self.srcFile.write("            null\n")
+        self.srcFile.write("        };\n")
+        self.srcFile.write("    }\n")
+        self.srcFile.write("}\n")
+        self.srcFile.close()
+
+    def fix(self, propertyName):
+        propertyName = string.replace(propertyName, ".", "\\.")
+        return string.replace(propertyName, "<any>", "[^\\s]+")
+
+    def deprecatedImpl(self, propertyName):
+        self.srcFile.write("             new Property(@\"^%s\.%s$\", true, null),\n" % (self.currentSection, \
+                self.fix(propertyName)))
+
+    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
+        self.srcFile.write("             new Property(@\"^%s\.%s$\", true, @\"%s\"),\n" % \
+                (self.currentSection, self.fix(propertyName), deprecatedBy))
+
+    def propertyImpl(self, propertyName):
+        self.srcFile.write("             new Property(@\"^%s\.%s$\", false, null),\n" % (self.currentSection, \
+                self.fix(propertyName)))
+
+    def newSection(self):
+        self.srcFile.write("        public static Property[] %sProps =\n" % self.currentSection);
+        self.srcFile.write("        {\n")
+            
+    def closeSection(self):
+        self.srcFile.write("             null\n")
+        self.srcFile.write("        };\n")
+        self.srcFile.write("\n")
+
+    def moveFiles(self, location):
+        shutil.move(self.className + ".cs", os.path.join(location, "..", "icecs", "src", "Ice"))
+        shutil.move("Property.cs", os.path.join(location, "..", "icecs", "src", "Ice"))
+
+class MultiHandler(PropertyHandler):
+    def __init__(self, c):
+        self.handlers = []
+        PropertyHandler.__init__(self, c)
+
+    def cleanup(self):
+        for f in self.handlers:
+            f.cleanup()
+
+    def addHandlers(self, handlers):
+        self.handlers.extend(handlers)
+
+    def startFiles(self):
+        for f in self.handlers:
+            f.startFiles()
+
+    def closeFiles(self):
+        for f in self.handlers:
+            f.closeFiles()
+
+    def newSection(self):
+        for f in self.handlers:
+            f.newSection()
+            
+    def closeSection(self):
+        for f in self.handlers:
+            f.closeSection()
+
+    def handleNewSection(self, sectionName, cmdLine):
+        for f in self.handlers:
+            f.handleNewSection(sectionName, cmdLine)
+        
+    def handleDeprecated(self, propertyName):
+        for f in self.handlers:
+            f.handleDeprecated(sectionName, cmdLine)
+        
+    def handleDeprecatedWithReplacement(self, propertyName, deprecatedBy):
+        for f in self.handlers:
+            f.handleDeprecatedWithReplacement(propertyName, deprecatedBy)
+
+    def handleProperty(self, propertyName):
+        for f in self.handlers:
+            f.handleProperty(propertyName)
+
+    def moveFiles(self, location):
+        for f in self.handlers:
+            f.moveFiles(location)
+
+def main():
+    if len(sys.argv) != 1 and len(sys.argv) != 3:
+        usage()
         sys.exit(1)
 
-    if lang == "cpp":
-        header = outputFiles[1][1]
-        header.write("\n");
-        header.write("#ifndef ICE_INTERNAL_" + classname + "_H\n");
-        header.write("#define ICE_INTERNAL_" + classname + "_H\n");
-        header.write("\n")
-        header.write("#include <Ice/Config.h>")
-        header.write("\n")
-        header.write("namespace IceInternal\n")
-        header.write("{\n")
-        header.write("\n")
-        header.write("class " + classname + '\n')
-        header.write("{\n")
-        header.write("public:\n")
-        header.write("\n")
-        file = outputFiles[0][1]
-        file.write("\n");
-        file.write("#include <Ice/" + classname + ".h>\n")
-
-def writePostamble(lang, labels, commandLineLabels):
-    file = outputFiles[0][1]
-    if lang == "cpp":
-        header = outputFiles[1][1]
-        header.write("\n")
-
-        header.write("    static const char* const* validProps[];\n")
-        file.write("\n");
-        file.write("const char* const* IceInternal::" + classname + "::validProps[] =\n")
-        file.write("{\n")
-        for label, line in labels.iteritems():
-            file.write("    " + label + "Props,\n")
-        file.write("    0\n");
-        file.write("};\n")
-
-        header.write("    static const char* clPropNames[];\n")
-        file.write("\n");
-        file.write("const char* IceInternal::" + classname + "::clPropNames[] =\n")
-        file.write("{\n")
-        for label in commandLineLabels:
-            file.write("    \"" + label + "\",\n")
-        file.write("    0\n");
-        file.write("};\n")
-
-        header.write("};\n")
-        header.write("\n")
-        header.write("}\n")
-        header.write("\n")
-        header.write("#endif\n");
-        return
-    if lang == "java":
-        file.write("    public static final String[] validProps[] =\n")
-        file.write("    {\n")
-        for label, line in labels.iteritems():
-            file.write("        " + label + "Props,\n")
-        file.write("        null\n")
-        file.write("    };\n\n");
-
-        file.write("    public static final String clPropNames[] =\n")
-        file.write("    {\n")
-        for label in commandLineLabels:
-            file.write("        \"" + label + "\",\n")
-        file.write("        null\n")
-        file.write("    };\n");
-        file.write("}\n");
-        return
-    if lang == "cs":
-        file.write("        public static string[][] validProps =\n")
-        file.write("        {\n")
-        for label, line in labels.iteritems():
-            file.write("            " + label + "Props,\n")
-        file.write("            null\n")
-        file.write("        };\n\n");
-
-        file.write("        public static string[] clPropNames =\n")
-        file.write("        {\n")
-        for label in commandLineLabels:
-            file.write("            \"" + label + "\",\n")
-        file.write("            null\n")
-        file.write("        };\n");
-        file.write("    }\n");
-        file.write("}\n");
-        return
-
-def startSection(lang, label):
-    if lang == "cpp":
-        header = outputFiles[1][1]
-        header.write("    static const char* " + label + "Props[];\n")
-
-    file = outputFiles[0][1]
-    if lang == "cpp":
-        file.write("\n");
-        file.write("const char* IceInternal::" + classname + "::" + label + "Props[] =\n")
-        file.write("{\n");
-        return
-    if lang == "java":
-        file.write("    public static final String " + label + "Props[] =\n");
-        file.write("    {\n")
-        return
-    if lang == "cs":
-        file.write("        public static string[] " + label + "Props =\n");
-        file.write("        {\n")
-        return
-
-def endSection(lang):
-    file = outputFiles[0][1]
-    if lang == "cpp":
-        file.write("    0\n");
-        file.write("};\n");
-        return
-    if lang == "java":
-        file.write("        null\n");
-        file.write("    };\n");
-        file.write("\n")
-        return
-    if lang == "cs":
-        file.write("            null\n");
-        file.write("        };\n");
-        file.write("\n")
-        return
-
-wildcard = re.compile(".*<any>.*")
-
-def writeEntry(lang, label, entry):
-    file = outputFiles[0][1]
-    if lang == "cpp":
-        file.write("    \"" + label + '.' + string.replace(entry, "<any>", "*") + "\",\n")
-    elif lang == "java":
-        pattern = string.replace(entry, ".", "\\\\.")
-        pattern = string.replace(pattern, "<any>", "[^\\\\s]+")
-        file.write("        " + "\"^" + label + "\\\\." + pattern + "$\",\n")
-    elif lang == "cs":
-        pattern = string.replace(entry, ".", "\\.")
-        pattern = string.replace(pattern, "<any>", "[^\\s]+")
-        file.write("            " + "@\"^" + label + "\\." + pattern + "$\",\n")
-
-def processFile(lang):
-
-    #
-    # Open input file.
-    #
-    global infile
-    try:
-        f = file(infile, 'r')
-    except IOError, ex:
-        progError("cannot open `" + infile + "': " + ex.strerror)
-        sys.exit(1)
+    infile = None
+    lang = None
 
-    #
-    # Set up regular expressions for empty and comment lines, section headings, and entry lines.
-    #
-    ignore = re.compile("^\s*(?:#.*)?$")                                        # Empty line or comment line
-    section = re.compile("^\s*([a-zA-Z_]\w*)\s*:\s*([a-zA-Z]\w*)?\s*$")        # Section heading
-    entry = re.compile("^\s*([^ \t\n\r\f\v#]+)(?:\s*#.*)?$")                    # Any non-whitespace character sequence, except for #
+    if len(sys.argv) == 1:
+        #
+        # Find where the root of the tree is.
+        #
+        for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
+            toplevel = os.path.normpath(toplevel)
+            if os.path.exists(os.path.join(toplevel, "config", "makeprops.py")):
+                break
+        else:
+            progError("cannot find top-level directory")
+            sys.exit(1)
+
+        infile = os.path.join(toplevel, "config", "PropertyNames.xml")
+    else:
+        option = sys.argv[1]
+        if option == "--cpp":
+            lang = "cpp"
+        elif option == "--java":
+            lang = "java"
+        elif option == "--cs":
+            lang = "cs"
+        elif option in ["-h", "--help", "-?"]:
+            usage()
+            sys.exit(0)
+        else:
+            usage()
+            sys.exit(1)
+        infile = sys.argv[2]
+
+    className, ext = os.path.splitext(os.path.basename(infile))
+    global contentHandler
+    if lang == None:
+        contentHandler = MultiHandler("")
+        contentHandler.addHandlers([CppPropertyHandler(className), JavaPropertyHandler(className),
+            CSPropertyHandler(className)])
+    else:
+        if lang == "cpp":
+            contentHandler = CppPropertyHandler(className)
+        elif lang == "java":
+            contentHandler = JavaPropertyHandler(className)
+        elif lang == "cs":
+            contentHandler = CSPropertyHandler(className)
 
     #
     # Install signal handler so we can remove the output files if we are interrupted.
     #
     signal.signal(signal.SIGINT, handler)
-    signal.signal(signal.SIGHUP, handler)
+    # signal.signal(signal.SIGHUP, handler)
     signal.signal(signal.SIGTERM, handler)
 
-    #
-    # Open output files.
-    #
-    global classname
-    classname, ext = os.path.splitext(os.path.basename(infile))
-    openOutputFile(classname + '.' + lang)
-    if(lang == "cpp"):
-        openOutputFile(classname + ".h")
-
-    labels = {}            # Records the line number on which each label is defined
-    commandLineLabels = [] # The set of labels which are command line processing is enabled
-    atSectionStart = 0     # True for the line on which a label is defined
-    seenSection = 0        # Set to true (and the remains as true) once the first label is defined
-    numEntries = 0         # Number of entries within a section
-    errors = 0             # Number of syntax errors in the input file
-
-    #
-    # Write preamble.
-    #
-    writePreamble(lang)
-
-    #
-    # Loop over lines in input file.
-    #
-    global lineNum
-    lines = f.readlines()
-    for l in lines:
-        lineNum += 1
-
-        #
-        # Ignore empty lines and comments.
-        #
-        if ignore.match(l) != None:
-            continue
-
-        #
-        # Start of section.
-        #
-        labelMatch = section.match(l)
-        if labelMatch != None:
-            if atSectionStart:
-                fileError("section `" + label + "' must have at least one entry")
-            label = labelMatch.group(1)
-            try:
-                badLine = labels[label]
-                fileError("duplicate section heading: `" + label + "': previously defined on line " + badLine)
-            except KeyError:
-                pass
-            if label == "validProps":
-               fileError("`validProps' is reserved and cannot be used as a section heading")
-            if labelMatch.group(2) != "false":
-                commandLineLabels.append(label)
-            labels[label] = lineNum
-            if seenSection:
-                endSection(lang)
-            numEntries = 0
-            startSection(lang, label)
-            seenSection = 1
-            atSectionStart = 1
-            continue
-
-        entryMatch = entry.match(l)
-        if entryMatch != None:
-            writeEntry(lang, label, entryMatch.group(1))
-            atSectionStart = 0
-            numEntries += 1
-            continue
-
-        fileError("syntax error")
-
-    if len(labels) == 0:
-        fileError("input must define at least one section");
-
-    #
-    # End the final section.
-    #
-    if numEntries == 0:
-        fileError("section `" + label + "' must have at least one entry")
-    endSection(lang)
-
-    #
-    # End the source files.
-    #
-    writePostamble(lang, labels, commandLineLabels)
-
-    global outputFiles
-    for entry in outputFiles:
-        entry[1].close()
-
-    #
-    # Remove the output files if anything went wrong, so we don't leave partically written files behind.
-    #
-    if errors != 0:
-        removeOutputFiles()
-        sys.exit(1)
-    outputFiles = []
-
-#
-# Check arguments.
-#
-if len(sys.argv) != 1 and len(sys.argv) != 3:
-    usage()
-    sys.exit(1)
-
-lang = ""
-if len(sys.argv) == 1:
-    #
-    # Find where the root of the tree is.
-    #
-    for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-        toplevel = os.path.normpath(toplevel)
-        if os.path.exists(os.path.join(toplevel, "config", "makeprops.py")):
-            break
-    else:
-        progError("cannot find top-level directory")
-        sys.exit(1)
-
-    infile = os.path.join(toplevel, "config", "PropertyNames.def")
-    lang = "all"
-
-else:
-    option = sys.argv[1]
-    if option == "--cpp":
-        lang = "cpp"
-    elif option == "--java":
-        lang = "java"
-    elif option == "--cs":
-        lang = "cs"
-    elif option == "-h" or option == "--help" or option == "-?":
-        usage()
-        sys.exit(0)
-    else:
-        usage()
-        sys.exit(1)
-    infile = sys.argv[2]
-
-if lang == "all":
-    processFile("cpp")
-    shutil.move("PropertyNames.cpp", os.path.join(toplevel, "src", "Ice"))
-    shutil.move("PropertyNames.h", os.path.join(toplevel, "src", "Ice"))
-    processFile("java")
-    if os.path.exists(os.path.join(toplevel, "..", "icej")):
-        shutil.move("PropertyNames.java", os.path.join(toplevel, "..", "icej", "src", "IceInternal"));
-    processFile("cs")
-    if os.path.exists(os.path.join(toplevel, "..", "icecs")):
-        shutil.move("PropertyNames.cs", os.path.join(toplevel, "..", "icecs", "src", "Ice"));
-else:
-    processFile(lang)
-
-
-sys.exit(0)
+    parser = make_parser()
+    parser.setFeature(feature_namespaces, 0)
+    parser.setContentHandler(contentHandler)
+    pf = file(infile)
+    try:
+        parser.parse(pf)
+        contentHandler.moveFiles(toplevel)
+    except IOError, ex:
+        progError(str(ex))
+        contentHandler.cleanup()
+    except SAXException, ex:
+        progError(str(ex))
+        contentHandler.cleanup()
+
+if __name__ == "__main__":
+    main()