diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/demo/IcePack/simple/app.xml | 16 | ||||
| -rw-r--r-- | cpp/demo/IcePack/simple/config.icegrid | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 1 |
4 files changed, 4 insertions, 16 deletions
diff --git a/cpp/demo/IcePack/simple/app.xml b/cpp/demo/IcePack/simple/app.xml index 7f453880ecc..250f6f13376 100644 --- a/cpp/demo/IcePack/simple/app.xml +++ b/cpp/demo/IcePack/simple/app.xml @@ -21,6 +21,7 @@ <adapters> <adapter name="Hello" endpoints="tcp" register="true"> <object identity="${server}-hello1" type="::Demo::Hello"/> + <object identity="${server}hello1" type="::Demo::Hello"/> </adapter> </adapters> <properties> @@ -66,20 +67,7 @@ <variable name="node1" value="test"/> <server-instance template="IceBoxTemplate" name="IceBox"/> <server-instance template="ServerTemplate" name="Server"/> - - - <server name="Server1" exe="./server"> - <adapters> - <adapter name="Hello" endpoints="tcp" register="true"> - <object identity="${server}-hello2" type="::Demo::Hello"/> - </adapter> - </adapters> - <properties> - <property name="Identity" value="${server}-hello2"/> - <property name="Prop" value="${id}"/> - </properties> - </server> - + <server-instance template="ServerTemplate" name="Server2"/> </node> </application> diff --git a/cpp/demo/IcePack/simple/config.icegrid b/cpp/demo/IcePack/simple/config.icegrid index 8f8fce3d69d..2cadbc1387b 100644 --- a/cpp/demo/IcePack/simple/config.icegrid +++ b/cpp/demo/IcePack/simple/config.icegrid @@ -26,7 +26,7 @@ IceGrid.Registry.Data=db/registry IceGrid.Node.Name=node IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node -#IceGrid.Node.CollocateRegistry=1 +IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db #IceGrid.Node.RedirectErrToOut=1 diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 55a42b49ff0..e9ef6838561 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -572,7 +572,6 @@ void ApplicationDescriptorHelper::endParsing() { _descriptor->variables = _variables->getCurrentScopeVariables(); - _variables->remove("application"); } const ApplicationDescriptorPtr& diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 38f07c95138..611df70109f 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -481,6 +481,7 @@ DescriptorHandler::getApplicationDescriptor() const { error("no application descriptor defined in this file"); } + _currentApplication->instantiate(); return _currentApplication->getDescriptor(); } |