diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/build.properties | 6 | ||||
| -rw-r--r-- | java/demo/IceStorm/clock/config.icebox | 2 | ||||
| -rw-r--r-- | java/src/Ice/Util.java | 4 | ||||
| -rw-r--r-- | java/src/IceUtil/Version.java | 4 | ||||
| -rwxr-xr-x | java/test/Glacier2/router/run.py | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/java/config/build.properties b/java/config/build.properties index fa6d2b3eb64..b97031a84d6 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -7,7 +7,7 @@ # # ********************************************************************** -ice.version = 3.3.1 +ice.version = 3.4b db.version = 4.6.21 # @@ -32,5 +32,5 @@ lint = unchecked,deprecation # jgoodies.forms = /usr/share/java/forms-1.2.0.jar jgoodies.looks = /usr/share/java/looks-2.1.4.jar -#jgoodies.forms = C:/Ice-3.3.1-ThirdParty-VC80/lib/forms-1.2.0.jar -#jgoodies.looks = C:/Ice-3.3.1-ThirdParty-VC80/lib/looks-2.1.4.jar +#jgoodies.forms = C:/Ice-3.4b-ThirdParty-VC80/lib/forms-1.2.0.jar +#jgoodies.looks = C:/Ice-3.4b-ThirdParty-VC80/lib/looks-2.1.4.jar diff --git a/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox index 455571cacdf..8e4380c1185 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,34b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java index 064dd607257..dc4253eb627 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/Util.java @@ -502,7 +502,7 @@ public final class Util public static String stringVersion() { - return "3.3.1"; // "A.B.C", with A=major, B=minor, C=patch + return "3.4b"; // "A.B.C", with A=major, B=minor, C=patch } /** @@ -515,7 +515,7 @@ public final class Util public static int intVersion() { - return 30301; // AABBCC, with AA=major, BB=minor, CC=patch + return 30451; // AABBCC, with AA=major, BB=minor, CC=patch } private static String _localAddress = null; diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index cb153ac230c..1c2e0e85c4b 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -18,6 +18,6 @@ public final class Version // // The Ice version. // - public final static String ICE_STRING_VERSION = "3.3.1"; // "A.B.C", with A=major, B=minor, C=patch - public final static int ICE_INT_VERSION = 30301; // AABBCC, with AA=major, BB=minor, CC=patch + public final static String ICE_STRING_VERSION = "3.4b"; // "A.B.C", with A=major, B=minor, C=patch + public final static int ICE_INT_VERSION = 30451; // AABBCC, with AA=major, BB=minor, CC=patch } diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py index 9ac4099c255..b294a464212 100755 --- a/java/test/Glacier2/router/run.py +++ b/java/test/Glacier2/router/run.py @@ -28,7 +28,7 @@ args = ' --Ice.Warn.Dispatch=0' + \ ' --Glacier2.Filter.Category.AcceptUser="2"' + \ ' --Glacier2.SessionTimeout="30"' + \ ' --Glacier2.Client.Endpoints="default -p 12347"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.10"' \ + ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"' |