Added support for Java monotonic clock

39 files changed, 51 insertions, 9 deletions

diff --git a/java/build.xml b/java/build.xml
index 1bd4446fe67..fb27c12bcb0 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -137,8 +137,8 @@
     <target name="ice-compile" depends="generate">
         <mkdir dir="${lib.dir}"/>
         <mkdir dir="${cache.dir}"/>
-	<depend srcdir="${generated.dir}:${src.dir}:${ssl.src}" destdir="${lib.dir}" cache="${cache.dir}"/>
-	<javac srcdir="${generated.dir}:${src.dir}:${ssl.src}" destdir="${lib.dir}"
+	<depend srcdir="${generated.dir}:${src.dir}:${jdk.src.dir}" destdir="${lib.dir}" cache="${cache.dir}"/>
+	<javac srcdir="${generated.dir}:${src.dir}:${jdk.src.dir}" destdir="${lib.dir}"
 	    source="${jdk.version}" debug="${debug}"
 	    excludes="IceGridGUI/**"
 	    includes="**"
diff --git a/java/config/common.xml b/java/config/common.xml
index 80ca7b31a65..3a6b308e04a 100644
--- a/java/config/common.xml
+++ b/java/config/common.xml
@@ -31,8 +31,8 @@
 	<isset property="java2"/>
     </condition>
 
-    <!-- SSL source directory  -->
-    <condition property="ssl.src" value="ssl/jdk1.4" else="ssl/jdk1.5">
+    <!-- JDK specific source directory  -->
+    <condition property="jdk.src.dir" value="jdk/1.4" else="jdk/1.5">
 	<isset property="java2"/>
     </condition>
 
