summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2008-04-19 21:34:26 -0700
committerMark Spruiell <mes@zeroc.com>2008-04-19 21:34:26 -0700
commit29ad47a2c61f065fdc24e51143d7d004417aee4f (patch)
treee7740fac426e18fbb347c30e1b7fd9a2e5cfc857 /java
parentReverted previous bogus fix. (diff)
downloadice-29ad47a2c61f065fdc24e51143d7d004417aee4f.tar.bz2
ice-29ad47a2c61f065fdc24e51143d7d004417aee4f.tar.xz
ice-29ad47a2c61f065fdc24e51143d7d004417aee4f.zip
bug 3006 - providing Ice version in various mappings
Diffstat (limited to 'java')
-rw-r--r--java/src/Ice/Util.java12
-rw-r--r--java/src/IceUtil/Version.java4
2 files changed, 16 insertions, 0 deletions
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 096f3aea71d..a2c19671ec6 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -340,6 +340,18 @@ public final class Util
}
}
+ public static String
+ stringVersion()
+ {
+ return "3.3.0"; // "A.B.C", with A=major, B=minor, C=patch
+ }
+
+ public static int
+ intVersion()
+ {
+ return 30300; // AABBCC, with AA=major, BB=minor, CC=patch
+ }
+
private static String _localAddress = null;
private static java.lang.Object _processLoggerMutex = new java.lang.Object();
private static Logger _processLogger = null;
diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java
index 269e06918b6..7a52646b0f6 100644
--- a/java/src/IceUtil/Version.java
+++ b/java/src/IceUtil/Version.java
@@ -9,6 +9,10 @@
package IceUtil;
+/**
+ * @deprecated IceUtil.Version is deprecated, use Ice.Util.stringVersion() or
+ * Ice.Util.intVersion() instead.
+ **/
public final class Version
{
//