Added support for property sets.

1 files changed, 37 insertions, 3 deletions

diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index faeaa4fb9da..b52e412e879 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -422,6 +422,24 @@ Parser::describeServerTemplate(const list<string>& args)
 
 	    out << nl << "parameters = `" << toString(q->second.parameters) << "'";
 	    out << nl;
+
+	    if(!q->second.propertySets.empty())
+	    {
+		PropertySetDescriptorDict::const_iterator s;
+		for(s = q->second.propertySets.begin(); s != q->second.propertySets.end(); ++s)
+		{
+		    out << nl << "properties `" << s->first << "'";
+		    out << sb;
+		    out << nl << "references = " << toString(s->second.references);
+		    PropertyDescriptorSeq::const_iterator r;
+		    for(r = s->second.properties.begin(); r != s->second.properties.end(); ++r)
+		    {
+			out << nl << r->name << " = `" << r->value << "'";
+		    }
+		    out << eb;
+		}
+	    }
+
 	    ServerDescriptorPtr server = ServerDescriptorPtr::dynamicCast(q->second.descriptor);
 	    IceBoxDescriptorPtr iceBox = IceBoxDescriptorPtr::dynamicCast(server);
 	    if(iceBox)
@@ -507,11 +525,27 @@ Parser::describeServiceTemplate(const list<string>& args)
 	{
 	    out << "service template `" << templ << "'";
 	    out << sb;
-	    if(!q->second.parameters.empty())
+
+	    out << nl << "parameters = `" << toString(q->second.parameters) << "'";
+	    out << nl;
+
+	    if(!q->second.propertySets.empty())
 	    {
-		out << nl << "parameters = `" << toString(q->second.parameters) << "'";
+		PropertySetDescriptorDict::const_iterator s;
+		for(s = q->second.propertySets.begin(); s != q->second.propertySets.end(); ++s)
+		{
+		    out << nl << "properties `" << s->first << "'";
+		    out << sb;
+		    out << nl << "references = " << toString(s->second.references);
+		    PropertyDescriptorSeq::const_iterator r;
+		    for(r = s->second.properties.begin(); r != s->second.properties.end(); ++r)
+		    {
+			out << nl << r->name << " = `" << r->value << "'";
+		    }
+		    out << eb;
+		}
 	    }
-	    out << nl;
+
 	    ServiceDescriptorPtr desc = ServiceDescriptorPtr::dynamicCast(q->second.descriptor);
 	    ServiceHelper(desc).print(out);
 	    out << eb;