Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

Conflicts:

	cs/src/Ice/Instance.cs

Removed conflicts. Added more tests. Changed stack
marshaling to reverse order during marshaling instead
of during unmarshaling.

1 files changed, 42 insertions, 0 deletions

diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index cc49cd4f78f..72671064a06 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -15,6 +15,7 @@
 #include <Ice/PropertyNames.h>
 #include <Ice/Logger.h>
 #include <Ice/LoggerUtil.h>
+#include <Ice/Communicator.h>
 #include <fstream>
 
 using namespace std;
@@ -471,3 +472,44 @@ Ice::PropertiesI::loadConfig()
     PropertyValue pv(value, true);
     _properties["Ice.Config"] = pv;
 }
+
+
+//
+// PropertiesAdminI
+//
+
+
+Ice::PropertiesAdminI::PropertiesAdminI(const PropertiesPtr& properties) :
+    _properties(properties)
+{    
+}
+
+string 
+Ice::PropertiesAdminI::getProperty(const string& name, const Ice::Current&)
+{
+    return _properties->getProperty(name);
+}
+
+string 
+Ice::PropertiesAdminI::getPropertyWithDefault(const string& name, const string& dflt, const Ice::Current&)
+{
+    return _properties->getPropertyWithDefault(name, dflt);
+}
+
+Ice::Int
+Ice::PropertiesAdminI::getPropertyAsInt(const string& name, const Ice::Current&)
+{
+    return _properties->getPropertyAsInt(name);
+}
+
+Ice::Int
+Ice::PropertiesAdminI::getPropertyAsIntWithDefault(const string& name, Ice::Int dflt, const Ice::Current&)
+{
+    return _properties->getPropertyAsIntWithDefault(name, dflt);
+}
+
+Ice::PropertyDict 
+Ice::PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Ice::Current&)
+{
+    return _properties->getPropertiesForPrefix(prefix);
+}