diff options
-rw-r--r-- | cs/config/TestUtil.py | 2 | ||||
-rw-r--r-- | cs/demo/Glacier2/callback/config.glacier2 | 2 | ||||
-rw-r--r-- | cs/demo/IceStorm/clock/config.icebox | 2 | ||||
-rw-r--r-- | java/config/TestUtil.py | 2 | ||||
-rw-r--r-- | java/demo/Glacier2/callback/config.glacier2 | 2 | ||||
-rw-r--r-- | java/demo/IceStorm/clock/config.icebox | 2 | ||||
-rw-r--r-- | php/config/TestUtil.py | 2 | ||||
-rw-r--r-- | py/config/TestUtil.py | 2 | ||||
-rw-r--r-- | py/demo/Glacier2/callback/config.client | 2 | ||||
-rw-r--r-- | py/demo/Glacier2/callback/config.glacier2 | 2 | ||||
-rw-r--r-- | py/demo/Ice/callback/config.client | 2 | ||||
-rw-r--r-- | py/demo/Ice/callback/config.server | 2 | ||||
-rw-r--r-- | py/demo/Ice/hello/config.client | 2 | ||||
-rw-r--r-- | py/demo/Ice/hello/config.server | 2 | ||||
-rw-r--r-- | py/demo/Ice/latency/config.client | 2 | ||||
-rw-r--r-- | py/demo/Ice/latency/config.server | 2 | ||||
-rw-r--r-- | py/demo/Ice/throughput/config.client | 2 | ||||
-rw-r--r-- | py/demo/Ice/throughput/config.server | 2 | ||||
-rw-r--r-- | py/demo/IceStorm/clock/config.icebox | 2 | ||||
-rw-r--r-- | vb/demo/Glacier2/callback/config.glacier2 | 2 | ||||
-rw-r--r-- | vb/demo/IceStorm/clock/config.icebox | 2 |
21 files changed, 21 insertions, 21 deletions
diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py index 1ffb3dd3d41..b1fe3bd7419 100644 --- a/cs/config/TestUtil.py +++ b/cs/config/TestUtil.py @@ -301,7 +301,7 @@ if protocol == "ssl": " --IceSSL.CertFile=" + os.path.join(toplevel, "certs", "c_rsa1024.pfx") + \ " --IceSSL.Password=password" + \ " --IceSSL.CheckCertName=0" - cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:create" + cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:createIceSSL" cppClientProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \ " --IceSSL.DefaultDir=" + os.path.join(toplevel, "certs") + \ " --IceSSL.CertAuthFile=cacert.pem" + \ diff --git a/cs/demo/Glacier2/callback/config.glacier2 b/cs/demo/Glacier2/callback/config.glacier2 index 5480a75d962..0869aea9830 100644 --- a/cs/demo/Glacier2/callback/config.glacier2 +++ b/cs/demo/Glacier2/callback/config.glacier2 @@ -136,7 +136,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceStorm IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem diff --git a/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox index 84ef44ac236..bcb0693e469 100644 --- a/cs/demo/IceStorm/clock/config.icebox +++ b/cs/demo/IceStorm/clock/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,31:create --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,31:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index dc2e320123b..20da9c30c9f 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -321,7 +321,7 @@ if protocol == "ssl": " --IceSSL.Truststore=certs.jks" + \ " --IceSSL.Password=password" clientServerProtocol = clientProtocol - cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:create" + cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:createIceSSL" cppClientProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \ " --IceSSL.DefaultDir=" + os.path.join(toplevel, "certs") + \ " --IceSSL.CertFile=c_rsa1024_pub.pem" + \ diff --git a/java/demo/Glacier2/callback/config.glacier2 b/java/demo/Glacier2/callback/config.glacier2 index 7758dcb2a4e..be7d46ea2d4 100644 --- a/java/demo/Glacier2/callback/config.glacier2 +++ b/java/demo/Glacier2/callback/config.glacier2 @@ -136,7 +136,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem diff --git a/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox index 84ef44ac236..bcb0693e469 100644 --- a/java/demo/IceStorm/clock/config.icebox +++ b/java/demo/IceStorm/clock/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,31:create --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,31:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/php/config/TestUtil.py b/php/config/TestUtil.py index c9481846908..79b757c9f93 100644 --- a/php/config/TestUtil.py +++ b/php/config/TestUtil.py @@ -172,7 +172,7 @@ else: os.environ["LD_LIBRARY_PATH_64"] = os.path.join(ice_home, "lib") + ":" + os.getenv("LD_LIBRARY_PATH_64", "") if protocol == "ssl": - plugin = " --Ice.Plugin.IceSSL=IceSSL:create" + plugin = " --Ice.Plugin.IceSSL=IceSSL:createIceSSL" clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ " --IceSSL.DefaultDir=" + os.path.join(ice_home, "certs") + \ " --IceSSL.CertFile=c_rsa1024_pub.pem" + \ diff --git a/py/config/TestUtil.py b/py/config/TestUtil.py index 518d82c9d0a..361a2e3ed68 100644 --- a/py/config/TestUtil.py +++ b/py/config/TestUtil.py @@ -316,7 +316,7 @@ else: if protocol == "ssl": certs = os.path.abspath(os.path.join(toplevel, "certs")) - plugin = " --Ice.Plugin.IceSSL=IceSSL:create" + plugin = " --Ice.Plugin.IceSSL=IceSSL:createIceSSL" clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ " --IceSSL.DefaultDir=" + certs + \ " --IceSSL.CertFile=c_rsa1024_pub.pem" + \ diff --git a/py/demo/Glacier2/callback/config.client b/py/demo/Glacier2/callback/config.client index e4bb1a964e5..b5b1b6d19a0 100644 --- a/py/demo/Glacier2/callback/config.client +++ b/py/demo/Glacier2/callback/config.client @@ -78,7 +78,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=c_rsa1024_pub.pem diff --git a/py/demo/Glacier2/callback/config.glacier2 b/py/demo/Glacier2/callback/config.glacier2 index e69a4a25fa6..cde23b9a94e 100644 --- a/py/demo/Glacier2/callback/config.glacier2 +++ b/py/demo/Glacier2/callback/config.glacier2 @@ -139,7 +139,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem diff --git a/py/demo/Ice/callback/config.client b/py/demo/Ice/callback/config.client index 13d561bde1c..a4b00fb2984 100644 --- a/py/demo/Ice/callback/config.client +++ b/py/demo/Ice/callback/config.client @@ -35,7 +35,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=c_rsa1024_pub.pem diff --git a/py/demo/Ice/callback/config.server b/py/demo/Ice/callback/config.server index ff294d5cd26..deaef3f87de 100644 --- a/py/demo/Ice/callback/config.server +++ b/py/demo/Ice/callback/config.server @@ -34,7 +34,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem diff --git a/py/demo/Ice/hello/config.client b/py/demo/Ice/hello/config.client index 410677cb76a..11b0577c8cf 100644 --- a/py/demo/Ice/hello/config.client +++ b/py/demo/Ice/hello/config.client @@ -43,7 +43,7 @@ Ice.ACM.Client=10 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=c_rsa1024_pub.pem diff --git a/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server index 0433e9ac3d5..6c38bfb6fbf 100644 --- a/py/demo/Ice/hello/config.server +++ b/py/demo/Ice/hello/config.server @@ -44,7 +44,7 @@ Ice.ACM.Server=10 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem diff --git a/py/demo/Ice/latency/config.client b/py/demo/Ice/latency/config.client index 638276f6968..ab04a392cfc 100644 --- a/py/demo/Ice/latency/config.client +++ b/py/demo/Ice/latency/config.client @@ -1,6 +1,6 @@ Latency.Ping=ping:default -p 10000 -#Ice.Plugin.IceSSL=IceSSL:create +#Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=c_rsa1024_pub.pem diff --git a/py/demo/Ice/latency/config.server b/py/demo/Ice/latency/config.server index 1e341985bcc..d97cb4aaaf3 100644 --- a/py/demo/Ice/latency/config.server +++ b/py/demo/Ice/latency/config.server @@ -1,6 +1,6 @@ Latency.Endpoints=default -p 10000 -#Ice.Plugin.IceSSL=IceSSL:create +#Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem diff --git a/py/demo/Ice/throughput/config.client b/py/demo/Ice/throughput/config.client index 3c831f58dda..657152e925e 100644 --- a/py/demo/Ice/throughput/config.client +++ b/py/demo/Ice/throughput/config.client @@ -1,6 +1,6 @@ Throughput.Throughput=throughput:default -p 10000 -#Ice.Plugin.IceSSL=IceSSL:create +#Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=c_rsa1024_pub.pem diff --git a/py/demo/Ice/throughput/config.server b/py/demo/Ice/throughput/config.server index 03efdc4b85c..f89f76ad0fb 100644 --- a/py/demo/Ice/throughput/config.server +++ b/py/demo/Ice/throughput/config.server @@ -1,6 +1,6 @@ Throughput.Endpoints=default -p 10000 -#Ice.Plugin.IceSSL=IceSSL:create +#Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem diff --git a/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox index 84ef44ac236..bcb0693e469 100644 --- a/py/demo/IceStorm/clock/config.icebox +++ b/py/demo/IceStorm/clock/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,31:create --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,31:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/vb/demo/Glacier2/callback/config.glacier2 b/vb/demo/Glacier2/callback/config.glacier2 index 4f0a0298045..771f1aa0371 100644 --- a/vb/demo/Glacier2/callback/config.glacier2 +++ b/vb/demo/Glacier2/callback/config.glacier2 @@ -136,7 +136,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem diff --git a/vb/demo/IceStorm/clock/config.icebox b/vb/demo/IceStorm/clock/config.icebox index 84ef44ac236..bcb0693e469 100644 --- a/vb/demo/IceStorm/clock/config.icebox +++ b/vb/demo/IceStorm/clock/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,31:create --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,31:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions |