diff options
Diffstat (limited to 'cpp')
20 files changed, 90 insertions, 88 deletions
diff --git a/cpp/demo/IceGrid/allocate/application-multiple.xml b/cpp/demo/IceGrid/allocate/application-multiple.xml index ab1f9214e9e..ca025eaf2c0 100644 --- a/cpp/demo/IceGrid/allocate/application-multiple.xml +++ b/cpp/demo/IceGrid/allocate/application-multiple.xml @@ -16,9 +16,14 @@ <server-template id="AllocateServer"> <parameter name="index"/> <server id="AllocateServer-${index}" exe="./server" activation="always"> - <adapter name="Hello" endpoints="tcp"> + <adapter name="Hello" endpoints="tcp -h localhost"> <allocatable identity="hello-${index}" type="::Demo::Hello" property="Identity"/> </adapter> + + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> </server> </server-template> diff --git a/cpp/demo/IceGrid/allocate/application-single.xml b/cpp/demo/IceGrid/allocate/application-single.xml index 19cac5e0738..7df549f2f76 100644 --- a/cpp/demo/IceGrid/allocate/application-single.xml +++ b/cpp/demo/IceGrid/allocate/application-single.xml @@ -15,9 +15,14 @@ <node name="node1"> <server id="AllocateServer" exe="./server" activation="on-demand"> - <adapter name="Hello" endpoints="tcp"> + <adapter name="Hello" endpoints="tcp -h localhost"> <allocatable identity="hello" type="::Demo::Hello" property="Identity"/> </adapter> + + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> </server> </node> diff --git a/cpp/demo/IceGrid/allocate/config.grid b/cpp/demo/IceGrid/allocate/config.grid index 41bf69d06cc..a608c1d429a 100644 --- a/cpp/demo/IceGrid/allocate/config.grid +++ b/cpp/demo/IceGrid/allocate/config.grid @@ -21,16 +21,10 @@ IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier # -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE - -# # IceGrid node configuration. # IceGrid.Node.Name=node1 -IceGrid.Node.Endpoints=default +IceGrid.Node.Endpoints=default -h localhost IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cpp/demo/IceGrid/icebox/application.xml b/cpp/demo/IceGrid/icebox/application.xml index a61fd59008f..a5340af17c1 100644 --- a/cpp/demo/IceGrid/icebox/application.xml +++ b/cpp/demo/IceGrid/icebox/application.xml @@ -2,16 +2,27 @@ <!-- This file was written by IceGrid Admin --> <icegrid> <application name="HelloSimpsons"> + + <properties id="mx"> + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> + </properties> + <service-template id="HelloService"> <parameter name="name"/> <service name="${name}" entry="HelloService:create"> <description>A very simple service named after ${name}</description> <properties> + <properties refid="mx"/> <property name="Hello.Identity" value="hello"/> </properties> - <adapter name="Hello-${name}" endpoints="default" id="Hello-${name}" replica-group="HelloGroup" server-lifetime="false"/> + <adapter name="Hello-${name}" endpoints="default -h localhost" id="Hello-${name}" + replica-group="HelloGroup" server-lifetime="false"/> </service> </service-template> + <server-template id="Glacier2"> <parameter name="instance-name" default="${application}.Glacier2"/> <parameter name="client-endpoints"/> @@ -19,7 +30,7 @@ <parameter name="session-timeout" default="0"/> <server id="${instance-name}" activation="manual" exe="glacier2router"> <properties> - <property name="Ice.Admin.Endpoints" value="tcp -h localhost"/> + <properties refid="mx"/> <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/> <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/> <property name="Glacier2.InstanceName" value="${instance-name}"/> @@ -27,22 +38,28 @@ </properties> </server> </server-template> + <replica-group id="HelloGroup"> <load-balancing type="round-robin" n-replicas="1"/> <object identity="hello" type="::Demo::Hello"/> </replica-group> + <node name="node1"> - <server-instance template="Glacier2" instance-name="DemoGlacier2" client-endpoints="tcp -h localhost -p 4063" server-endpoints="tcp"> + + <server-instance template="Glacier2" + instance-name="DemoGlacier2" + client-endpoints="tcp -h localhost -p 4063" + server-endpoints="tcp -h localhost"> <properties> <property name="Glacier2.SessionManager" value="DemoIceGrid/AdminSessionManager"/> <property name="Glacier2.PermissionsVerifier" value="DemoGlacier2/NullPermissionsVerifier"/> </properties> </server-instance> + <icebox id="IceBox" activation="on-demand" exe="icebox"> <description>A sample IceBox server</description> <properties> - <property name="Ice.Admin.Endpoints" value="tcp -h localhost"/> - <property name="IceBox.InstanceName" value="${server}"/> + <properties refid="mx"/> <property name="IceBox.Trace.ServiceObserver" value="1"/> </properties> <service-instance template="HelloService" name="Homer"/> @@ -52,6 +69,7 @@ <service-instance template="HelloService" name="Maggie"/> <env>LANG=en</env> </icebox> + </node> </application> </icegrid> diff --git a/cpp/demo/IceGrid/icebox/config.grid b/cpp/demo/IceGrid/icebox/config.grid index 54da369d64f..33036a24f98 100644 --- a/cpp/demo/IceGrid/icebox/config.grid +++ b/cpp/demo/IceGrid/icebox/config.grid @@ -27,16 +27,10 @@ IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier # -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE - -# # IceGrid node configuration. # IceGrid.Node.Name=node1 -IceGrid.Node.Endpoints=default +IceGrid.Node.Endpoints=default -h localhost IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cpp/demo/IceGrid/replication/application.xml b/cpp/demo/IceGrid/replication/application.xml index f6ea4054095..9fde7f32af7 100644 --- a/cpp/demo/IceGrid/replication/application.xml +++ b/cpp/demo/IceGrid/replication/application.xml @@ -15,8 +15,12 @@ <server-template id="SimpleServer"> <parameter name="index"/> <server id="SimpleServer-${index}" exe="./server" activation="on-demand"> - <adapter name="Hello" endpoints="tcp" replica-group="ReplicatedHelloAdapter"/> + <adapter name="Hello" endpoints="tcp -h localhost" replica-group="ReplicatedHelloAdapter"/> <property name="Identity" value="hello"/> + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> </server> </server-template> diff --git a/cpp/demo/IceGrid/replication/config.master b/cpp/demo/IceGrid/replication/config.master index 180ad7fb48b..c6e30104b1f 100644 --- a/cpp/demo/IceGrid/replication/config.master +++ b/cpp/demo/IceGrid/replication/config.master @@ -13,13 +13,6 @@ IceGrid.Registry.Data=db/master IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier -# -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE -#IceGrid.SQL.DatabaseName=db/master/Registry.db - Ice.StdErr=db/master/stderr.txt Ice.StdOut=db/master/stdout.txt diff --git a/cpp/demo/IceGrid/replication/config.replica1 b/cpp/demo/IceGrid/replication/config.replica1 index ada89dc5a62..3ef93a387a0 100644 --- a/cpp/demo/IceGrid/replication/config.replica1 +++ b/cpp/demo/IceGrid/replication/config.replica1 @@ -14,13 +14,6 @@ IceGrid.Registry.ReplicaName=Replica1 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier -# -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE -#IceGrid.SQL.DatabaseName=db/replica1/Registry.db - Ice.StdErr=db/replica1/stderr.txt Ice.StdOut=db/replica1/stdout.txt diff --git a/cpp/demo/IceGrid/replication/config.replica2 b/cpp/demo/IceGrid/replication/config.replica2 index 50edd31f62b..763e55f0797 100644 --- a/cpp/demo/IceGrid/replication/config.replica2 +++ b/cpp/demo/IceGrid/replication/config.replica2 @@ -14,13 +14,6 @@ IceGrid.Registry.ReplicaName=Replica2 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier -# -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE -#IceGrid.SQL.DatabaseName=db/replica2/Registry.db - Ice.StdErr=db/replica2/stderr.txt Ice.StdOut=db/replica2/stdout.txt diff --git a/cpp/demo/IceGrid/secure/application.xml b/cpp/demo/IceGrid/secure/application.xml index 383b23d7841..d0d953edf3a 100644 --- a/cpp/demo/IceGrid/secure/application.xml +++ b/cpp/demo/IceGrid/secure/application.xml @@ -27,12 +27,17 @@ <node name="Node"> <server id="SimpleServer" exe="./server" activation="on-demand"> - <adapter name="Hello" endpoints="tcp"> + <adapter name="Hello" endpoints="tcp -h localhost"> <object identity="hello" type="::Demo::Hello" property="Identity"/> </adapter> <properties> <properties refid="Secure-Ice.Admin"/> + + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> </properties> </server> </node> diff --git a/cpp/demo/IceGrid/secure/config.master b/cpp/demo/IceGrid/secure/config.master index 53ef86a0e3b..2b5a672355b 100644 --- a/cpp/demo/IceGrid/secure/config.master +++ b/cpp/demo/IceGrid/secure/config.master @@ -26,13 +26,6 @@ IceGrid.Registry.AdminSessionManager.Endpoints=ssl -h localhost -t 10000 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier # -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE -#IceGrid.SQL.DatabaseName=db/master/Registry.db - -# # Trace properties. # Ice.ProgramName=Master diff --git a/cpp/demo/IceGrid/secure/config.slave b/cpp/demo/IceGrid/secure/config.slave index 49aee2b7db3..0847f9c5207 100644 --- a/cpp/demo/IceGrid/secure/config.slave +++ b/cpp/demo/IceGrid/secure/config.slave @@ -31,13 +31,6 @@ IceGrid.Registry.AdminSessionManager.Endpoints=ssl -h localhost -t 10000 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier # -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE -#IceGrid.SQL.DatabaseName=db/slave/Registry.db - -# # Trace properties. # Ice.ProgramName=Slave diff --git a/cpp/demo/IceGrid/sessionActivation/application.xml b/cpp/demo/IceGrid/sessionActivation/application.xml index 3fc6b088228..bba7d38356e 100644 --- a/cpp/demo/IceGrid/sessionActivation/application.xml +++ b/cpp/demo/IceGrid/sessionActivation/application.xml @@ -15,9 +15,14 @@ <node name="node1"> <server id="SessionServer" exe="./server" activation="session"> - <adapter name="Hello" endpoints="tcp"> + <adapter name="Hello" endpoints="tcp -h localhost"> <allocatable identity="hello" property="Identity"/> </adapter> + + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> </server> </node> diff --git a/cpp/demo/IceGrid/sessionActivation/config.grid b/cpp/demo/IceGrid/sessionActivation/config.grid index 41bf69d06cc..a608c1d429a 100644 --- a/cpp/demo/IceGrid/sessionActivation/config.grid +++ b/cpp/demo/IceGrid/sessionActivation/config.grid @@ -21,16 +21,10 @@ IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier # -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE - -# # IceGrid node configuration. # IceGrid.Node.Name=node1 -IceGrid.Node.Endpoints=default +IceGrid.Node.Endpoints=default -h localhost IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cpp/demo/IceGrid/simple/application.xml b/cpp/demo/IceGrid/simple/application.xml index e57543ac9d8..905a998c13e 100644 --- a/cpp/demo/IceGrid/simple/application.xml +++ b/cpp/demo/IceGrid/simple/application.xml @@ -19,6 +19,11 @@ <adapter name="Hello" endpoints="tcp -h localhost"> <object identity="hello" type="::Demo::Hello" property="Identity"/> </adapter> + + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> </server> </node> diff --git a/cpp/demo/IceGrid/simple/application_with_replication.xml b/cpp/demo/IceGrid/simple/application_with_replication.xml index 1317d4504cb..e2589de3993 100644 --- a/cpp/demo/IceGrid/simple/application_with_replication.xml +++ b/cpp/demo/IceGrid/simple/application_with_replication.xml @@ -15,8 +15,13 @@ <server-template id="SimpleServer"> <parameter name="index"/> <server id="SimpleServer-${index}" exe="./server" activation="on-demand"> - <adapter name="Hello" endpoints="tcp" replica-group="ReplicatedHelloAdapter"/> + <adapter name="Hello" endpoints="tcp -h localhost" replica-group="ReplicatedHelloAdapter"/> <property name="Identity" value="hello"/> + + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> </server> </server-template> diff --git a/cpp/demo/IceGrid/simple/application_with_template.xml b/cpp/demo/IceGrid/simple/application_with_template.xml index a77d268012b..1e49986d429 100644 --- a/cpp/demo/IceGrid/simple/application_with_template.xml +++ b/cpp/demo/IceGrid/simple/application_with_template.xml @@ -16,9 +16,14 @@ <server-template id="SimpleServer"> <parameter name="index"/> <server id="SimpleServer-${index}" exe="./server" activation="on-demand"> - <adapter name="Hello" endpoints="tcp"> + <adapter name="Hello" endpoints="tcp -h localhost"> <object identity="hello-${index}" type="::Demo::Hello" property="Identity"/> </adapter> + + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> </server> </server-template> diff --git a/cpp/demo/IceGrid/simple/config.grid b/cpp/demo/IceGrid/simple/config.grid index cc271d33fa3..1d013623289 100644 --- a/cpp/demo/IceGrid/simple/config.grid +++ b/cpp/demo/IceGrid/simple/config.grid @@ -21,12 +21,6 @@ IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier # -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE - -# # IceGrid node configuration. # IceGrid.Node.Name=node1 diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml index 0be46486840..0f57b729c5d 100644 --- a/cpp/demo/IceStorm/replicated/application.xml +++ b/cpp/demo/IceStorm/replicated/application.xml @@ -11,6 +11,13 @@ <icegrid> <application name="DemoIceStorm"> + + <properties id="mx"> + <property name="IceMX.Metrics.Debug.GroupBy" value="id"/> + <property name="IceMX.Metrics.Debug.Disabled" value="1"/> + <property name="IceMX.Metrics.ByParent.GroupBy" value="parent"/> + <property name="IceMX.Metrics.ByParent.Disabled" value="1"/> + </properties> <server-template id="IceStorm"> <parameter name="index"/> @@ -21,6 +28,10 @@ <icebox id="${instance-name}-${index}" exe="icebox" activation="on-demand"> + <properties> + <properties refid="mx"/> + </properties> + <service name="IceStorm" entry="IceStormService,35b:createIceStorm"> <dbenv name="${service}"/> @@ -35,8 +46,9 @@ <adapter name="${service}.Node" endpoints="${node-endpoints}"/> - + <properties> + <properties refid="mx"/> <property name="${service}.InstanceName" value="${instance-name}"/> <property name="${service}.Trace.TopicManager" value="2"/> <property name="${service}.Trace.Topic" value="1"/> @@ -48,7 +60,6 @@ </properties> </service> - </icebox> </server-template> diff --git a/cpp/demo/IceStorm/replicated/config.grid b/cpp/demo/IceStorm/replicated/config.grid index e682f50cf30..a608c1d429a 100644 --- a/cpp/demo/IceStorm/replicated/config.grid +++ b/cpp/demo/IceStorm/replicated/config.grid @@ -6,14 +6,14 @@ IceGrid.InstanceName=DemoIceGrid # # The IceGrid locator proxy. # -Ice.Default.Locator=DemoIceGrid/Locator:default -p 4061 +Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 4061 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 4061 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +IceGrid.Registry.Client.Endpoints=default -h localhost -p 4061 +IceGrid.Registry.Server.Endpoints=default -h localhost +IceGrid.Registry.Internal.Endpoints=default -h localhost IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,17 +21,10 @@ IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier # -# IceGrid SQL configuration if using SQL database. -# -#Ice.Plugin.DB=IceGridSqlDB:createSqlDB -#IceGrid.SQL.DatabaseType=QSQLITE -#IceGrid.SQL.DatabaseName=db/registry/Registry.db - -# # IceGrid node configuration. # IceGrid.Node.Name=node1 -IceGrid.Node.Endpoints=default +IceGrid.Node.Endpoints=default -h localhost IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db |