diff options
49 files changed, 58 insertions, 58 deletions
diff --git a/config/Make.common.rules b/config/Make.common.rules index bc6e4ec027f..f6bbe384bbf 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -14,8 +14,8 @@ SHELL = /bin/sh VERSION_MAJOR = 3 VERSION_MINOR = 3 -VERSION = 3.3.0 -SOVERSION = 33 +VERSION = 3.3b +SOVERSION = 33b INSTALL = cp -fp INSTALL_PROGRAM = ${INSTALL} diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index 9928cd5d51a..5c15e475aa8 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -12,8 +12,8 @@ # ---------------------------------------------------------------------- SHELL = /bin/sh -VERSION = 3.3.0 -SOVERSION = 33 +VERSION = 3.3b +SOVERSION = 33b OBJEXT = .obj diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index c7404c7ba0e..c535446362a 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -60,7 +60,7 @@ <parameter name="publish-endpoints" default="default"/> <parameter name="flush-timeout" default="1000"/> - <service name="IceStorm${index}" entry="IceStormService,33:createIceStorm"> + <service name="IceStorm${index}" entry="IceStormService,33b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox index 455571cacdf..277716ca66e 100644 --- a/cpp/demo/IceStorm/clock/config.icebox +++ b/cpp/demo/IceStorm/clock/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox index 455571cacdf..277716ca66e 100644 --- a/cpp/demo/IceStorm/counter/config.icebox +++ b/cpp/demo/IceStorm/counter/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml index fae711bcb01..8688c6c56f6 100644 --- a/cpp/demo/IceStorm/replicated/application.xml +++ b/cpp/demo/IceStorm/replicated/application.xml @@ -21,7 +21,7 @@ <icebox id="${instance-name}-${index}" exe="icebox" activation="on-demand"> - <service name="IceStorm" entry="IceStormService,33:createIceStorm"> + <service name="IceStorm" entry="IceStormService,33b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/doc/swish/swish.conf b/cpp/doc/swish/swish.conf index 4a1c7381fa4..13f72a833d2 100644 --- a/cpp/doc/swish/swish.conf +++ b/cpp/doc/swish/swish.conf @@ -1,6 +1,6 @@ Replacerules remove /var/www/html/ -IndexDir /var/www/html/doc/Ice-3.3.0/reference -IndexDir /var/www/html/doc/Ice-3.3.0/manual +IndexDir /var/www/html/doc/Ice-3.3b/reference +IndexDir /var/www/html/doc/Ice-3.3b/manual IndexOnly .html FileRules filename is _sindex\.html DefaultContents HTML* diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 41bbcd39a57..cea7c696265 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -214,7 +214,7 @@ typedef long long Int64; // // The Ice version. // -#define ICE_STRING_VERSION "3.3.0" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30300 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.3b" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30351 // AABBCC, with AA=major, BB=minor, CC=patch #endif diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca index 8e8fbd248b2..328c230fede 100644 --- a/cpp/src/ca/iceca +++ b/cpp/src/ca/iceca @@ -74,7 +74,7 @@ if sys.argv[script] == "import": # development. "/usr/bin" handles RPM installs and "/opt/..." # handles standard tarball installs. # - checkLocations = [os.path.dirname(sys.argv[0]), ".", "/usr/bin", "/opt/Ice-3.3.0/bin"] + checkLocations = [os.path.dirname(sys.argv[0]), ".", "/usr/bin", "/opt/Ice-3.3b/bin"] if os.getenv("ICE_HOME"): checkLocations.append(os.path.join(os.getenv("ICE_HOME"), "bin")) for bindir in checkLocations: diff --git a/cs/config/makeconfig.py b/cs/config/makeconfig.py index f9c98f18c06..a000ab23889 100755 --- a/cs/config/makeconfig.py +++ b/cs/config/makeconfig.py @@ -32,7 +32,7 @@ for s in sys.argv[2:]: for a in assemblies: f.write(" <dependentAssembly>\n"); f.write(' <assemblyIdentity name="' + a + '" culture="neutral" publicKeyToken="1f998c50fec78381"/>\n'); - f.write(' <codeBase version="3.3.0.0" href="' + top_srcdir + '\\bin\\' + a + '.dll"/>\n'); + f.write(' <codeBase version="3.3.51.0" href="' + top_srcdir + '\\bin\\' + a + '.dll"/>\n'); f.write(' </dependentAssembly>\n'); f.write(' </assemblyBinding>\n'); f.write(' </runtime>\n'); diff --git a/cs/demo/Glacier2/callback/config.client b/cs/demo/Glacier2/callback/config.client index fd0ff511c54..71edb1806cd 100644 --- a/cs/demo/Glacier2/callback/config.client +++ b/cs/demo/Glacier2/callback/config.client @@ -74,7 +74,7 @@ Ice.RetryIntervals=-1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=c_rsa1024.pfx diff --git a/cs/demo/Ice/callback/config.client b/cs/demo/Ice/callback/config.client index c3415d18838..8df0dff65c3 100644 --- a/cs/demo/Ice/callback/config.client +++ b/cs/demo/Ice/callback/config.client @@ -45,7 +45,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=c_rsa1024.pfx diff --git a/cs/demo/Ice/callback/config.server b/cs/demo/Ice/callback/config.server index f14189c05f8..42a76435fab 100644 --- a/cs/demo/Ice/callback/config.server +++ b/cs/demo/Ice/callback/config.server @@ -39,7 +39,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/cs/demo/Ice/hello/config.client b/cs/demo/Ice/hello/config.client index 2619f50adee..a9009ffbc18 100644 --- a/cs/demo/Ice/hello/config.client +++ b/cs/demo/Ice/hello/config.client @@ -46,7 +46,7 @@ Ice.ACM.Client=10 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=c_rsa1024.pfx diff --git a/cs/demo/Ice/hello/config.server b/cs/demo/Ice/hello/config.server index 6b3c8eb81cd..b9fbba5f6da 100644 --- a/cs/demo/Ice/hello/config.server +++ b/cs/demo/Ice/hello/config.server @@ -47,7 +47,7 @@ Ice.ACM.Server=10 # # SSL plugin configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/cs/demo/IceBox/hello/config.client b/cs/demo/IceBox/hello/config.client index e63a1a05cf6..1cab64c18eb 100644 --- a/cs/demo/IceBox/hello/config.client +++ b/cs/demo/IceBox/hello/config.client @@ -30,7 +30,7 @@ Ice.Warn.Connections=1 # # SSL plugin configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=c_rsa1024.pfx diff --git a/cs/demo/IceBox/hello/config.service b/cs/demo/IceBox/hello/config.service index 1467934c8cf..232cad72402 100644 --- a/cs/demo/IceBox/hello/config.service +++ b/cs/demo/IceBox/hello/config.service @@ -30,7 +30,7 @@ Ice.Warn.Connections=1 # # SSL plugin configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox index 455571cacdf..277716ca66e 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,33:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cs/lib/pkgconfig/Glacier2.pc b/cs/lib/pkgconfig/Glacier2.pc index 89eee8c4f58..a9ee31ba28c 100644 --- a/cs/lib/pkgconfig/Glacier2.pc +++ b/cs/lib/pkgconfig/Glacier2.pc @@ -1,4 +1,4 @@ -version = 3.3.0 +version = 3.3.51 mono_root = /usr name = Glacier2 diff --git a/cs/lib/pkgconfig/Ice.pc b/cs/lib/pkgconfig/Ice.pc index 83b78a7932f..c04bd3c2468 100644 --- a/cs/lib/pkgconfig/Ice.pc +++ b/cs/lib/pkgconfig/Ice.pc @@ -1,4 +1,4 @@ -version = 3.3.0 +version = 3.3.51 mono_root = /usr name = Ice diff --git a/cs/lib/pkgconfig/IceBox.pc b/cs/lib/pkgconfig/IceBox.pc index df792c9c635..f4776f0c010 100644 --- a/cs/lib/pkgconfig/IceBox.pc +++ b/cs/lib/pkgconfig/IceBox.pc @@ -1,4 +1,4 @@ -version = 3.3.0 +version = 3.3.51 mono_root = /usr name = IceBox diff --git a/cs/lib/pkgconfig/IceGrid.pc b/cs/lib/pkgconfig/IceGrid.pc index 1da36becba9..a150deaacee 100644 --- a/cs/lib/pkgconfig/IceGrid.pc +++ b/cs/lib/pkgconfig/IceGrid.pc @@ -1,4 +1,4 @@ -version = 3.3.0 +version = 3.3.51 mono_root = /usr name = IceGrid diff --git a/cs/lib/pkgconfig/IcePatch2.pc b/cs/lib/pkgconfig/IcePatch2.pc index 62d638c233c..50b3d1a40bb 100644 --- a/cs/lib/pkgconfig/IcePatch2.pc +++ b/cs/lib/pkgconfig/IcePatch2.pc @@ -1,4 +1,4 @@ -version = 3.3.0 +version = 3.3.51 mono_root = /usr name = IcePatch2 diff --git a/cs/lib/pkgconfig/IceStorm.pc b/cs/lib/pkgconfig/IceStorm.pc index 6c05de93996..8b5b53d5772 100644 --- a/cs/lib/pkgconfig/IceStorm.pc +++ b/cs/lib/pkgconfig/IceStorm.pc @@ -1,4 +1,4 @@ -version = 3.3.0 +version = 3.3.51 mono_root = /usr name = IceStorm diff --git a/cs/src/Glacier2/AssemblyInfo.cs b/cs/src/Glacier2/AssemblyInfo.cs index 5880be89641..cd53a925f91 100644 --- a/cs/src/Glacier2/AssemblyInfo.cs +++ b/cs/src/Glacier2/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2008, ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyVersion("3.3.51")] [assembly: AssemblyDelaySign(false)] diff --git a/cs/src/Ice/AssemblyInfo.cs b/cs/src/Ice/AssemblyInfo.cs index 8427cc93672..55bf7cbf571 100644 --- a/cs/src/Ice/AssemblyInfo.cs +++ b/cs/src/Ice/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2008, ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyVersion("3.3.51")] [assembly: AssemblyDelaySign(false)] diff --git a/cs/src/IceBox/AssemblyInfo.cs b/cs/src/IceBox/AssemblyInfo.cs index b88a2931ce3..e923ff9182a 100644 --- a/cs/src/IceBox/AssemblyInfo.cs +++ b/cs/src/IceBox/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2008, ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyVersion("3.3.51")] [assembly: AssemblyDelaySign(false)] diff --git a/cs/src/IceGrid/AssemblyInfo.cs b/cs/src/IceGrid/AssemblyInfo.cs index 7feb742940d..0f559647f46 100644 --- a/cs/src/IceGrid/AssemblyInfo.cs +++ b/cs/src/IceGrid/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2008, ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyVersion("3.3.51")] [assembly: AssemblyDelaySign(false)] diff --git a/cs/src/IcePatch2/AssemblyInfo.cs b/cs/src/IcePatch2/AssemblyInfo.cs index f73e8618228..cb9ebd41fcd 100644 --- a/cs/src/IcePatch2/AssemblyInfo.cs +++ b/cs/src/IcePatch2/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2008, ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyVersion("3.3.51")] [assembly: AssemblyDelaySign(false)] diff --git a/cs/src/IceSSL/AssemblyInfo.cs b/cs/src/IceSSL/AssemblyInfo.cs index b026afeb948..0e901f2b94d 100644 --- a/cs/src/IceSSL/AssemblyInfo.cs +++ b/cs/src/IceSSL/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2008, ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyVersion("3.3.51")] [assembly: AssemblyDelaySign(false)] diff --git a/cs/src/IceStorm/AssemblyInfo.cs b/cs/src/IceStorm/AssemblyInfo.cs index e1a4fdba4bd..c13c78de20d 100644 --- a/cs/src/IceStorm/AssemblyInfo.cs +++ b/cs/src/IceStorm/AssemblyInfo.cs @@ -21,5 +21,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Copyright (c) 2003-2008, ZeroC, Inc.")] [assembly: AssemblyTrademark("Ice")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyVersion("3.3.51")] [assembly: AssemblyDelaySign(false)] diff --git a/distribution/src/rpm/ice.spec b/distribution/src/rpm/ice.spec index 7eb7baacd32..3df885f4c1d 100644 --- a/distribution/src/rpm/ice.spec +++ b/distribution/src/rpm/ice.spec @@ -35,7 +35,7 @@ %endif Name: ice -Version: 3.3.0 +Version: 3.3b Summary: Files common to all Ice packages Release: 1%{?dist} License: GPL with exceptions @@ -47,7 +47,7 @@ Source1: Ice-rpmbuild-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define soversion 33 +%define soversion 33b %define formsversion 1.2.0 %define looksversion 2.1.4 diff --git a/java/config/build.properties b/java/config/build.properties index 684043304c8..fbce97bedd0 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -7,7 +7,7 @@ # # ********************************************************************** -ice.version = 3.3.0 +ice.version = 3.3 db.version = 4.6.21 # diff --git a/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox index 455571cacdf..277716ca66e 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,33:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index 269e06918b6..4ff5b03f79b 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -14,6 +14,6 @@ public final class Version // // The Ice version. // - public final static String ICE_STRING_VERSION = "3.3.0"; // "A.B.C", with A=major, B=minor, C=patch - public final static int ICE_INT_VERSION = 30300; // AABBCC, with AA=major, BB=minor, CC=patch + public final static String ICE_STRING_VERSION = "3.3b"; // "A.B.C", with A=major, B=minor, C=patch + public final static int ICE_INT_VERSION = 30351; // AABBCC, with AA=major, BB=minor, CC=patch } diff --git a/php/src/IcePHP/Profile.cpp b/php/src/IcePHP/Profile.cpp index b4eb307193c..dc4ca6bc8bb 100644 --- a/php/src/IcePHP/Profile.cpp +++ b/php/src/IcePHP/Profile.cpp @@ -77,8 +77,8 @@ private: // necessary to IcePHP::throwException. // static const char* _coreTypes = - "define(\"ICE_STRING_VERSION\", \"3.3.0\");\n" - "define(\"ICE_INT_VERSION\", 30300);\n" + "define(\"ICE_STRING_VERSION\", \"3.3b\");\n" + "define(\"ICE_INT_VERSION\", 30351);\n" "\n" "abstract class Ice_Exception extends Exception\n" "{\n" diff --git a/py/demo/Ice/bidir/Client.py b/py/demo/Ice/bidir/Client.py index 47bf69f18d8..3496b269e8f 100644 --- a/py/demo/Ice/bidir/Client.py +++ b/py/demo/Ice/bidir/Client.py @@ -14,9 +14,9 @@ slice_dir = os.path.normpath("../../../../slice") if not os.path.exists(slice_dir): home_dir = os.getenv('ICE_HOME', '') if len(home_dir) == 0 or not os.path.exists(os.path.join(home_dir, 'slice')): - home_dir = os.path.join('/', 'usr', 'share', 'Ice-3.3.0') + home_dir = os.path.join('/', 'usr', 'share', 'Ice-3.3b') if not os.path.exists(os.path.join(home_dir, 'slice')): - home_dir = os.path.join('/', 'opt', 'Ice-3.3.0') + home_dir = os.path.join('/', 'opt', 'Ice-3.3b') if not os.path.exists(os.path.join(home_dir, 'slice')): print sys.argv[0] + ': Slice directory not found. Define ICE_HOME.' sys.exit(1) diff --git a/py/demo/Ice/bidir/Server.py b/py/demo/Ice/bidir/Server.py index 8044a99af57..d80e2131abf 100644 --- a/py/demo/Ice/bidir/Server.py +++ b/py/demo/Ice/bidir/Server.py @@ -14,9 +14,9 @@ slice_dir = os.path.normpath("../../../../slice") if not os.path.exists(slice_dir): home_dir = os.getenv('ICE_HOME', '') if len(home_dir) == 0 or not os.path.exists(os.path.join(home_dir, 'slice')): - home_dir = os.path.join('/', 'usr', 'share', 'Ice-3.3.0') + home_dir = os.path.join('/', 'usr', 'share', 'Ice-3.3b') if not os.path.exists(os.path.join(home_dir, 'slice')): - home_dir = os.path.join('/', 'opt', 'Ice-3.3.0') + home_dir = os.path.join('/', 'opt', 'Ice-3.3b') if not os.path.exists(os.path.join(home_dir, 'slice')): print sys.argv[0] + ': Slice directory not found. Define ICE_HOME.' sys.exit(1) diff --git a/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox index 455571cacdf..277716ca66e 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,33:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/vb/config/makeconfig.py b/vb/config/makeconfig.py index f9c98f18c06..a000ab23889 100755..100644 --- a/vb/config/makeconfig.py +++ b/vb/config/makeconfig.py @@ -32,7 +32,7 @@ for s in sys.argv[2:]: for a in assemblies: f.write(" <dependentAssembly>\n"); f.write(' <assemblyIdentity name="' + a + '" culture="neutral" publicKeyToken="1f998c50fec78381"/>\n'); - f.write(' <codeBase version="3.3.0.0" href="' + top_srcdir + '\\bin\\' + a + '.dll"/>\n'); + f.write(' <codeBase version="3.3.51.0" href="' + top_srcdir + '\\bin\\' + a + '.dll"/>\n'); f.write(' </dependentAssembly>\n'); f.write(' </assemblyBinding>\n'); f.write(' </runtime>\n'); diff --git a/vb/demo/Glacier2/callback/config.client b/vb/demo/Glacier2/callback/config.client index e4059f3ab30..72f02eb5a56 100644 --- a/vb/demo/Glacier2/callback/config.client +++ b/vb/demo/Glacier2/callback/config.client @@ -74,7 +74,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=c_rsa1024.pfx diff --git a/vb/demo/Ice/callback/config.client b/vb/demo/Ice/callback/config.client index 2ae8cc7f5a3..d7cad2f6da7 100644 --- a/vb/demo/Ice/callback/config.client +++ b/vb/demo/Ice/callback/config.client @@ -39,7 +39,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=c_rsa1024.pfx diff --git a/vb/demo/Ice/callback/config.server b/vb/demo/Ice/callback/config.server index dba291a1408..6f5c1872abd 100644 --- a/vb/demo/Ice/callback/config.server +++ b/vb/demo/Ice/callback/config.server @@ -37,7 +37,7 @@ Ice.Warn.Connections=1 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/vb/demo/Ice/hello/config.client b/vb/demo/Ice/hello/config.client index a5e03e9f9e8..5e9abcae76d 100644 --- a/vb/demo/Ice/hello/config.client +++ b/vb/demo/Ice/hello/config.client @@ -43,7 +43,7 @@ Ice.ACM.Client=10 # # SSL Configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=c_rsa1024.pfx diff --git a/vb/demo/Ice/hello/config.server b/vb/demo/Ice/hello/config.server index 60814210485..6373dd63ed4 100644 --- a/vb/demo/Ice/hello/config.server +++ b/vb/demo/Ice/hello/config.server @@ -44,7 +44,7 @@ Ice.ACM.Server=10 # # SSL plugin configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/vb/demo/IceBox/hello/config.client b/vb/demo/IceBox/hello/config.client index 2ab47693bdf..ac1aa16a1de 100644 --- a/vb/demo/IceBox/hello/config.client +++ b/vb/demo/IceBox/hello/config.client @@ -30,7 +30,7 @@ Ice.Warn.Connections=1 # # SSL plugin configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=c_rsa1024.pfx diff --git a/vb/demo/IceBox/hello/config.icebox b/vb/demo/IceBox/hello/config.icebox index fd22b81a369..a280b436834 100644 --- a/vb/demo/IceBox/hello/config.icebox +++ b/vb/demo/IceBox/hello/config.icebox @@ -63,7 +63,7 @@ Ice.Warn.Connections=1 # # SSL plugin configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/vb/demo/IceBox/hello/config.service b/vb/demo/IceBox/hello/config.service index 5c87be8351b..3fca91620a0 100644 --- a/vb/demo/IceBox/hello/config.service +++ b/vb/demo/IceBox/hello/config.service @@ -31,7 +31,7 @@ Ice.Warn.Connections=1 # # SSL plugin configuration # -Ice.Plugin.IceSSL=IceSSL, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory +Ice.Plugin.IceSSL=IceSSL, Version=3.3.51.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory IceSSL.DefaultDir=../../../../certs IceSSL.ImportCert.CurrentUser.Root=cacert.pem IceSSL.CertFile=s_rsa1024.pfx diff --git a/vb/demo/IceStorm/clock/config.icebox b/vb/demo/IceStorm/clock/config.icebox index 455571cacdf..277716ca66e 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,33:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions |