diff options
author | Jose <jose@zeroc.com> | 2014-08-12 20:46:07 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2014-08-12 20:46:07 +0200 |
commit | a31393f368bc78281179e0e2c0ac2a37f7b849c1 (patch) | |
tree | a9b8ba6e228142bb522c976a766f41349b502bff /scripts/TestUtil.py | |
parent | Added eclipse project settings for java. (diff) | |
download | ice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.tar.bz2 ice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.tar.xz ice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.zip |
Fixed (ICE-5586) - Integrate IceWS to the Ice core library
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-x | scripts/TestUtil.py | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 55044f19089..7d4eedf669a 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -716,31 +716,6 @@ sslConfigTree["py"] = sslConfigTree["cpp"] sslConfigTree["rb"] = sslConfigTree["cpp"] sslConfigTree["php"] = sslConfigTree["cpp"] -wsConfigTree = { - "cpp" : { - "plugin" : " --Ice.Plugin.IceWS=IceWS:createIceWS ", - "client" : " ", - "server" : " ", - "colloc" : " ", - }, - "java" : { - "plugin" : " --Ice.Plugin.IceWS=IceWS.PluginFactory ", - "client" : " ", - "server" : " ", - "colloc" : " ", - }, - "cs" : { - "plugin" : " --Ice.Plugin.IceWS=%(icewscs)s:IceWS.PluginFactory ", - "client" : " ", - "server" : " ", - "colloc" : " ", - }, - } -wsConfigTree["py"] = wsConfigTree["cpp"] -wsConfigTree["rb"] = wsConfigTree["cpp"] -wsConfigTree["php"] = wsConfigTree["cpp"] -wsConfigTree["js"] = wsConfigTree["cpp"] - def getDefaultMapping(): """Try and guess the language mapping out of the current path""" here = os.getcwd().split(os.sep) @@ -864,12 +839,6 @@ def getCommandLineProperties(exe, config): components.append(sslConfigTree[config.lang]["plugin"] % sslenv) components.append(sslConfigTree[config.lang][config.type] % sslenv) - if config.protocol == "ws" or config.protocol == "wss": - wsenv = {} - wsenv["icewscs"] = quoteArgument("\\\"" + os.path.join(getIceDir("cs"), "Assemblies", "IceWS.dll") + "\\\"") - components.append(wsConfigTree[config.lang]["plugin"] % wsenv) - components.append(wsConfigTree[config.lang][config.type] % wsenv) - components.append("--Ice.Default.Protocol=" + config.protocol) if config.compress: |