diff --git a/java/jdk/1.4/IceInternal/Time.java b/java/jdk/1.4/IceInternal/Time.java
new file mode 100644
index 00000000000..e0eced23e49
--- /dev/null
+++ b/java/jdk/1.4/IceInternal/Time.java
@@ -0,0 +1,23 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+final public class Time
+{
+    static long
+    currentMonotonicTimeMillis()
+    {
+        //
+        // The jdk 1.4 doesn't support also supports a wall
+        // clock. That's the best we can use.
+        //
+        return System.currentTimeMillis();
+    }
+};
\ No newline at end of file
diff --git a/java/ssl/jdk1.4/IceSSL/AcceptorI.java b/java/jdk/1.4/IceSSL/AcceptorI.java
index 8bec44c40a3..8bec44c40a3 100644
--- a/java/ssl/jdk1.4/IceSSL/AcceptorI.java
+++ b/java/jdk/1.4/IceSSL/AcceptorI.java
diff --git a/java/ssl/jdk1.4/IceSSL/CertificateVerifier.java b/java/jdk/1.4/IceSSL/CertificateVerifier.java
index 8426eae8ffe..8426eae8ffe 100644
--- a/java/ssl/jdk1.4/IceSSL/CertificateVerifier.java
+++ b/java/jdk/1.4/IceSSL/CertificateVerifier.java
diff --git a/java/ssl/jdk1.4/IceSSL/ConnectionInfo.java b/java/jdk/1.4/IceSSL/ConnectionInfo.java
index ed7340a44a1..ed7340a44a1 100644
--- a/java/ssl/jdk1.4/IceSSL/ConnectionInfo.java
+++ b/java/jdk/1.4/IceSSL/ConnectionInfo.java
diff --git a/java/ssl/jdk1.4/IceSSL/ConnectionInvalidException.java b/java/jdk/1.4/IceSSL/ConnectionInvalidException.java
index 3b7921ae9cf..3b7921ae9cf 100644
--- a/java/ssl/jdk1.4/IceSSL/ConnectionInvalidException.java
+++ b/java/jdk/1.4/IceSSL/ConnectionInvalidException.java
diff --git a/java/ssl/jdk1.4/IceSSL/ConnectorI.java b/java/jdk/1.4/IceSSL/ConnectorI.java
index 004bf95cdc6..004bf95cdc6 100644
--- a/java/ssl/jdk1.4/IceSSL/ConnectorI.java
+++ b/java/jdk/1.4/IceSSL/ConnectorI.java
diff --git a/java/ssl/jdk1.4/IceSSL/EndpointFactoryI.java b/java/jdk/1.4/IceSSL/EndpointFactoryI.java
index 41f1d1eb12c..41f1d1eb12c 100644
--- a/java/ssl/jdk1.4/IceSSL/EndpointFactoryI.java
+++ b/java/jdk/1.4/IceSSL/EndpointFactoryI.java
diff --git a/java/ssl/jdk1.4/IceSSL/EndpointI.java b/java/jdk/1.4/IceSSL/EndpointI.java
index 0f295b420b1..0f295b420b1 100644
--- a/java/ssl/jdk1.4/IceSSL/EndpointI.java
+++ b/java/jdk/1.4/IceSSL/EndpointI.java
diff --git a/java/ssl/jdk1.4/IceSSL/Instance.java b/java/jdk/1.4/IceSSL/Instance.java
index 2380100c223..2380100c223 100644
--- a/java/ssl/jdk1.4/IceSSL/Instance.java
+++ b/java/jdk/1.4/IceSSL/Instance.java
diff --git a/java/ssl/jdk1.4/IceSSL/Plugin.java b/java/jdk/1.4/IceSSL/Plugin.java
index 2c45d964d2d..2c45d964d2d 100644
--- a/java/ssl/jdk1.4/IceSSL/Plugin.java
+++ b/java/jdk/1.4/IceSSL/Plugin.java
diff --git a/java/ssl/jdk1.4/IceSSL/PluginFactory.java b/java/jdk/1.4/IceSSL/PluginFactory.java
index 70064d8a1b0..70064d8a1b0 100644
--- a/java/ssl/jdk1.4/IceSSL/PluginFactory.java
+++ b/java/jdk/1.4/IceSSL/PluginFactory.java
diff --git a/java/ssl/jdk1.5/IceSSL/PluginI.java b/java/jdk/1.4/IceSSL/PluginI.java
index 255a4e28232..255a4e28232 100644
--- a/java/ssl/jdk1.5/IceSSL/PluginI.java
+++ b/java/jdk/1.4/IceSSL/PluginI.java
diff --git a/java/ssl/jdk1.4/IceSSL/RFC2253.java b/java/jdk/1.4/IceSSL/RFC2253.java
index 601f8622aa4..601f8622aa4 100644
--- a/java/ssl/jdk1.4/IceSSL/RFC2253.java
+++ b/java/jdk/1.4/IceSSL/RFC2253.java
diff --git a/java/ssl/jdk1.4/IceSSL/TransceiverI.java b/java/jdk/1.4/IceSSL/TransceiverI.java
index c93696ab32c..c93696ab32c 100644
--- a/java/ssl/jdk1.4/IceSSL/TransceiverI.java
+++ b/java/jdk/1.4/IceSSL/TransceiverI.java
diff --git a/java/ssl/jdk1.4/IceSSL/TrustManager.java b/java/jdk/1.4/IceSSL/TrustManager.java
index d53cdf74273..d53cdf74273 100644
--- a/java/ssl/jdk1.4/IceSSL/TrustManager.java
+++ b/java/jdk/1.4/IceSSL/TrustManager.java
diff --git a/java/ssl/jdk1.4/IceSSL/Util.java b/java/jdk/1.4/IceSSL/Util.java
index 685c94030b5..685c94030b5 100644
--- a/java/ssl/jdk1.4/IceSSL/Util.java
+++ b/java/jdk/1.4/IceSSL/Util.java
diff --git a/java/ssl/jdk1.4/IceSSL/X509KeyManagerI.java b/java/jdk/1.4/IceSSL/X509KeyManagerI.java
index 5f039a89034..5f039a89034 100644
--- a/java/ssl/jdk1.4/IceSSL/X509KeyManagerI.java
+++ b/java/jdk/1.4/IceSSL/X509KeyManagerI.java
diff --git a/java/ssl/jdk1.4/IceSSL/X509TrustManagerI.java b/java/jdk/1.4/IceSSL/X509TrustManagerI.java
index 325287daec1..325287daec1 100644
--- a/java/ssl/jdk1.4/IceSSL/X509TrustManagerI.java
+++ b/java/jdk/1.4/IceSSL/X509TrustManagerI.java
diff --git a/java/jdk/1.5/IceInternal/Time.java b/java/jdk/1.5/IceInternal/Time.java
new file mode 100644
index 00000000000..6c5be83e920
--- /dev/null
+++ b/java/jdk/1.5/IceInternal/Time.java
@@ -0,0 +1,19 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+final public class Time
+{
+    static long
+    currentMonotonicTimeMillis()
+    {
+        return System.nanoTime() / 1000000;
+    }
+};
\ No newline at end of file
diff --git a/java/ssl/jdk1.5/IceSSL/AcceptorI.java b/java/jdk/1.5/IceSSL/AcceptorI.java
index 04f2b3331ab..04f2b3331ab 100644
--- a/java/ssl/jdk1.5/IceSSL/AcceptorI.java
+++ b/java/jdk/1.5/IceSSL/AcceptorI.java
diff --git a/java/ssl/jdk1.5/IceSSL/CertificateVerifier.java b/java/jdk/1.5/IceSSL/CertificateVerifier.java
index 8426eae8ffe..8426eae8ffe 100644
--- a/java/ssl/jdk1.5/IceSSL/CertificateVerifier.java
+++ b/java/jdk/1.5/IceSSL/CertificateVerifier.java
diff --git a/java/ssl/jdk1.5/IceSSL/ConnectionInfo.java b/java/jdk/1.5/IceSSL/ConnectionInfo.java
index ed7340a44a1..ed7340a44a1 100644
--- a/java/ssl/jdk1.5/IceSSL/ConnectionInfo.java
+++ b/java/jdk/1.5/IceSSL/ConnectionInfo.java
diff --git a/java/ssl/jdk1.5/IceSSL/ConnectionInvalidException.java b/java/jdk/1.5/IceSSL/ConnectionInvalidException.java
index 3b7921ae9cf..3b7921ae9cf 100644
--- a/java/ssl/jdk1.5/IceSSL/ConnectionInvalidException.java
+++ b/java/jdk/1.5/IceSSL/ConnectionInvalidException.java
diff --git a/java/ssl/jdk1.5/IceSSL/ConnectorI.java b/java/jdk/1.5/IceSSL/ConnectorI.java
index 9836a78753a..9836a78753a 100644
--- a/java/ssl/jdk1.5/IceSSL/ConnectorI.java
+++ b/java/jdk/1.5/IceSSL/ConnectorI.java
diff --git a/java/ssl/jdk1.5/IceSSL/EndpointFactoryI.java b/java/jdk/1.5/IceSSL/EndpointFactoryI.java
index 41f1d1eb12c..41f1d1eb12c 100644
--- a/java/ssl/jdk1.5/IceSSL/EndpointFactoryI.java
+++ b/java/jdk/1.5/IceSSL/EndpointFactoryI.java
diff --git a/java/ssl/jdk1.5/IceSSL/EndpointI.java b/java/jdk/1.5/IceSSL/EndpointI.java
index 8cf0f559fa4..8cf0f559fa4 100644
--- a/java/ssl/jdk1.5/IceSSL/EndpointI.java
+++ b/java/jdk/1.5/IceSSL/EndpointI.java
diff --git a/java/ssl/jdk1.5/IceSSL/Instance.java b/java/jdk/1.5/IceSSL/Instance.java
index c16162507cc..c16162507cc 100644
--- a/java/ssl/jdk1.5/IceSSL/Instance.java
+++ b/java/jdk/1.5/IceSSL/Instance.java
diff --git a/java/ssl/jdk1.5/IceSSL/Plugin.java b/java/jdk/1.5/IceSSL/Plugin.java
index 2c45d964d2d..2c45d964d2d 100644
--- a/java/ssl/jdk1.5/IceSSL/Plugin.java
+++ b/java/jdk/1.5/IceSSL/Plugin.java
diff --git a/java/ssl/jdk1.5/IceSSL/PluginFactory.java b/java/jdk/1.5/IceSSL/PluginFactory.java
index 70064d8a1b0..70064d8a1b0 100644
--- a/java/ssl/jdk1.5/IceSSL/PluginFactory.java
+++ b/java/jdk/1.5/IceSSL/PluginFactory.java
diff --git a/java/ssl/jdk1.4/IceSSL/PluginI.java b/java/jdk/1.5/IceSSL/PluginI.java
index 3719852e718..255a4e28232 100644
--- a/java/ssl/jdk1.4/IceSSL/PluginI.java
+++ b/java/jdk/1.5/IceSSL/PluginI.java
@@ -9,7 +9,7 @@
 
 package IceSSL;
 
-class PluginI extends Ice.LocalObjectImpl implements Plugin
+class PluginI implements Plugin
 {
     public
     PluginI(Ice.Communicator communicator)
diff --git a/java/ssl/jdk1.5/IceSSL/RFC2253.java b/java/jdk/1.5/IceSSL/RFC2253.java
index 601f8622aa4..601f8622aa4 100644
--- a/java/ssl/jdk1.5/IceSSL/RFC2253.java
+++ b/java/jdk/1.5/IceSSL/RFC2253.java
diff --git a/java/ssl/jdk1.5/IceSSL/TransceiverI.java b/java/jdk/1.5/IceSSL/TransceiverI.java
index b43a340c703..b43a340c703 100644
--- a/java/ssl/jdk1.5/IceSSL/TransceiverI.java
+++ b/java/jdk/1.5/IceSSL/TransceiverI.java
diff --git a/java/ssl/jdk1.5/IceSSL/TrustManager.java b/java/jdk/1.5/IceSSL/TrustManager.java
index 8598c1ac7e6..8598c1ac7e6 100644
--- a/java/ssl/jdk1.5/IceSSL/TrustManager.java
+++ b/java/jdk/1.5/IceSSL/TrustManager.java
diff --git a/java/ssl/jdk1.5/IceSSL/Util.java b/java/jdk/1.5/IceSSL/Util.java
index fcde66a5db4..fcde66a5db4 100644
--- a/java/ssl/jdk1.5/IceSSL/Util.java
+++ b/java/jdk/1.5/IceSSL/Util.java
diff --git a/java/ssl/jdk1.5/IceSSL/X509KeyManagerI.java b/java/jdk/1.5/IceSSL/X509KeyManagerI.java
index 8b209ee3978..8b209ee3978 100644
--- a/java/ssl/jdk1.5/IceSSL/X509KeyManagerI.java
+++ b/java/jdk/1.5/IceSSL/X509KeyManagerI.java
diff --git a/java/ssl/jdk1.5/IceSSL/X509TrustManagerI.java b/java/jdk/1.5/IceSSL/X509TrustManagerI.java
index 325287daec1..325287daec1 100644
--- a/java/ssl/jdk1.5/IceSSL/X509TrustManagerI.java
+++ b/java/jdk/1.5/IceSSL/X509TrustManagerI.java
diff --git a/java/src/IceInternal/Timer.java b/java/src/IceInternal/Timer.java
index 194eb5b072f..44e8ba0f6eb 100644
--- a/java/src/IceInternal/Timer.java
+++ b/java/src/IceInternal/Timer.java
@@ -58,7 +58,7 @@ public final class Timer extends Thread
             return;
         }
 
