Fixed merge conflicts.

4 files changed, 3 insertions, 88 deletions

diff --git a/cpp/config/PropertyNames.xml b/cpp/config/PropertyNames.xml
index ab095adfa92..a3d641398ea 100755
--- a/cpp/config/PropertyNames.xml
+++ b/cpp/config/PropertyNames.xml
@@ -194,7 +194,7 @@ generated from the section label.
         <property name="Default.Package" />
         <property name="Default.PreferSecure" />
         <property name="Default.Protocol" />
-        <property name="Default.Router" propertyClass="proxy" deprecated="true"/>
+        <property name="Default.Router" propertyClass="proxy" />
         <property name="GC.Interval" />
         <property name="ImplicitContext" />
         <property name="InitPlugins" />
diff --git a/cpp/config/makeprops.py b/cpp/config/makeprops.py
index 344e2cfe376..9fc80a7c705 100644
--- a/cpp/config/makeprops.py
+++ b/cpp/config/makeprops.py
@@ -102,42 +102,6 @@ cppSrcPreamble = commonPreamble + """
 
 """
 
-javaPropertyClass = commonPreamble + """
-package IceInternal;
-
-public class Property
-{
-    public 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;
 
@@ -145,43 +109,6 @@ 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
 {
@@ -465,15 +392,10 @@ class JavaPropertyHandler(PropertyHandler):
             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 % {'inputfile' : self.inputfile, '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" % \
@@ -528,7 +450,6 @@ class JavaPropertyHandler(PropertyHandler):
 
     def moveFiles(self, location):
         shutil.move(self.className + ".java", os.path.join(location, "..", "java", "src", "IceInternal"))
-        shutil.move("Property.java", os.path.join(location, "..", "java", "src", "IceInternal"))
 
 class CSPropertyHandler(PropertyHandler):
     def __init__(self, inputfile, c):
@@ -540,15 +461,10 @@ class CSPropertyHandler(PropertyHandler):
             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 % {'inputfile' : self.inputfile, 'classname' : self.className})
-        propertyClassFile = file("Property.cs", "w")
-        propertyClassFile.write(csPropertyClass)
-        propertyClassFile.close()
 
     def closeFiles(self):
         self.srcFile.write("        public static Property[][] validProps = \n" % \
@@ -598,7 +514,6 @@ class CSPropertyHandler(PropertyHandler):
 
     def moveFiles(self, location):
         shutil.move(self.className + ".cs", os.path.join(location, "..", "cs", "src", "Ice"))
-        shutil.move("Property.cs", os.path.join(location, "..", "cs", "src", "Ice"))
 
 class MultiHandler(PropertyHandler):
     def __init__(self, inputfile, c):
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index ec934b0ebcc..a612d04748a 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jun 15 13:54:13 2007
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Jun 18 10:35:47 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index ce6a9c72662..5fc15442d17 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jun 15 13:54:13 2007
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Jun 18 10:35:47 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!