diff options
Diffstat (limited to 'cpp')
80 files changed, 407 insertions, 324 deletions
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index d2383fc2569..2ecc590af79 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -814,5 +814,5 @@ int main(int argc, char* argv[]) { TestApp app("db"); - return app.main(argc, argv, "config"); + return app.main(argc, argv); } diff --git a/cpp/demo/Freeze/bench/config b/cpp/demo/Freeze/bench/config deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cpp/demo/Freeze/bench/config +++ /dev/null diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp index cd8ce9fa091..dab9aaa2607 100644 --- a/cpp/demo/Freeze/library/Client.cpp +++ b/cpp/demo/Freeze/library/Client.cpp @@ -21,7 +21,7 @@ int main(int argc, char* argv[]) { LibraryClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp index 97db217d0d5..754f610e465 100644 --- a/cpp/demo/Freeze/library/Server.cpp +++ b/cpp/demo/Freeze/library/Server.cpp @@ -33,7 +33,7 @@ int main(int argc, char* argv[]) { LibraryServer app("db"); - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Freeze/library/config.client b/cpp/demo/Freeze/library/config.client new file mode 100644 index 00000000000..81bb193637c --- /dev/null +++ b/cpp/demo/Freeze/library/config.client @@ -0,0 +1,5 @@ +Ice.Warn.Connections=1 +#Ice.Trace.Network=3 +#Ice.Trace.Protocol=1 + +Library.Proxy=library:default -p 10000 diff --git a/cpp/demo/Freeze/library/config b/cpp/demo/Freeze/library/config.server index f184d31e060..017c3202482 100644 --- a/cpp/demo/Freeze/library/config +++ b/cpp/demo/Freeze/library/config.server @@ -7,4 +7,3 @@ Freeze.Trace.Evictor=2 Library.Endpoints=default -p 10000 Library.EvictorSize=3 -Library.Proxy=library:default -p 10000 diff --git a/cpp/demo/Freeze/phonebook/Client.cpp b/cpp/demo/Freeze/phonebook/Client.cpp index 2b32e2e2263..625041380a5 100644 --- a/cpp/demo/Freeze/phonebook/Client.cpp +++ b/cpp/demo/Freeze/phonebook/Client.cpp @@ -20,7 +20,7 @@ int main(int argc, char* argv[]) { PhoneBookClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp index 131d7c9ee38..5c3f9e2a196 100644 --- a/cpp/demo/Freeze/phonebook/Server.cpp +++ b/cpp/demo/Freeze/phonebook/Server.cpp @@ -34,7 +34,7 @@ int main(int argc, char* argv[]) { PhoneBookServer app("db"); - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Freeze/phonebook/config.client b/cpp/demo/Freeze/phonebook/config.client new file mode 100644 index 00000000000..1d32bda525c --- /dev/null +++ b/cpp/demo/Freeze/phonebook/config.client @@ -0,0 +1,5 @@ +Ice.Warn.Connections=1 +#Ice.Trace.Network=3 +#Ice.Trace.Protocol=1 + +PhoneBook.Proxy=phonebook:default -p 10000 diff --git a/cpp/demo/Freeze/phonebook/config b/cpp/demo/Freeze/phonebook/config.server index d6e8d6874c7..f381c167762 100644 --- a/cpp/demo/Freeze/phonebook/config +++ b/cpp/demo/Freeze/phonebook/config.server @@ -8,5 +8,4 @@ Freeze.Evictor.db.contacts.SavePeriod=10000 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1 PhoneBook.Endpoints=default -p 10000 -PhoneBook.Proxy=phonebook:default -p 10000 PhoneBook.EvictorSize=3 diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp index fd2c4333ab5..4be8269e771 100644 --- a/cpp/demo/Glacier2/callback/Client.cpp +++ b/cpp/demo/Glacier2/callback/Client.cpp @@ -25,7 +25,7 @@ int main(int argc, char* argv[]) { CallbackClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } void diff --git a/cpp/demo/Glacier2/callback/README b/cpp/demo/Glacier2/callback/README index c164ffc7969..adc3589f927 100644 --- a/cpp/demo/Glacier2/callback/README +++ b/cpp/demo/Glacier2/callback/README @@ -17,10 +17,10 @@ In a separate window, start the client: $ client -If you plan to run this demo using clients running on different -hosts than the glacier2router, it is necessary to first modify the -configuration. You need to change the Glacier2.Client.Endpoints -property in config.glacier2 and the Ice.Default.Router and -Callback.Client.Router properties in config. In all cases you must -replace the "-h 127.0.0.1" parameter with the actual external address -of the machine on which glacier2router is running. +If you plan to run this demo using clients on different hosts than +the router, you must first modify the configuration. You need to +change the Glacier2.Client.Endpoints property in config.glacier2 and +the Ice.Default.Router and Callback.Client.Router properties in +config.client. In all cases you must replace the "-h 127.0.0.1" +parameter with the actual external address of the machine on which +glacier2router is running. diff --git a/cpp/demo/Glacier2/callback/config b/cpp/demo/Glacier2/callback/config.client index 0d3de8fcb32..e26e8735239 100644 --- a/cpp/demo/Glacier2/callback/config +++ b/cpp/demo/Glacier2/callback/config.client @@ -29,7 +29,6 @@ Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000 # Connections must remain established. # Ice.ACM.Client=0 -Ice.ACM.Server=0 # # Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or @@ -54,12 +53,8 @@ Ice.RetryIntervals=-1 Ice.Warn.Connections=1 Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem #IceSSL.Trace.Security=1 diff --git a/cpp/demo/Glacier2/callback/config.glacier2 b/cpp/demo/Glacier2/callback/config.glacier2 index b9cbacd143e..d6c3b190911 100644 --- a/cpp/demo/Glacier2/callback/config.glacier2 +++ b/cpp/demo/Glacier2/callback/config.glacier2 @@ -114,12 +114,8 @@ Glacier2.Trace.RoutingTable=1 Ice.Warn.Connections=1 Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem #IceSSL.Trace.Security=1 diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp index 14eb3428b0e..d8d1693bb06 100755 --- a/cpp/demo/Glacier2/chat/Client.cpp +++ b/cpp/demo/Glacier2/chat/Client.cpp @@ -218,5 +218,5 @@ int main(int argc, char* argv[]) { ChatClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } diff --git a/cpp/demo/Glacier2/chat/README b/cpp/demo/Glacier2/chat/README index e0b0ebb11e3..26f02556cc6 100644 --- a/cpp/demo/Glacier2/chat/README +++ b/cpp/demo/Glacier2/chat/README @@ -17,6 +17,6 @@ If you plan to run this demo using clients running on different hosts than the glacier2router, it is necessary to first modify the configuration. You need to change the Glacier2.Client.Endpoints property in config.glacier2 and the Ice.Default.Router and -Callback.Client.Router properties in config. In all cases you must +Chat.Client.Router properties in config. In all cases you must replace the "-h 127.0.0.1" parameter with the actual external address of the machine on which glacier2router is running. diff --git a/cpp/demo/Glacier2/chat/config b/cpp/demo/Glacier2/chat/config.client index d4075f996b0..ecbc849e1f2 100644 --- a/cpp/demo/Glacier2/chat/config +++ b/cpp/demo/Glacier2/chat/config.client @@ -23,7 +23,6 @@ Chat.Client.Endpoints= # Connections must remain established. # Ice.ACM.Client=0 -Ice.ACM.Server=0 # # Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or @@ -48,12 +47,8 @@ Ice.RetryIntervals=-1 #Ice.Warn.Connections=1 Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem #IceSSL.Trace.Security=1 diff --git a/cpp/demo/Glacier2/chat/config.glacier2 b/cpp/demo/Glacier2/chat/config.glacier2 index 6985f616459..66986b2bbd0 100644 --- a/cpp/demo/Glacier2/chat/config.glacier2 +++ b/cpp/demo/Glacier2/chat/config.glacier2 @@ -38,12 +38,8 @@ Glacier2.SessionTimeout=30 # SSL Settings. # Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem #IceSSL.Trace.Security=1 diff --git a/cpp/demo/Ice/MFC/client/config b/cpp/demo/Ice/MFC/client/config index 2dc751ae948..719effef5ae 100644 --- a/cpp/demo/Ice/MFC/client/config +++ b/cpp/demo/Ice/MFC/client/config @@ -28,18 +28,11 @@ Ice.Trace.Network=0 Ice.Trace.Protocol=0 # -# Security Tracing -# -# 0 = no security tracing -# 1 = trace messages -# -IceSSL.Trace.Security=0 - -# # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem +IceSSL.DefaultDir=../../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem +IceSSL.Trace.Security=0 diff --git a/cpp/demo/Ice/MFC/server/config b/cpp/demo/Ice/MFC/server/config index e3980f543d1..227b4ed60c3 100644 --- a/cpp/demo/Ice/MFC/server/config +++ b/cpp/demo/Ice/MFC/server/config @@ -16,7 +16,7 @@ Ice.Warn.Connections=1 # 2 = like 1, but more detailed # 3 = like 2, but also trace data transfer # -Ice.Trace.Network=1 +Ice.Trace.Network=0 # # Protocol Tracing @@ -27,18 +27,11 @@ Ice.Trace.Network=1 Ice.Trace.Protocol=0 # -# Security Tracing -# -# 0 = no security tracing -# 1 = trace messages -# -IceSSL.Trace.Security=0 - -# # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Server.DefaultDir=../../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem +IceSSL.DefaultDir=../../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem +IceSSL.Trace.Security=0 diff --git a/cpp/demo/Ice/bidir/Client.cpp b/cpp/demo/Ice/bidir/Client.cpp index 70ae06ec800..f730fd025b7 100644 --- a/cpp/demo/Ice/bidir/Client.cpp +++ b/cpp/demo/Ice/bidir/Client.cpp @@ -36,7 +36,7 @@ int main(int argc, char* argv[]) { CallbackClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Ice/bidir/Server.cpp b/cpp/demo/Ice/bidir/Server.cpp index d8cb42559e2..79dcb003ff4 100644 --- a/cpp/demo/Ice/bidir/Server.cpp +++ b/cpp/demo/Ice/bidir/Server.cpp @@ -24,7 +24,7 @@ int main(int argc, char* argv[]) { CallbackServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/bidir/config b/cpp/demo/Ice/bidir/config.client index 53bed76ac7d..a98634fc913 100644 --- a/cpp/demo/Ice/bidir/config +++ b/cpp/demo/Ice/bidir/config.client @@ -1,6 +1,5 @@ Callback.Client.CallbackServer=sender:tcp -p 10000 Callback.Client.Endpoints= -Callback.Server.Endpoints=tcp -p 10000 Ice.Trace.Network=0 #Ice.Trace.Protocol=1 diff --git a/cpp/demo/Ice/bidir/config.server b/cpp/demo/Ice/bidir/config.server new file mode 100644 index 00000000000..d0ab9da84fa --- /dev/null +++ b/cpp/demo/Ice/bidir/config.server @@ -0,0 +1,9 @@ +Callback.Server.Endpoints=tcp -p 10000 + +Ice.Trace.Network=0 +#Ice.Trace.Protocol=1 +Ice.Warn.Connections=1 + +# Active connection management must be disabled when using +# bidirectional connections. +Ice.ACM.Client=0 diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp index f453514147f..9fe330ea1f8 100644 --- a/cpp/demo/Ice/callback/Client.cpp +++ b/cpp/demo/Ice/callback/Client.cpp @@ -38,7 +38,7 @@ int main(int argc, char* argv[]) { CallbackClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp index 10dfc0a5c45..733301e3c46 100644 --- a/cpp/demo/Ice/callback/Server.cpp +++ b/cpp/demo/Ice/callback/Server.cpp @@ -24,7 +24,7 @@ int main(int argc, char* argv[]) { CallbackServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/callback/config b/cpp/demo/Ice/callback/config deleted file mode 100644 index c535aec1327..00000000000 --- a/cpp/demo/Ice/callback/config +++ /dev/null @@ -1,18 +0,0 @@ -Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001 -Callback.Client.Endpoints=tcp:udp:ssl -Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 - -#Ice.Trace.Network=1 -#Ice.Trace.Protocol=1 -Ice.Warn.Connections=1 - -Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem -#IceSSL.Trace.Security=1 diff --git a/cpp/demo/Ice/callback/config.client b/cpp/demo/Ice/callback/config.client new file mode 100644 index 00000000000..7654ed43089 --- /dev/null +++ b/cpp/demo/Ice/callback/config.client @@ -0,0 +1,13 @@ +Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001 +Callback.Client.Endpoints=tcp:udp:ssl + +#Ice.Trace.Network=1 +#Ice.Trace.Protocol=1 +Ice.Warn.Connections=1 + +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem +#IceSSL.Trace.Security=1 diff --git a/cpp/demo/Ice/callback/config.server b/cpp/demo/Ice/callback/config.server new file mode 100644 index 00000000000..8209159f7a7 --- /dev/null +++ b/cpp/demo/Ice/callback/config.server @@ -0,0 +1,12 @@ +Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 + +#Ice.Trace.Network=1 +#Ice.Trace.Protocol=1 +Ice.Warn.Connections=1 + +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem +#IceSSL.Trace.Security=1 diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp index 66ec436f05f..b39a11ac5ac 100644 --- a/cpp/demo/Ice/hello/Client.cpp +++ b/cpp/demo/Ice/hello/Client.cpp @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) { HelloClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp index bd19dbaae9d..a5078d657f6 100644 --- a/cpp/demo/Ice/hello/Server.cpp +++ b/cpp/demo/Ice/hello/Server.cpp @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { HelloServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/hello/config b/cpp/demo/Ice/hello/config deleted file mode 100644 index 7a846a3cd94..00000000000 --- a/cpp/demo/Ice/hello/config +++ /dev/null @@ -1,84 +0,0 @@ -# -# The client reads this property to create the reference to the -# "hello" object in the server. -# -Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001 - -# -# The server creates one single object adapter with the name -# "Hello". The following line sets the endpoints for this -# adapter. -# -Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 - -# -# Warn about connection exceptions -# -Ice.Warn.Connections=1 - -# -# We want a faster ACM for this demo. -# -Ice.ACM.Client=10 -Ice.ACM.Server=10 - -# -# Network Tracing -# -# 0 = no network tracing -# 1 = trace connection establishment and closure -# 2 = like 1, but more detailed -# 3 = like 2, but also trace data transfer -# -Ice.Trace.Network=0 - -# -# Protocol Tracing -# -# 0 = no protocol tracing -# 1 = trace protocol messages -# -Ice.Trace.Protocol=0 - -# -# Security Tracing -# -# 0 = no security tracing -# 1 = trace messages -# -IceSSL.Trace.Security=0 - -# -# SSL Configuration -# -Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem - -# -# IceGrid registry settings (assumes that a db directory exists in the -# current working directory). -# -IceGrid.Registry.Client.Endpoints=default -p 10006 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default -IceGrid.Registry.Admin.Endpoints=default -IceGrid.Registry.Data=db -IceGrid.Registry.DynamicRegistration=1 - -# -# Uncomment the following lines if you want to run this demo with the -# IceGrid registry. Note that we override properties previously set -# above, so make sure to comment out these properties to run the demo -# without IceGrid. -# -#Hello.Proxy=hello@HelloAdapter -#Hello.Endpoints=tcp:udp:ssl -#Hello.AdapterId=HelloAdapter -#Ice.Default.Locator=IceGrid/Locator:default -p 10006 diff --git a/cpp/demo/Ice/hello/config.client b/cpp/demo/Ice/hello/config.client new file mode 100644 index 00000000000..b05121d8f4c --- /dev/null +++ b/cpp/demo/Ice/hello/config.client @@ -0,0 +1,50 @@ +# +# The client reads this property to create the reference to the +# "hello" object in the server. +# +Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001 + +# +# Warn about connection exceptions +# +Ice.Warn.Connections=1 + +# +# We want a faster ACM for this demo. +# +Ice.ACM.Client=10 + +# +# Network Tracing +# +# 0 = no network tracing +# 1 = trace connection establishment and closure +# 2 = like 1, but more detailed +# 3 = like 2, but also trace data transfer +# +Ice.Trace.Network=0 + +# +# Protocol Tracing +# +# 0 = no protocol tracing +# 1 = trace protocol messages +# +Ice.Trace.Protocol=0 + +# +# Security Tracing +# +# 0 = no security tracing +# 1 = trace messages +# +IceSSL.Trace.Security=0 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem diff --git a/cpp/demo/Ice/hello/config.server b/cpp/demo/Ice/hello/config.server new file mode 100644 index 00000000000..c4085527b0c --- /dev/null +++ b/cpp/demo/Ice/hello/config.server @@ -0,0 +1,51 @@ +# +# The server creates one single object adapter with the name +# "Hello". The following line sets the endpoints for this +# adapter. +# +Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 + +# +# Warn about connection exceptions +# +Ice.Warn.Connections=1 + +# +# We want a faster ACM for this demo. +# +Ice.ACM.Server=10 + +# +# Network Tracing +# +# 0 = no network tracing +# 1 = trace connection establishment and closure +# 2 = like 1, but more detailed +# 3 = like 2, but also trace data transfer +# +Ice.Trace.Network=0 + +# +# Protocol Tracing +# +# 0 = no protocol tracing +# 1 = trace protocol messages +# +Ice.Trace.Protocol=0 + +# +# Security Tracing +# +# 0 = no security tracing +# 1 = trace messages +# +IceSSL.Trace.Security=0 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem diff --git a/cpp/demo/Ice/invoke/Client.cpp b/cpp/demo/Ice/invoke/Client.cpp index 639b5e2d4e4..927ed9f97f6 100644 --- a/cpp/demo/Ice/invoke/Client.cpp +++ b/cpp/demo/Ice/invoke/Client.cpp @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) { InvokeClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } static ostream& diff --git a/cpp/demo/Ice/invoke/Server.cpp b/cpp/demo/Ice/invoke/Server.cpp index b02a24af18e..4145872b740 100644 --- a/cpp/demo/Ice/invoke/Server.cpp +++ b/cpp/demo/Ice/invoke/Server.cpp @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { InvokeServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/invoke/config b/cpp/demo/Ice/invoke/config.client index ae3f09ae37f..8fc715b687d 100644 --- a/cpp/demo/Ice/invoke/config +++ b/cpp/demo/Ice/invoke/config.client @@ -1,2 +1 @@ Printer.Proxy=printer:tcp -p 10000 -Printer.Endpoints=tcp -p 10000 diff --git a/cpp/demo/Ice/invoke/config.server b/cpp/demo/Ice/invoke/config.server new file mode 100644 index 00000000000..49e49e0ccd9 --- /dev/null +++ b/cpp/demo/Ice/invoke/config.server @@ -0,0 +1 @@ +Printer.Endpoints=tcp -p 10000 diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp index 07d789e716a..20f02f67c3e 100644 --- a/cpp/demo/Ice/latency/Client.cpp +++ b/cpp/demo/Ice/latency/Client.cpp @@ -24,7 +24,7 @@ int main(int argc, char* argv[]) { LatencyClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp index 1e62a3d5a9c..09151d152f2 100644 --- a/cpp/demo/Ice/latency/Server.cpp +++ b/cpp/demo/Ice/latency/Server.cpp @@ -24,7 +24,7 @@ int main(int argc, char* argv[]) { LatencyServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/latency/config b/cpp/demo/Ice/latency/config deleted file mode 100644 index d20130b15ab..00000000000 --- a/cpp/demo/Ice/latency/config +++ /dev/null @@ -1,15 +0,0 @@ -Latency.Ping=ping:default -p 10000 -Latency.Endpoints=default -p 10000 - -#Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem - -Ice.ACM.Client=0 -Ice.ACM.Server=0 diff --git a/cpp/demo/Ice/latency/config.client b/cpp/demo/Ice/latency/config.client new file mode 100644 index 00000000000..e91a1629f92 --- /dev/null +++ b/cpp/demo/Ice/latency/config.client @@ -0,0 +1,9 @@ +Latency.Ping=ping:default -p 10000 + +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem + +Ice.ACM.Client=0 diff --git a/cpp/demo/Ice/latency/config.server b/cpp/demo/Ice/latency/config.server new file mode 100644 index 00000000000..7c37895e0d5 --- /dev/null +++ b/cpp/demo/Ice/latency/config.server @@ -0,0 +1,7 @@ +Latency.Endpoints=default -p 10000 + +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp index b74d787539c..3ff33f4ca84 100644 --- a/cpp/demo/Ice/nested/Client.cpp +++ b/cpp/demo/Ice/nested/Client.cpp @@ -24,7 +24,7 @@ int main(int argc, char* argv[]) { NestedClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp index 3f47221f7b0..4ea63595ad2 100644 --- a/cpp/demo/Ice/nested/Server.cpp +++ b/cpp/demo/Ice/nested/Server.cpp @@ -24,7 +24,7 @@ int main(int argc, char* argv[]) { NestedServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/nested/config b/cpp/demo/Ice/nested/config deleted file mode 100644 index ac570a355c8..00000000000 --- a/cpp/demo/Ice/nested/config +++ /dev/null @@ -1,21 +0,0 @@ -Nested.Server.Endpoints=default -p 10000 -t 10000 - -Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000 -Nested.Client.Endpoints=default -t 10000 - -Ice.ThreadPool.Server.Size=5 -Ice.ThreadPool.Server.SizeWarn=5 -Ice.ThreadPool.Server.SizeMax=10 -#Ice.Trace.Network=1 -#Ice.Trace.Protocol=1 -#Ice.Warn.Connections=1 - -Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem diff --git a/cpp/demo/Ice/nested/config.client b/cpp/demo/Ice/nested/config.client new file mode 100644 index 00000000000..a65086a9423 --- /dev/null +++ b/cpp/demo/Ice/nested/config.client @@ -0,0 +1,15 @@ +Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000 +Nested.Client.Endpoints=default -t 10000 + +Ice.ThreadPool.Server.Size=5 +Ice.ThreadPool.Server.SizeWarn=5 +Ice.ThreadPool.Server.SizeMax=10 +#Ice.Trace.Network=1 +#Ice.Trace.Protocol=1 +#Ice.Warn.Connections=1 + +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem diff --git a/cpp/demo/Ice/nested/config.server b/cpp/demo/Ice/nested/config.server new file mode 100644 index 00000000000..afd8dab88af --- /dev/null +++ b/cpp/demo/Ice/nested/config.server @@ -0,0 +1,14 @@ +Nested.Server.Endpoints=default -p 10000 -t 10000 + +Ice.ThreadPool.Server.Size=5 +Ice.ThreadPool.Server.SizeWarn=5 +Ice.ThreadPool.Server.SizeMax=10 +#Ice.Trace.Network=1 +#Ice.Trace.Protocol=1 +#Ice.Warn.Connections=1 + +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem diff --git a/cpp/demo/Ice/session/Client.cpp b/cpp/demo/Ice/session/Client.cpp index 62b75b35aa0..26072c27ef9 100755 --- a/cpp/demo/Ice/session/Client.cpp +++ b/cpp/demo/Ice/session/Client.cpp @@ -82,7 +82,7 @@ int main(int argc, char* argv[]) { SessionClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Ice/session/Server.cpp b/cpp/demo/Ice/session/Server.cpp index 88abbe75936..a8774294648 100644 --- a/cpp/demo/Ice/session/Server.cpp +++ b/cpp/demo/Ice/session/Server.cpp @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { SessionServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/session/config.client b/cpp/demo/Ice/session/config.client new file mode 100644 index 00000000000..3a0133d0a30 --- /dev/null +++ b/cpp/demo/Ice/session/config.client @@ -0,0 +1,10 @@ +# +# The client reads this property to create the reference to the +# "SessionFactory" object in the server. +# +SessionFactory.Proxy=SessionFactory:default -p 10000 + +# +# Warn about connection exceptions +# +Ice.Warn.Connections=1 diff --git a/cpp/demo/Ice/session/config b/cpp/demo/Ice/session/config.server index ec0a2e522ce..8aa8dfac36f 100644 --- a/cpp/demo/Ice/session/config +++ b/cpp/demo/Ice/session/config.server @@ -1,10 +1,4 @@ # -# The client reads this property to create the reference to the -# "SessionFactory" object in the server. -# -SessionFactory.Proxy=SessionFactory:default -p 10000 - -# # The server creates one single object adapter with the name # "SessionFactory". The following line sets the endpoints for this # adapter. diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp index 2fafd41a5c6..2f5c959500f 100644 --- a/cpp/demo/Ice/throughput/Client.cpp +++ b/cpp/demo/Ice/throughput/Client.cpp @@ -30,7 +30,7 @@ int main(int argc, char* argv[]) { ThroughputClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp index a56e5b2eab5..1de93f68745 100644 --- a/cpp/demo/Ice/throughput/Server.cpp +++ b/cpp/demo/Ice/throughput/Server.cpp @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { ThroughputServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/throughput/config b/cpp/demo/Ice/throughput/config deleted file mode 100644 index 3625d1ff84f..00000000000 --- a/cpp/demo/Ice/throughput/config +++ /dev/null @@ -1,15 +0,0 @@ -Throughput.Throughput=throughput:default -p 10000 -Throughput.Endpoints=default -p 10000 - -#Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem - -Ice.ACM.Client=0 -Ice.ACM.Server=0 diff --git a/cpp/demo/Ice/throughput/config.client b/cpp/demo/Ice/throughput/config.client new file mode 100644 index 00000000000..e82c998d105 --- /dev/null +++ b/cpp/demo/Ice/throughput/config.client @@ -0,0 +1,9 @@ +Throughput.Throughput=throughput:default -p 10000 + +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem + +Ice.ACM.Client=0 diff --git a/cpp/demo/Ice/throughput/config.server b/cpp/demo/Ice/throughput/config.server new file mode 100644 index 00000000000..d99412c33b7 --- /dev/null +++ b/cpp/demo/Ice/throughput/config.server @@ -0,0 +1,7 @@ +Throughput.Endpoints=default -p 10000 + +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp index e4263a99025..238e2ce3640 100644 --- a/cpp/demo/Ice/value/Client.cpp +++ b/cpp/demo/Ice/value/Client.cpp @@ -25,7 +25,7 @@ int main(int argc, char* argv[]) { ValueClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } int @@ -179,5 +179,7 @@ ValueClient::run(int argc, char* argv[]) cout << '\n' << "That's it for this demo. Have fun with Ice!\n"; + initial->shutdown(); + return EXIT_SUCCESS; } diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp index 52b385ac4a8..80571754eb4 100644 --- a/cpp/demo/Ice/value/Server.cpp +++ b/cpp/demo/Ice/value/Server.cpp @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { ValueServer app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.server"); } int diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice index 63cf4649448..b5f340dbe05 100644 --- a/cpp/demo/Ice/value/Value.ice +++ b/cpp/demo/Ice/value/Value.ice @@ -41,6 +41,7 @@ class Initial void getPrinter(out Printer impl, out Printer* proxy); Printer getDerivedPrinter(); void throwDerivedPrinter() throws DerivedPrinterException; + void shutdown(); }; }; diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp index deb635e6a2e..d33f2a915b1 100644 --- a/cpp/demo/Ice/value/ValueI.cpp +++ b/cpp/demo/Ice/value/ValueI.cpp @@ -53,6 +53,12 @@ InitialI::throwDerivedPrinter(const Ice::Current&) } void +InitialI::shutdown(const Ice::Current& current) +{ + current.adapter->getCommunicator()->shutdown(); +} + +void PrinterI::printBackwards(const Ice::Current&) { string s; diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h index 9d74bd8329d..9196a4244c8 100644 --- a/cpp/demo/Ice/value/ValueI.h +++ b/cpp/demo/Ice/value/ValueI.h @@ -22,6 +22,7 @@ public: virtual void getPrinter(::Demo::PrinterPtr&, Demo::PrinterPrx&, const Ice::Current&); virtual Demo::PrinterPtr getDerivedPrinter(const Ice::Current&); virtual void throwDerivedPrinter(const Ice::Current&); + virtual void shutdown(const Ice::Current&); private: diff --git a/cpp/demo/Ice/value/config b/cpp/demo/Ice/value/config deleted file mode 100644 index 4d10c058c86..00000000000 --- a/cpp/demo/Ice/value/config +++ /dev/null @@ -1,12 +0,0 @@ -Value.Initial=initial:default -p 10000 -Value.Endpoints=default -p 10000 - -Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem diff --git a/cpp/demo/Ice/value/config.client b/cpp/demo/Ice/value/config.client new file mode 100644 index 00000000000..60e3316a0f9 --- /dev/null +++ b/cpp/demo/Ice/value/config.client @@ -0,0 +1,4 @@ +# +# The client's proxy. +# +Value.Initial=initial:tcp -p 10000 diff --git a/cpp/demo/Ice/value/config.server b/cpp/demo/Ice/value/config.server new file mode 100644 index 00000000000..8189baed470 --- /dev/null +++ b/cpp/demo/Ice/value/config.server @@ -0,0 +1,4 @@ +# +# The server's adapter endpoint. +# +Value.Endpoints=tcp -p 10000 diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp index 6f0f81d99be..d8d0a3792aa 100644 --- a/cpp/demo/IceBox/hello/Client.cpp +++ b/cpp/demo/IceBox/hello/Client.cpp @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) { HelloClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } void diff --git a/cpp/demo/IceBox/hello/README b/cpp/demo/IceBox/hello/README index 0c1237fb324..10561cdf56a 100644 --- a/cpp/demo/IceBox/hello/README +++ b/cpp/demo/IceBox/hello/README @@ -4,16 +4,19 @@ file before continuing. To run this demo, open two terminal windows. In the first window, start the IceBox server: -$ icebox --Ice.Config=config +$ icebox --Ice.Config=config.icebox Note that for debug Windows builds you will need to use iceboxd rather than icebox as the executable name. In the second window, run the client: - $ client +To shut down IceBox, use iceboxadmin: + +$ iceboxadmin --Ice.Config=config.icebox shutdown + Unix Note: For icebox to be able to find the library containing the service, you diff --git a/cpp/demo/IceBox/hello/config.client b/cpp/demo/IceBox/hello/config.client new file mode 100644 index 00000000000..b717c5c2081 --- /dev/null +++ b/cpp/demo/IceBox/hello/config.client @@ -0,0 +1,38 @@ +# +# The client reads this property to create the reference to the +# "hello" object in the server. +# +Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001 + +# +# Warn about connection exceptions +# +Ice.Warn.Connections=1 + +# +# Network Tracing +# +# 0 = no network tracing +# 1 = trace connection establishment and closure +# 2 = like 1, but more detailed +# 3 = like 2, but also trace data transfer +# +#Ice.Trace.Network=1 + +# +# Protocol Tracing +# +# 0 = no protocol tracing +# 1 = trace protocol messages +# +#Ice.Trace.Protocol=1 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL:create +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=c_rsa1024_pub.pem +IceSSL.KeyFile=c_rsa1024_priv.pem +#IceSSL.Trace.Security=1 diff --git a/cpp/demo/IceBox/hello/config b/cpp/demo/IceBox/hello/config.icebox index 16d60d3da27..970018c3825 100644 --- a/cpp/demo/IceBox/hello/config +++ b/cpp/demo/IceBox/hello/config.icebox @@ -11,13 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 IceBox.Service.Hello=HelloService:create # -# The client reads this property to create the reference to the -# "hello" object in the server. -# -Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001 - -# -# The server creates one single object adapter with the name +# The service creates one single object adapter with the name # of the service. The following line sets the endpoints for this # adapter. # @@ -50,19 +44,8 @@ Ice.Warn.Connections=1 # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.CertAuthFile=cacert.pem -IceSSL.Client.CertFile=c_rsa1024_pub.pem -IceSSL.Client.KeyFile=c_rsa1024_priv.pem -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.CertAuthFile=cacert.pem -IceSSL.Server.CertFile=s_rsa1024_pub.pem -IceSSL.Server.KeyFile=s_rsa1024_priv.pem - -# -# Security Tracing -# -# 0 = no security tracing -# 1 = trace messages -# +IceSSL.DefaultDir=../../../certs +IceSSL.CertAuthFile=cacert.pem +IceSSL.CertFile=s_rsa1024_pub.pem +IceSSL.KeyFile=s_rsa1024_priv.pem #IceSSL.Trace.Security=2 diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp index 2d7f460055c..1aef1a08328 100644 --- a/cpp/demo/IceGrid/simple/Client.cpp +++ b/cpp/demo/IceGrid/simple/Client.cpp @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) { HelloClient app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.client"); } void diff --git a/cpp/demo/IceGrid/simple/README b/cpp/demo/IceGrid/simple/README index f697020ba7f..6253ee714e4 100644 --- a/cpp/demo/IceGrid/simple/README +++ b/cpp/demo/IceGrid/simple/README @@ -1,10 +1,10 @@ To run the demo, first start the IceGrid service: -$ icegridnode --Ice.Config=config --warn +$ icegridnode --Ice.Config=config.grid --warn In a separate window: -$ icegridadmin --Ice.Config=config -e "application add 'application.xml'" +$ icegridadmin --Ice.Config=config.grid -e "application add 'application.xml'" $ client This will deploy the application described in the file "application.xml" @@ -26,7 +26,7 @@ application: If you have already deployed the application, you can update it to try a new set of descriptors, for example: -$ icegridadmin --Ice.Config=config -e "application update \ +$ icegridadmin --Ice.Config=config.grid -e "application update \ 'application_with_template.xml'" When using the descriptors from 'application_with_template.xml' or @@ -34,5 +34,5 @@ When using the descriptors from 'application_with_template.xml' or based on the `SimpleServer' template. For example, you can use the following command to deploy a new server: -$ icegridadmin --Ice.Config=config -e "server template instantiate \ +$ icegridadmin --Ice.Config=config.grid -e "server template instantiate \ Simple localhost SimpleServer index=4" diff --git a/cpp/demo/IceGrid/simple/config.client b/cpp/demo/IceGrid/simple/config.client new file mode 100644 index 00000000000..78100695847 --- /dev/null +++ b/cpp/demo/IceGrid/simple/config.client @@ -0,0 +1,4 @@ +# +# The IceGrid locator proxy. +# +Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 diff --git a/cpp/demo/IceGrid/simple/config b/cpp/demo/IceGrid/simple/config.grid index 5f12392aa12..5f12392aa12 100644 --- a/cpp/demo/IceGrid/simple/config +++ b/cpp/demo/IceGrid/simple/config.grid diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp index e1332b34afe..527a180f899 100644 --- a/cpp/demo/IceStorm/clock/Publisher.cpp +++ b/cpp/demo/IceStorm/clock/Publisher.cpp @@ -26,7 +26,7 @@ int main(int argc, char* argv[]) { Publisher app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.pub"); } int diff --git a/cpp/demo/IceStorm/clock/README b/cpp/demo/IceStorm/clock/README index 853f99cb786..79b88c5d2ee 100644 --- a/cpp/demo/IceStorm/clock/README +++ b/cpp/demo/IceStorm/clock/README @@ -2,14 +2,14 @@ To run the demo: Start the IceStorm service: -$ icebox --Ice.Config=config_service +$ icebox --Ice.Config=config.icebox This configuration assumes there is a subdirectory named db in the current working directory. In a separate window: -$ icestormadmin --Ice.Config=config -e "create time" +$ icestormadmin --Ice.Config=config.service -e "create time" $ subscriber In another window: diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp index 536568b7790..e7dd69f9a94 100644 --- a/cpp/demo/IceStorm/clock/Subscriber.cpp +++ b/cpp/demo/IceStorm/clock/Subscriber.cpp @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) { Subscriber app; - return app.main(argc, argv, "config"); + return app.main(argc, argv, "config.sub"); } int diff --git a/cpp/demo/IceStorm/clock/config_service b/cpp/demo/IceStorm/clock/config.icebox index 0bb9411a98a..84ef44ac236 100644 --- a/cpp/demo/IceStorm/clock/config_service +++ b/cpp/demo/IceStorm/clock/config.icebox @@ -6,18 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,31:create --Ice.Config=config - -# -# This property defines the home directory of the Freeze -# database environment for the IceStorm service. -# -Freeze.DbEnv.IceStorm.DbHome=db - -# -# The IceStorm service instance name. -# -IceStorm.InstanceName=DemoIceStorm +IceBox.Service.IceStorm=IceStormService,31:create --Ice.Config=config.service # # Warn about connection exceptions @@ -41,4 +30,3 @@ IceStorm.InstanceName=DemoIceStorm # 1 = trace protocol messages # #Ice.Trace.Protocol=1 - diff --git a/cpp/demo/IceStorm/clock/config.pub b/cpp/demo/IceStorm/clock/config.pub new file mode 100644 index 00000000000..e736a5faa1a --- /dev/null +++ b/cpp/demo/IceStorm/clock/config.pub @@ -0,0 +1,14 @@ +# +# This property is used by the clients to connect to IceStorm. +# +IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000 + +# +# Network Tracing +# +# 0 = no network tracing +# 1 = trace connection establishment and closure +# 2 = like 1, but more detailed +# 3 = like 2, but also trace data transfer +# +Ice.Trace.Network=0 diff --git a/cpp/demo/IceStorm/clock/config b/cpp/demo/IceStorm/clock/config.service index 032a8cbc106..7cf906d19f1 100644 --- a/cpp/demo/IceStorm/clock/config +++ b/cpp/demo/IceStorm/clock/config.service @@ -1,11 +1,5 @@ # -# This property is used to configure the endpoints of the clock -# subscriber adapter. -# -Clock.Subscriber.Endpoints=tcp - -# -# This property is used by the clients to connect to IceStorm. +# This property is used by the administrative client to connect to IceStorm. # IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000 @@ -16,6 +10,11 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000 IceStorm.TopicManager.Endpoints=default -p 10000 # +# The IceStorm service instance name. +# +IceStorm.InstanceName=DemoIceStorm + +# # This property defines the endpoints on which the topic # publisher objects listen. # @@ -56,6 +55,12 @@ IceStorm.Trace.Subscriber=1 IceStorm.Trace.Flush=1 # +# Amount of time in milliseconds between flushes for batch mode +# transfer. The minimum allowable value is 100ms. +# +IceStorm.Flush.Timeout=2000 + +# # Network Tracing # # 0 = no network tracing @@ -66,7 +71,7 @@ IceStorm.Trace.Flush=1 Ice.Trace.Network=0 # -# Amount of time in milliseconds between flushes for batch mode -# transfer. The minimum allowable value is 100ms. +# This property defines the home directory of the Freeze +# database environment for the IceStorm service. # -IceStorm.Flush.Timeout = 2000 +Freeze.DbEnv.IceStorm.DbHome=db diff --git a/cpp/demo/IceStorm/clock/config.sub b/cpp/demo/IceStorm/clock/config.sub new file mode 100644 index 00000000000..194f4f544e3 --- /dev/null +++ b/cpp/demo/IceStorm/clock/config.sub @@ -0,0 +1,20 @@ +# +# This property is used to configure the endpoints of the clock +# subscriber adapter. +# +Clock.Subscriber.Endpoints=tcp + +# +# This property is used by the clients to connect to IceStorm. +# +IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000 + +# +# Network Tracing +# +# 0 = no network tracing +# 1 = trace connection establishment and closure +# 2 = like 1, but more detailed +# 3 = like 2, but also trace data transfer +# +Ice.Trace.Network=0 |