diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-04-19 13:56:01 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-04-19 13:56:01 +0000 |
| commit | 47d89deb6b10455b6685585b707b8ba1fefea922 (patch) | |
| tree | 2d4f477ff3307675b7b6bb74fa85f4b0a2920445 | |
| parent | Fixed bogus assert (bug 953) (diff) | |
| download | ice-47d89deb6b10455b6685585b707b8ba1fefea922.tar.bz2 ice-47d89deb6b10455b6685585b707b8ba1fefea922.tar.xz ice-47d89deb6b10455b6685585b707b8ba1fefea922.zip | |
separating client/server configuration; removing client/server properties
for IceSSL
197 files changed, 1010 insertions, 690 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/py/demo/Glacier2/callback/config b/cpp/demo/Glacier2/callback/config.client index 0d3de8fcb32..e26e8735239 100644 --- a/py/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/py/demo/Ice/hello/config b/cpp/demo/Ice/hello/config.server index f37c697b636..c4085527b0c 100644 --- a/py/demo/Ice/hello/config +++ b/cpp/demo/Ice/hello/config.server @@ -1,10 +1,4 @@ # -# 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. @@ -19,7 +13,6 @@ Ice.Warn.Connections=1 # # We want a faster ACM for this demo. # -Ice.ACM.Client=10 Ice.ACM.Server=10 # @@ -44,8 +37,7 @@ Ice.Trace.Protocol=0 # Security Tracing # # 0 = no security tracing -# 1 = trace warning messages -# 2 = config file parsing warnings +# 1 = trace messages # IceSSL.Trace.Security=0 @@ -53,11 +45,7 @@ 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 +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/java/demo/Ice/session/config b/cpp/demo/Ice/session/config.server index ec0a2e522ce..8aa8dfac36f 100644 --- a/java/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 diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java index 125fe81f75c..f3f5efe9625 100644 --- a/java/demo/Freeze/bench/Client.java +++ b/java/demo/Freeze/bench/Client.java @@ -601,6 +601,6 @@ public class Client main(String[] args) { TestApp app = new TestApp("db"); - app.main("test.Freeze.bench.Client", args, "config"); + app.main("test.Freeze.bench.Client", args); } } diff --git a/java/demo/Freeze/bench/config b/java/demo/Freeze/bench/config deleted file mode 100644 index e69de29bb2d..00000000000 --- a/java/demo/Freeze/bench/config +++ /dev/null diff --git a/java/demo/Freeze/library/Client.java b/java/demo/Freeze/library/Client.java index 7e4492c8da1..3105354d443 100644 --- a/java/demo/Freeze/library/Client.java +++ b/java/demo/Freeze/library/Client.java @@ -19,6 +19,6 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - app.main("demo.Freeze.library.Client", args, "config"); + app.main("demo.Freeze.library.Client", args, "config.client"); } } diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java index f0b61c1e256..b5c6c536f67 100644 --- a/java/demo/Freeze/library/Server.java +++ b/java/demo/Freeze/library/Server.java @@ -70,6 +70,6 @@ public class Server main(String[] args) { LibraryServer app = new LibraryServer("db"); - app.main("demo.Freeze.library.Server", args, "config"); + app.main("demo.Freeze.library.Server", args, "config.server"); } } diff --git a/java/demo/Freeze/library/config.client b/java/demo/Freeze/library/config.client new file mode 100644 index 00000000000..81bb193637c --- /dev/null +++ b/java/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/java/demo/Freeze/library/config b/java/demo/Freeze/library/config.server index ff5fddefbfc..7b35c27317c 100644 --- a/java/demo/Freeze/library/config +++ b/java/demo/Freeze/library/config.server @@ -1,9 +1,9 @@ - Library.Endpoints=default -p 10000 -Ice.Warn.Connections=1 -#Ice.Trace.Network=3 -#Ice.Trace.Protocol=1 -Library.Proxy=library:default -p 10000 Library.EvictorSize=3 + Freeze.Trace.Map=1 Freeze.Trace.Evictor=2 + +Ice.Warn.Connections=1 +#Ice.Trace.Network=3 +#Ice.Trace.Protocol=1 diff --git a/java/demo/Freeze/phonebook/Client.java b/java/demo/Freeze/phonebook/Client.java index cefcb8cf6ce..c4ec8377276 100644 --- a/java/demo/Freeze/phonebook/Client.java +++ b/java/demo/Freeze/phonebook/Client.java @@ -19,6 +19,6 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - app.main("demo.Freeze.phonebook.Client", args, "config"); + app.main("demo.Freeze.phonebook.Client", args, "config.client"); } } diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java index 0616eb18e94..91b3d558b55 100644 --- a/java/demo/Freeze/phonebook/Server.java +++ b/java/demo/Freeze/phonebook/Server.java @@ -90,6 +90,6 @@ public class Server main(String[] args) { PhoneBookServer app = new PhoneBookServer("db"); - app.main("demo.Freeze.phonebook.Server", args, "config"); + app.main("demo.Freeze.phonebook.Server", args, "config.server"); } } diff --git a/java/demo/Freeze/phonebook/config b/java/demo/Freeze/phonebook/config.client index dbb26ef2901..dbb26ef2901 100644 --- a/java/demo/Freeze/phonebook/config +++ b/java/demo/Freeze/phonebook/config.client diff --git a/java/demo/Freeze/phonebook/config.server b/java/demo/Freeze/phonebook/config.server new file mode 100644 index 00000000000..dbb26ef2901 --- /dev/null +++ b/java/demo/Freeze/phonebook/config.server @@ -0,0 +1,12 @@ +Ice.Warn.Connections=1 +#Ice.Trace.Network=3 +#Ice.Trace.Protocol=1 + +Freeze.Trace.Evictor=1 +Freeze.Trace.DbEnv=1 +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/java/demo/Glacier2/callback/Client.java b/java/demo/Glacier2/callback/Client.java index 95c261874d9..f46a389f370 100644 --- a/java/demo/Glacier2/callback/Client.java +++ b/java/demo/Glacier2/callback/Client.java @@ -233,7 +233,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Glacier2/callback/README b/java/demo/Glacier2/callback/README index d723af8c5b6..8d828c2f62c 100644 --- a/java/demo/Glacier2/callback/README +++ b/java/demo/Glacier2/callback/README @@ -19,10 +19,10 @@ In a separate window, start the client: $ java 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/java/demo/Glacier2/callback/config b/java/demo/Glacier2/callback/config.client index 05cd897bf4d..28971cabe2c 100644 --- a/java/demo/Glacier2/callback/config +++ b/java/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 @@ -58,11 +57,7 @@ Ice.Warn.Connections=1 # Ice.Plugin.IceSSL=IceSSL.PluginFactory Ice.ThreadPerConnection=1 -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.Keystore=client.jks -IceSSL.Client.Password=password -IceSSL.Client.Truststore=certs.jks -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.Keystore=server.jks -IceSSL.Server.Password=password -IceSSL.Server.Truststore=certs.jks +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=client.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks diff --git a/java/demo/Glacier2/callback/config.glacier2 b/java/demo/Glacier2/callback/config.glacier2 index 971f8f6400b..ac43eebd877 100644 --- a/java/demo/Glacier2/callback/config.glacier2 +++ b/java/demo/Glacier2/callback/config.glacier2 @@ -109,10 +109,10 @@ Glacier2.Trace.RoutingTable=1 #Ice.Trace.Network=1 #Ice.Trace.Protocol=1 Ice.Warn.Connections=1 -#IceSSL.Trace.Security=3 Ice.Plugin.IceSSL=IceSSL:create -IceSSL.Server.CertPath=../../../certs -IceSSL.Server.Config=sslconfig.xml -IceSSL.Client.CertPath=../../../certs -IceSSL.Client.Config=sslconfig.xml +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/java/demo/Ice/bidir/Client.java b/java/demo/Ice/bidir/Client.java index b987a72069a..b6a8d26006a 100755 --- a/java/demo/Ice/bidir/Client.java +++ b/java/demo/Ice/bidir/Client.java @@ -47,7 +47,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/bidir/Server.java b/java/demo/Ice/bidir/Server.java index 2aa8b047796..950433cd3df 100755 --- a/java/demo/Ice/bidir/Server.java +++ b/java/demo/Ice/bidir/Server.java @@ -45,7 +45,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/py/demo/Ice/bidir/config b/java/demo/Ice/bidir/config.client index 938b95cdbf0..dfb9cf68b8f 100644..100755 --- a/py/demo/Ice/bidir/config +++ b/java/demo/Ice/bidir/config.client @@ -1,11 +1,10 @@ -Callback.Client.CallbackServer=sender:tcp -p 10000 -Callback.Client.Endpoints= -Callback.Server.Endpoints=tcp -p 10000 - -#Ice.Trace.Network=1 -#Ice.Trace.Protocol=1 -Ice.Warn.Connections=1 - -# Active connection management must be disabled when using -# bidirectional connections. -Ice.ACM.Client=0 +Callback.Client.CallbackServer=sender:tcp -p 10000
+Callback.Client.Endpoints=
+
+#Ice.Trace.Network=1
+#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/java/demo/Ice/bidir/config.server b/java/demo/Ice/bidir/config.server new file mode 100755 index 00000000000..7051998caa3 --- /dev/null +++ b/java/demo/Ice/bidir/config.server @@ -0,0 +1,9 @@ +Callback.Server.Endpoints=tcp -p 10000
+
+#Ice.Trace.Network=1
+#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/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java index aa92b3f4be0..025c6f4a5db 100644 --- a/java/demo/Ice/callback/Client.java +++ b/java/demo/Ice/callback/Client.java @@ -179,7 +179,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/callback/Server.java b/java/demo/Ice/callback/Server.java index ecbc30f4bc1..b743dbbad84 100644 --- a/java/demo/Ice/callback/Server.java +++ b/java/demo/Ice/callback/Server.java @@ -25,7 +25,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/java/demo/Ice/callback/config b/java/demo/Ice/callback/config deleted file mode 100644 index 574b5270316..00000000000 --- a/java/demo/Ice/callback/config +++ /dev/null @@ -1,21 +0,0 @@ -Callback.Client.CallbackServer=callback:tcp -p 12000:udp -p 10000:ssl -p 10001 -Callback.Client.Endpoints=tcp:udp:ssl -Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001 - -#Ice.Trace.Network=3 -#Ice.Trace.Protocol=3 -Ice.Warn.Connections=1 - -# -# SSL Configuration -# -Ice.Plugin.IceSSL=IceSSL.PluginFactory -Ice.ThreadPerConnection=1 -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.Keystore=client.jks -IceSSL.Client.Password=password -IceSSL.Client.Truststore=certs.jks -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.Keystore=server.jks -IceSSL.Server.Password=password -IceSSL.Server.Truststore=certs.jks diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client new file mode 100644 index 00000000000..b7b9bb73099 --- /dev/null +++ b/java/demo/Ice/callback/config.client @@ -0,0 +1,16 @@ +Callback.Client.CallbackServer=callback:tcp -p 12000:udp -p 10000:ssl -p 10001 +Callback.Client.Endpoints=tcp:udp:ssl + +#Ice.Trace.Network=3 +#Ice.Trace.Protocol=3 +Ice.Warn.Connections=1 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL.PluginFactory +Ice.ThreadPerConnection=1 +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=client.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server new file mode 100644 index 00000000000..1bd2a0800c8 --- /dev/null +++ b/java/demo/Ice/callback/config.server @@ -0,0 +1,15 @@ +Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001 + +#Ice.Trace.Network=3 +#Ice.Trace.Protocol=3 +Ice.Warn.Connections=1 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL.PluginFactory +Ice.ThreadPerConnection=1 +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=server.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java index 46711a8dc6f..f6783f2827d 100644 --- a/java/demo/Ice/hello/Client.java +++ b/java/demo/Ice/hello/Client.java @@ -189,7 +189,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java index 2e7f8638173..8d6b80a5536 100644 --- a/java/demo/Ice/hello/Server.java +++ b/java/demo/Ice/hello/Server.java @@ -25,7 +25,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/java/demo/Ice/hello/config.client b/java/demo/Ice/hello/config.client new file mode 100644 index 00000000000..086d43db986 --- /dev/null +++ b/java/demo/Ice/hello/config.client @@ -0,0 +1,44 @@ +# +# 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=2 + +# +# 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 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL.PluginFactory +Ice.ThreadPerConnection=1 +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=client.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks +IceSSL.Trace.Security=0 diff --git a/java/demo/Ice/hello/config b/java/demo/Ice/hello/config.server index 75ad5c37481..f7a05a38dad 100644 --- a/java/demo/Ice/hello/config +++ b/java/demo/Ice/hello/config.server @@ -1,10 +1,4 @@ # -# 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 # "helloadapater". The following line sets the endpoints for this # adapter @@ -19,7 +13,6 @@ Ice.Warn.Connections=2 # # We want a faster ACM for this demo. # -Ice.ACM.Client=10 Ice.ACM.Server=10 # @@ -41,24 +34,12 @@ Ice.Trace.Network=0 Ice.Trace.Protocol=0 # -# Security Tracing -# -# 0 = no security tracing -# 1 = trace warning messages -# 2 = config file parsing warnings -# -IceSSL.Trace.Security=0 - -# # SSL Configuration # Ice.Plugin.IceSSL=IceSSL.PluginFactory Ice.ThreadPerConnection=1 -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.Keystore=client.jks -IceSSL.Client.Password=password -IceSSL.Client.Truststore=certs.jks -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.Keystore=server.jks -IceSSL.Server.Password=password -IceSSL.Server.Truststore=certs.jks +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=server.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks +IceSSL.Trace.Security=0 diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java index efe1d069bef..e9546117961 100644 --- a/java/demo/Ice/invoke/Client.java +++ b/java/demo/Ice/invoke/Client.java @@ -295,7 +295,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/invoke/Server.java b/java/demo/Ice/invoke/Server.java index 3881488d374..966f6aad221 100644 --- a/java/demo/Ice/invoke/Server.java +++ b/java/demo/Ice/invoke/Server.java @@ -25,7 +25,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/java/demo/Ice/invoke/config.client b/java/demo/Ice/invoke/config.client new file mode 100644 index 00000000000..6c5e40ed1c9 --- /dev/null +++ b/java/demo/Ice/invoke/config.client @@ -0,0 +1,39 @@ +# +# The client reads this property to create the reference to the +# "hello" object in the server. +# +Printer.Proxy=printer:default -p 10000 + +# +# 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=0 + +# +# Protocol Tracing +# +# 0 = no protocol tracing +# 1 = trace protocol messages +# +Ice.Trace.Protocol=0 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL.PluginFactory +Ice.ThreadPerConnection=1 +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=client.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks +#Ice.Trace.Security=1 diff --git a/java/demo/Ice/invoke/config b/java/demo/Ice/invoke/config.server index 8c2420ca9ce..81f46512178 100644 --- a/java/demo/Ice/invoke/config +++ b/java/demo/Ice/invoke/config.server @@ -1,10 +1,4 @@ # -# The client reads this property to create the reference to the -# "hello" object in the server. -# -Printer.Proxy=printer:default -p 10000 - -# # The server creates one single object adapter with the name # "helloadapater". The following line sets the endpoints for this # adapter @@ -35,24 +29,12 @@ Ice.Trace.Network=0 Ice.Trace.Protocol=0 # -# Security Tracing -# -# 0 = no security tracing -# 1 = trace warning messages -# 2 = config file parsing warnings -# -#Ice.Trace.Security=2 - -# # SSL Configuration # Ice.Plugin.IceSSL=IceSSL.PluginFactory Ice.ThreadPerConnection=1 -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.Keystore=client.jks -IceSSL.Client.Password=password -IceSSL.Client.Truststore=certs.jks -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.Keystore=server.jks -IceSSL.Server.Password=password -IceSSL.Server.Truststore=certs.jks +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=server.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks +#Ice.Trace.Security=1 diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java index 58b0e890c99..199ad3d7024 100644 --- a/java/demo/Ice/latency/Client.java +++ b/java/demo/Ice/latency/Client.java @@ -55,7 +55,7 @@ class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java index 577c1e49b1d..ebfa99d0797 100644 --- a/java/demo/Ice/latency/Server.java +++ b/java/demo/Ice/latency/Server.java @@ -25,7 +25,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/java/demo/Ice/latency/config b/java/demo/Ice/latency/config.client index 89b07653828..93aa4cde3d5 100644 --- a/java/demo/Ice/latency/config +++ b/java/demo/Ice/latency/config.client @@ -1,5 +1,3 @@ Latency.Ping=ping:default -p 10000 -Latency.Endpoints=default -p 10000 Ice.ACM.Client=0 -Ice.ACM.Server=0 diff --git a/java/demo/Ice/latency/config.server b/java/demo/Ice/latency/config.server new file mode 100644 index 00000000000..bed0b10202b --- /dev/null +++ b/java/demo/Ice/latency/config.server @@ -0,0 +1 @@ +Latency.Endpoints=default -p 10000 diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java index 936043ed621..c3215782ffd 100644 --- a/java/demo/Ice/nested/Client.java +++ b/java/demo/Ice/nested/Client.java @@ -82,7 +82,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/nested/Server.java b/java/demo/Ice/nested/Server.java index 4bd78b33426..91cae195227 100644 --- a/java/demo/Ice/nested/Server.java +++ b/java/demo/Ice/nested/Server.java @@ -26,7 +26,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/java/demo/Ice/nested/config b/java/demo/Ice/nested/config.client index 7f73744dc7b..2afc90a0d0e 100644 --- a/java/demo/Ice/nested/config +++ b/java/demo/Ice/nested/config.client @@ -1,5 +1,3 @@ -Nested.Server.Endpoints=default -p 10000 -t 10000 - Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000 Nested.Client.Endpoints=default -t 10000 diff --git a/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server new file mode 100644 index 00000000000..fd59ae88a78 --- /dev/null +++ b/java/demo/Ice/nested/config.server @@ -0,0 +1,8 @@ +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 diff --git a/java/demo/Ice/session/Client.java b/java/demo/Ice/session/Client.java index 379a7d941cb..db9c3071fae 100644 --- a/java/demo/Ice/session/Client.java +++ b/java/demo/Ice/session/Client.java @@ -241,7 +241,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/session/Server.java b/java/demo/Ice/session/Server.java index b6fd4ba1485..58877b9fe9e 100644 --- a/java/demo/Ice/session/Server.java +++ b/java/demo/Ice/session/Server.java @@ -38,7 +38,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/java/demo/Ice/session/config.client b/java/demo/Ice/session/config.client new file mode 100644 index 00000000000..3a0133d0a30 --- /dev/null +++ b/java/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/py/demo/Ice/session/config b/java/demo/Ice/session/config.server index ec0a2e522ce..8aa8dfac36f 100644 --- a/py/demo/Ice/session/config +++ b/java/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/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java index 488a704753f..433fe380876 100644 --- a/java/demo/Ice/throughput/Client.java +++ b/java/demo/Ice/throughput/Client.java @@ -409,7 +409,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java index f09c69b0b6e..8caf6b71d53 100644 --- a/java/demo/Ice/throughput/Server.java +++ b/java/demo/Ice/throughput/Server.java @@ -25,7 +25,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/java/demo/Ice/throughput/config b/java/demo/Ice/throughput/config.client index 1de2062b6d2..1de2062b6d2 100644 --- a/java/demo/Ice/throughput/config +++ b/java/demo/Ice/throughput/config.client diff --git a/java/demo/Ice/throughput/config.server b/java/demo/Ice/throughput/config.server new file mode 100644 index 00000000000..1de2062b6d2 --- /dev/null +++ b/java/demo/Ice/throughput/config.server @@ -0,0 +1,5 @@ +Throughput.Throughput=throughput:default -p 10000 +Throughput.Endpoints=default -p 10000 + +Ice.ACM.Client=0 +Ice.ACM.Server=0 diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java index 76ad095fc9f..b2809d6ed3d 100644 --- a/java/demo/Ice/value/Client.java +++ b/java/demo/Ice/value/Client.java @@ -169,6 +169,8 @@ public class Client extends Ice.Application System.out.println(); System.out.println("That's it for this demo. Have fun with Ice!"); + initial.shutdown(); + return 0; } @@ -176,7 +178,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/Ice/value/InitialI.java b/java/demo/Ice/value/InitialI.java index 9b46bf94c0e..536c406c68b 100644 --- a/java/demo/Ice/value/InitialI.java +++ b/java/demo/Ice/value/InitialI.java @@ -51,6 +51,12 @@ class InitialI extends Initial throw ex; } + public void + shutdown(Ice.Current current) + { + current.adapter.getCommunicator().shutdown(); + } + private Simple _simple = new Simple(); private Printer _printer = new PrinterI(); private PrinterPrx _printerProxy; diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java index 496a358b936..2e725928e9d 100644 --- a/java/demo/Ice/value/Server.java +++ b/java/demo/Ice/value/Server.java @@ -24,7 +24,7 @@ public class Server extends Ice.Application main(String[] args) { Server app = new Server(); - int status = app.main("Server", args, "config"); + int status = app.main("Server", args, "config.server"); System.exit(status); } } diff --git a/java/demo/Ice/value/Value.ice b/java/demo/Ice/value/Value.ice index 63cf4649448..b5f340dbe05 100644 --- a/java/demo/Ice/value/Value.ice +++ b/java/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/java/demo/Ice/value/config b/java/demo/Ice/value/config deleted file mode 100644 index 24ba3ee9a23..00000000000 --- a/java/demo/Ice/value/config +++ /dev/null @@ -1,16 +0,0 @@ -Value.Initial=initial:default -p 10000 -Value.Endpoints=default -p 10000 - -# -# SSL Configuration -# -Ice.Plugin.IceSSL=IceSSL.PluginFactory -Ice.ThreadPerConnection=1 -IceSSL.Client.DefaultDir=../../../certs -IceSSL.Client.Keystore=client.jks -IceSSL.Client.Password=password -IceSSL.Client.Truststore=certs.jks -IceSSL.Server.DefaultDir=../../../certs -IceSSL.Server.Keystore=server.jks -IceSSL.Server.Password=password -IceSSL.Server.Truststore=certs.jks diff --git a/java/demo/Ice/value/config.client b/java/demo/Ice/value/config.client new file mode 100644 index 00000000000..8d758f537c1 --- /dev/null +++ b/java/demo/Ice/value/config.client @@ -0,0 +1,11 @@ +Value.Initial=initial:default -p 10000 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL.PluginFactory +Ice.ThreadPerConnection=1 +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=client.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks diff --git a/java/demo/Ice/value/config.server b/java/demo/Ice/value/config.server new file mode 100644 index 00000000000..4d7f600e5d7 --- /dev/null +++ b/java/demo/Ice/value/config.server @@ -0,0 +1,11 @@ +Value.Endpoints=default -p 10000 + +# +# SSL Configuration +# +Ice.Plugin.IceSSL=IceSSL.PluginFactory +Ice.ThreadPerConnection=1 +IceSSL.DefaultDir=../../../certs +IceSSL.Keystore=server.jks +IceSSL.Password=password +IceSSL.Truststore=certs.jks diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java index b98b8400190..c793b966758 100644 --- a/java/demo/IceBox/hello/Client.java +++ b/java/demo/IceBox/hello/Client.java @@ -149,7 +149,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/IceBox/hello/README b/java/demo/IceBox/hello/README index 964656eaf07..7691dd3a52e 100644 --- a/java/demo/IceBox/hello/README +++ b/java/demo/IceBox/hello/README @@ -1,8 +1,12 @@ To run this demo, open two terminal windows. In the first window, start the IceBox server: -$ java IceBox.Server --Ice.Config=config +$ java IceBox.Server --Ice.Config=config.icebox In the second window, run the client: $ java Client + +To shut down IceBox, use IceBox.Admin: + +$ java IceBox.Admin --Ice.Config=config.icebox shutdown diff --git a/java/demo/IceBox/hello/config.client b/java/demo/IceBox/hello/config.client new file mode 100644 index 00000000000..161f0cecb7b --- /dev/null +++ b/java/demo/IceBox/hello/config.client @@ -0,0 +1,28 @@ +# +# 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 + +# +# 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 diff --git a/java/demo/IceBox/hello/config b/java/demo/IceBox/hello/config.icebox index 8695ae7f761..07adfa38ce4 100644 --- a/java/demo/IceBox/hello/config +++ b/java/demo/IceBox/hello/config.icebox @@ -11,12 +11,6 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 IceBox.Service.Hello=HelloServiceI # -# 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 - -# # The server creates one single object adapter with the name of # the service. The following line sets the endpoints for this # adapter. diff --git a/java/demo/IceGrid/simple/Client.java b/java/demo/IceGrid/simple/Client.java index 6c955550d46..094a41027c6 100644 --- a/java/demo/IceGrid/simple/Client.java +++ b/java/demo/IceGrid/simple/Client.java @@ -103,7 +103,7 @@ public class Client extends Ice.Application main(String[] args) { Client app = new Client(); - int status = app.main("Client", args, "config"); + int status = app.main("Client", args, "config.client"); System.exit(status); } } diff --git a/java/demo/IceGrid/simple/README b/java/demo/IceGrid/simple/README index 2bfa58b0428..6e3bd046e93 100644 --- a/java/demo/IceGrid/simple/README +++ b/java/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'" $ java 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/java/demo/IceGrid/simple/config.client b/java/demo/IceGrid/simple/config.client new file mode 100644 index 00000000000..78100695847 --- /dev/null +++ b/java/demo/IceGrid/simple/config.client @@ -0,0 +1,4 @@ +# +# The IceGrid locator proxy. +# +Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 diff --git a/java/demo/IceGrid/simple/config b/java/demo/IceGrid/simple/config.grid index 5f12392aa12..5f12392aa12 100644 --- a/java/demo/IceGrid/simple/config +++ b/java/demo/IceGrid/simple/config.grid diff --git a/java/demo/IceStorm/clock/Publisher.java b/java/demo/IceStorm/clock/Publisher.java index 4ae1d0a7024..f1917cc93b2 100644 --- a/java/demo/IceStorm/clock/Publisher.java +++ b/java/demo/IceStorm/clock/Publisher.java @@ -71,7 +71,7 @@ public class Publisher extends Ice.Application main(String[] args) { Publisher app = new Publisher(); - int status = app.main("Publisher", args, "config"); + int status = app.main("Publisher", args, "config.pub"); System.exit(status); } } diff --git a/java/demo/IceStorm/clock/README b/java/demo/IceStorm/clock/README index 1c7a0ac932c..0f9aeb93cf7 100644 --- a/java/demo/IceStorm/clock/README +++ b/java/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" $ java Subscriber In another window: diff --git a/java/demo/IceStorm/clock/Subscriber.java b/java/demo/IceStorm/clock/Subscriber.java index fca4a0edcd2..4c451ee2ed6 100644 --- a/java/demo/IceStorm/clock/Subscriber.java +++ b/java/demo/IceStorm/clock/Subscriber.java @@ -138,7 +138,7 @@ public class Subscriber extends Ice.Application main(String[] args) { Subscriber app = new Subscriber(); - int status = app.main("Subscriber", args, "config"); + int status = app.main("Subscriber", args, "config.sub"); System.exit(status); } } diff --git a/py/demo/IceStorm/clock/config_service b/java/demo/IceStorm/clock/config.icebox index 18102a0f209..84ef44ac236 100644 --- a/py/demo/IceStorm/clock/config_service +++ b/java/demo/IceStorm/clock/config.icebox @@ -6,18 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,30: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/java/demo/IceStorm/clock/config.pub b/java/demo/IceStorm/clock/config.pub new file mode 100644 index 00000000000..e736a5faa1a --- /dev/null +++ b/java/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/py/demo/IceStorm/clock/config b/java/demo/IceStorm/clock/config.service index 032a8cbc106..7cf906d19f1 100644 --- a/py/demo/IceStorm/clock/config +++ b/java/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/java/demo/IceStorm/clock/config.sub b/java/demo/IceStorm/clock/config.sub new file mode 100644 index 00000000000..194f4f544e3 --- /dev/null +++ b/java/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 diff --git a/py/demo/Glacier2/callback/Client.py b/py/demo/Glacier2/callback/Client.py index 6da312ea049..761562ca6fa 100644 --- a/py/demo/Glacier2/callback/Client.py +++ b/py/demo/Glacier2/callback/Client.py @@ -121,11 +121,11 @@ class Client(Ice.Application): fake = not fake if fake: - twowayR = Demo.CallbackReceiverPrx.uncheckedCast(twowayR.ice_newIdentity(callbackReceiverFakeIdent)) - onewayR = Demo.CallbackReceiverPrx.uncheckedCast(onewayR.ice_newIdentity(callbackReceiverFakeIdent)) + twowayR = Demo.CallbackReceiverPrx.uncheckedCast(twowayR.ice_identity(callbackReceiverFakeIdent)) + onewayR = Demo.CallbackReceiverPrx.uncheckedCast(onewayR.ice_identity(callbackReceiverFakeIdent)) else: - twowayR = Demo.CallbackReceiverPrx.uncheckedCast(twowayR.ice_newIdentity(callbackReceiverIdent)) - onewayR = Demo.CallbackReceiverPrx.uncheckedCast(twowayR.ice_newIdentity(callbackReceiverIdent)) + twowayR = Demo.CallbackReceiverPrx.uncheckedCast(twowayR.ice_identity(callbackReceiverIdent)) + onewayR = Demo.CallbackReceiverPrx.uncheckedCast(twowayR.ice_identity(callbackReceiverIdent)) elif c == 's': twoway.shutdown() elif c == 'x': @@ -141,4 +141,4 @@ class Client(Ice.Application): return 0 app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/Glacier2/callback/README b/py/demo/Glacier2/callback/README index 8669b396edf..a7370bfcdbf 100644 --- a/py/demo/Glacier2/callback/README +++ b/py/demo/Glacier2/callback/README @@ -17,10 +17,10 @@ In a separate window, start the client: $ python Client.py -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/py/demo/Glacier2/callback/config.client index 0d3de8fcb32..e26e8735239 100644 --- a/cpp/demo/Glacier2/callback/config +++ b/py/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/py/demo/Glacier2/callback/config.glacier2 b/py/demo/Glacier2/callback/config.glacier2 index b9cbacd143e..d6c3b190911 100644 --- a/py/demo/Glacier2/callback/config.glacier2 +++ b/py/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/py/demo/Ice/bidir/Client.py b/py/demo/Ice/bidir/Client.py index 4efd9576b59..44ceb79646d 100644 --- a/py/demo/Ice/bidir/Client.py +++ b/py/demo/Ice/bidir/Client.py @@ -53,4 +53,4 @@ class Client(Ice.Application): return 0 app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/Ice/bidir/Server.py b/py/demo/Ice/bidir/Server.py index 99585adcc9b..ac820bb13e7 100644 --- a/py/demo/Ice/bidir/Server.py +++ b/py/demo/Ice/bidir/Server.py @@ -90,4 +90,4 @@ class Server(Ice.Application): return 0 app = Server() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.server")) diff --git a/java/demo/Ice/bidir/config b/py/demo/Ice/bidir/config.client index 143b3a0fed3..4b96fa8606c 100755..100644 --- a/java/demo/Ice/bidir/config +++ b/py/demo/Ice/bidir/config.client @@ -1,11 +1,10 @@ -Callback.Client.CallbackServer=sender:tcp -p 10000
-Callback.Client.Endpoints=
-Callback.Server.Endpoints=tcp -p 10000
-
-#Ice.Trace.Network=1
-#Ice.Trace.Protocol=1
-Ice.Warn.Connections=1
-
-# Active connection management must be disabled when using
-# bidirectional connections.
-Ice.ACM.Client=0
+Callback.Client.CallbackServer=sender:tcp -p 10000 +Callback.Client.Endpoints= + +#Ice.Trace.Network=1 +#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/py/demo/Ice/bidir/config.server b/py/demo/Ice/bidir/config.server new file mode 100644 index 00000000000..ccd562de054 --- /dev/null +++ b/py/demo/Ice/bidir/config.server @@ -0,0 +1,5 @@ +Callback.Server.Endpoints=tcp -p 10000 + +#Ice.Trace.Network=1 +#Ice.Trace.Protocol=1 +Ice.Warn.Connections=1 diff --git a/py/demo/Ice/callback/Client.py b/py/demo/Ice/callback/Client.py index f5740fb45ec..33b01c5cda6 100644 --- a/py/demo/Ice/callback/Client.py +++ b/py/demo/Ice/callback/Client.py @@ -120,4 +120,4 @@ class Client(Ice.Application): return 0 app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/Ice/callback/Server.py b/py/demo/Ice/callback/Server.py index 17f4587a47b..25eda0f2940 100644 --- a/py/demo/Ice/callback/Server.py +++ b/py/demo/Ice/callback/Server.py @@ -37,4 +37,4 @@ class Server(Ice.Application): return 0 app = Server() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.server")) diff --git a/py/demo/Ice/callback/config b/py/demo/Ice/callback/config deleted file mode 100644 index c535aec1327..00000000000 --- a/py/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/py/demo/Ice/callback/config.client b/py/demo/Ice/callback/config.client new file mode 100644 index 00000000000..7654ed43089 --- /dev/null +++ b/py/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/py/demo/Ice/callback/config.server b/py/demo/Ice/callback/config.server new file mode 100644 index 00000000000..8209159f7a7 --- /dev/null +++ b/py/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/py/demo/Ice/hello/Client.py b/py/demo/Ice/hello/Client.py index bf2ca40dd7d..59403755547 100644 --- a/py/demo/Ice/hello/Client.py +++ b/py/demo/Ice/hello/Client.py @@ -119,4 +119,4 @@ class Client(Ice.Application): return True app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/Ice/hello/Server.py b/py/demo/Ice/hello/Server.py index f64b48709a1..0aa60636223 100644 --- a/py/demo/Ice/hello/Server.py +++ b/py/demo/Ice/hello/Server.py @@ -29,4 +29,4 @@ class Server(Ice.Application): return True app = Server() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.server")) diff --git a/py/demo/Ice/hello/config.client b/py/demo/Ice/hello/config.client new file mode 100644 index 00000000000..a8e3bc3521d --- /dev/null +++ b/py/demo/Ice/hello/config.client @@ -0,0 +1,43 @@ +# +# 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 + +# +# 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=0 diff --git a/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server new file mode 100644 index 00000000000..01a5af860b5 --- /dev/null +++ b/py/demo/Ice/hello/config.server @@ -0,0 +1,44 @@ +# +# 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 + +# +# 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 +IceSSL.Trace.Security=0 diff --git a/py/demo/Ice/latency/Client.py b/py/demo/Ice/latency/Client.py index c1a8d67c0e4..bcd4e331a8e 100644 --- a/py/demo/Ice/latency/Client.py +++ b/py/demo/Ice/latency/Client.py @@ -48,4 +48,4 @@ class Client(Ice.Application): return True app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/Ice/latency/Server.py b/py/demo/Ice/latency/Server.py index 164257371f8..911f0d55813 100644 --- a/py/demo/Ice/latency/Server.py +++ b/py/demo/Ice/latency/Server.py @@ -22,4 +22,4 @@ class Server(Ice.Application): return True app = Server() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.server")) diff --git a/py/demo/Ice/latency/config b/py/demo/Ice/latency/config deleted file mode 100644 index bd5eff03ae6..00000000000 --- a/py/demo/Ice/latency/config +++ /dev/null @@ -1,16 +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.MonitorConnections=0 -Ice.ACM.Client=0 -Ice.ACM.Server=0 diff --git a/py/demo/Ice/latency/config.client b/py/demo/Ice/latency/config.client new file mode 100644 index 00000000000..638276f6968 --- /dev/null +++ b/py/demo/Ice/latency/config.client @@ -0,0 +1,10 @@ +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.MonitorConnections=0 +Ice.ACM.Client=0 diff --git a/py/demo/Ice/latency/config.server b/py/demo/Ice/latency/config.server new file mode 100644 index 00000000000..1e341985bcc --- /dev/null +++ b/py/demo/Ice/latency/config.server @@ -0,0 +1,9 @@ +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 + +Ice.MonitorConnections=0 diff --git a/py/demo/Ice/session/Client.py b/py/demo/Ice/session/Client.py index 238ad8e7d64..85518a55e2b 100644 --- a/py/demo/Ice/session/Client.py +++ b/py/demo/Ice/session/Client.py @@ -144,4 +144,4 @@ t: exit without destroying the session app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/Ice/session/Server.py b/py/demo/Ice/session/Server.py index 09c9aadfd69..873f3e5bbf5 100644 --- a/py/demo/Ice/session/Server.py +++ b/py/demo/Ice/session/Server.py @@ -185,4 +185,4 @@ class Server(Ice.Application): return True app = Server() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.server")) diff --git a/py/demo/Ice/session/config.client b/py/demo/Ice/session/config.client new file mode 100644 index 00000000000..3a0133d0a30 --- /dev/null +++ b/py/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/py/demo/Ice/session/config.server index ec0a2e522ce..8aa8dfac36f 100644 --- a/cpp/demo/Ice/session/config +++ b/py/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/py/demo/Ice/throughput/Client.py b/py/demo/Ice/throughput/Client.py index fadd948138f..00a5b11f8a7 100644 --- a/py/demo/Ice/throughput/Client.py +++ b/py/demo/Ice/throughput/Client.py @@ -198,4 +198,4 @@ class Client(Ice.Application): return True app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/Ice/throughput/Server.py b/py/demo/Ice/throughput/Server.py index e7c39f33bad..97f76c7e594 100644 --- a/py/demo/Ice/throughput/Server.py +++ b/py/demo/Ice/throughput/Server.py @@ -86,4 +86,4 @@ class Server(Ice.Application): return True app = Server() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.server")) diff --git a/py/demo/Ice/throughput/config b/py/demo/Ice/throughput/config deleted file mode 100644 index cb032b77e6b..00000000000 --- a/py/demo/Ice/throughput/config +++ /dev/null @@ -1,16 +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.MonitorConnections=0 -Ice.ACM.Client=0 -Ice.ACM.Server=0 diff --git a/py/demo/Ice/throughput/config.client b/py/demo/Ice/throughput/config.client new file mode 100644 index 00000000000..3c831f58dda --- /dev/null +++ b/py/demo/Ice/throughput/config.client @@ -0,0 +1,10 @@ +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.MonitorConnections=0 +Ice.ACM.Client=0 diff --git a/py/demo/Ice/throughput/config.server b/py/demo/Ice/throughput/config.server new file mode 100644 index 00000000000..03efdc4b85c --- /dev/null +++ b/py/demo/Ice/throughput/config.server @@ -0,0 +1,9 @@ +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 + +Ice.MonitorConnections=0 diff --git a/py/demo/Ice/value/Client.py b/py/demo/Ice/value/Client.py index bcf86be4c40..e9ee738dfa8 100644 --- a/py/demo/Ice/value/Client.py +++ b/py/demo/Ice/value/Client.py @@ -153,7 +153,9 @@ class Client(Ice.Application): print '\n'\ "That's it for this demo. Have fun with Ice!" + initial.shutdown() + return True app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/Ice/value/Server.py b/py/demo/Ice/value/Server.py index 02874754618..f71cf8e1a58 100644 --- a/py/demo/Ice/value/Server.py +++ b/py/demo/Ice/value/Server.py @@ -41,6 +41,9 @@ class InitialI(Demo.Initial): ex.derived = self._derivedPrinter raise ex + def shutdown(self, current=None): + current.adapter.getCommunicator().shutdown() + class Server(Ice.Application): def run(self, argv): adapter = self.communicator().createObjectAdapter("Value") @@ -50,4 +53,4 @@ class Server(Ice.Application): return True app = Server() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.server")) diff --git a/py/demo/Ice/value/Value.ice b/py/demo/Ice/value/Value.ice index 63cf4649448..b5f340dbe05 100644 --- a/py/demo/Ice/value/Value.ice +++ b/py/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/py/demo/Ice/value/config b/py/demo/Ice/value/config deleted file mode 100644 index 4d10c058c86..00000000000 --- a/py/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/py/demo/Ice/value/config.client b/py/demo/Ice/value/config.client new file mode 100644 index 00000000000..ed6a9e4283c --- /dev/null +++ b/py/demo/Ice/value/config.client @@ -0,0 +1,7 @@ +Value.Initial=initial: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 diff --git a/py/demo/Ice/value/config.server b/py/demo/Ice/value/config.server new file mode 100644 index 00000000000..4859e783c84 --- /dev/null +++ b/py/demo/Ice/value/config.server @@ -0,0 +1,7 @@ +Value.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/py/demo/IceGrid/simple/Client.py b/py/demo/IceGrid/simple/Client.py index e544206ead9..2f1544bc94b 100644 --- a/py/demo/IceGrid/simple/Client.py +++ b/py/demo/IceGrid/simple/Client.py @@ -60,4 +60,4 @@ class Client(Ice.Application): return True app = Client() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.client")) diff --git a/py/demo/IceGrid/simple/README b/py/demo/IceGrid/simple/README index 9de3cbfbd86..97a38690db8 100644 --- a/py/demo/IceGrid/simple/README +++ b/py/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'" $ python Client.py 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/py/demo/IceGrid/simple/config.client b/py/demo/IceGrid/simple/config.client new file mode 100644 index 00000000000..78100695847 --- /dev/null +++ b/py/demo/IceGrid/simple/config.client @@ -0,0 +1,4 @@ +# +# The IceGrid locator proxy. +# +Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 diff --git a/py/demo/IceGrid/simple/config b/py/demo/IceGrid/simple/config.grid index 5f12392aa12..5f12392aa12 100644 --- a/py/demo/IceGrid/simple/config +++ b/py/demo/IceGrid/simple/config.grid diff --git a/py/demo/IceStorm/clock/Publisher.py b/py/demo/IceStorm/clock/Publisher.py index 5a2a36efd19..e32ff9567ca 100644 --- a/py/demo/IceStorm/clock/Publisher.py +++ b/py/demo/IceStorm/clock/Publisher.py @@ -55,4 +55,4 @@ class Publisher(Ice.Application): return True app = Publisher() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.pub")) diff --git a/py/demo/IceStorm/clock/README b/py/demo/IceStorm/clock/README index c4e9f435a83..ad9c5eb1c16 100644 --- a/py/demo/IceStorm/clock/README +++ b/py/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" $ python Subscriber.py In another window: diff --git a/py/demo/IceStorm/clock/Subscriber.py b/py/demo/IceStorm/clock/Subscriber.py index e46cf6f36fa..3060e4a00ee 100644 --- a/py/demo/IceStorm/clock/Subscriber.py +++ b/py/demo/IceStorm/clock/Subscriber.py @@ -94,4 +94,4 @@ class Subscriber(Ice.Application): return True app = Subscriber() -sys.exit(app.main(sys.argv, "config")) +sys.exit(app.main(sys.argv, "config.sub")) diff --git a/java/demo/IceStorm/clock/config_service b/py/demo/IceStorm/clock/config.icebox index 18102a0f209..84ef44ac236 100644 --- a/java/demo/IceStorm/clock/config_service +++ b/py/demo/IceStorm/clock/config.icebox @@ -6,18 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,30: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/py/demo/IceStorm/clock/config.pub b/py/demo/IceStorm/clock/config.pub new file mode 100644 index 00000000000..e736a5faa1a --- /dev/null +++ b/py/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/java/demo/IceStorm/clock/config b/py/demo/IceStorm/clock/config.service index 032a8cbc106..7cf906d19f1 100644 --- a/java/demo/IceStorm/clock/config +++ b/py/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/py/demo/IceStorm/clock/config.sub b/py/demo/IceStorm/clock/config.sub new file mode 100644 index 00000000000..194f4f544e3 --- /dev/null +++ b/py/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 |