-        final Token token = new Token(System.currentTimeMillis() + delay, ++_tokenId, 0, task);
+        final Token token = new Token(IceInternal.Time.currentMonotonicTimeMillis() + delay, ++_tokenId, 0, task);
 
         Object previous = _tasks.put(task, token);
         assert previous == null;
@@ -78,7 +78,7 @@ public final class Timer extends Thread
             return;
         }
 
-        final Token token = new Token(System.currentTimeMillis() + period, ++_tokenId, period, task);
+        final Token token = new Token(IceInternal.Time.currentMonotonicTimeMillis() + period, ++_tokenId, period, task);
 
         Object previous = _tasks.put(task, token);
         assert previous == null;
@@ -152,7 +152,7 @@ public final class Timer extends Thread
                     {
                         if(_tasks.containsKey(token.task))
                         {
-                            token.scheduledTime = System.currentTimeMillis() + token.delay;
+                            token.scheduledTime = IceInternal.Time.currentMonotonicTimeMillis() + token.delay;
                             _tokens.add(token);
                         }
                     }
@@ -187,7 +187,7 @@ public final class Timer extends Thread
                 
                 while(!_tokens.isEmpty() && _instance != null)
                 {
-                    long now = System.currentTimeMillis();
+                    long now = IceInternal.Time.currentMonotonicTimeMillis();
                     Token first = (Token)_tokens.first();
                     if(first.scheduledTime <= now)
                     {