Added ${parent} variable to get the name of the parent component.

Added attribute targets to server and service elements.
More clean up.

1 files changed, 7 insertions, 3 deletions

diff --git a/cpp/test/IcePack/deployer/Service.cpp b/cpp/test/IcePack/deployer/Service.cpp
index fd0d7b0fce6..bfc3871444c 100644
--- a/cpp/test/IcePack/deployer/Service.cpp
+++ b/cpp/test/IcePack/deployer/Service.cpp
@@ -84,9 +84,11 @@ ServiceI::start(const string& name,
 		const CommunicatorPtr& communicator,
 		const StringSeq& args)
 {
+    Ice::PropertiesPtr properties = communicator->getProperties();
+
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name);
-    Ice::ObjectPtr object = new TestI(adapter, communicator->getProperties());
-    adapter->add(object, Ice::stringToIdentity(name));
+    Ice::ObjectPtr object = new TestI(adapter, properties);
+    adapter->add(object, Ice::stringToIdentity(properties->getProperty(name + ".Identity")));
     adapter->activate();
 }
 
@@ -114,9 +116,11 @@ FreezeServiceI::start(const string& name,
     //
     Freeze::DBPtr db = dbEnv->openDB("testdb", true);
 
+    Ice::PropertiesPtr properties = communicator->getProperties();
+
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name);
     Ice::ObjectPtr object = new TestI(adapter, communicator->getProperties());
-    adapter->add(object, Ice::stringToIdentity(name));
+    adapter->add(object, Ice::stringToIdentity(properties->getProperty(name + ".Identity")));
     adapter->activate();
 }