Bugfix: value of java.home property. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 09 Jan 2013 17:38:47 +0000
branchdevelopment
changeset 1927 007031278841
parent 1926 32f3cef32ca5
child 1928 ad4b1740dcea
Bugfix: value of java.home property. Valie of java.home property is now according to Java release jreHome. Was hard-coded, sigh!
JavaRelease.st
JavaVM.st
libjava.rc
--- a/JavaRelease.st	Wed Jan 09 16:17:12 2013 +0000
+++ b/JavaRelease.st	Wed Jan 09 17:38:47 2013 +0000
@@ -1003,18 +1003,6 @@
     self javaHome notNil ifTrue:[
         java_homes add: self javaHome
     ].
-    "OpenJDK 7 on Linux is in two directories:
-        /usr/lib/jvm/java-7-openjdk-amd64  - self javaHome
-        /usr/lib/jvm/java-7-openjdk-common
-
-    Search both...
-    "
-    OperatingSystem isUNIXlike ifTrue:[
-        '/usr/lib/jvm/java-7-openjdk-common' asFilename exists ifTrue:[
-            java_homes add: '/usr/lib/jvm/java-7-openjdk-common/jre'
-        ]
-    ].
-    
 
     java_homes do:[ :java_home |
         src_zip := java_home asFilename directory / 'src.zip'.
@@ -1026,7 +1014,7 @@
     "
 
     "Created: / 03-09-2012 / 18:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 09-01-2013 / 15:16:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-01-2013 / 17:09:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaRelease::OpenJDK7 class methodsFor:'documentation'!
--- a/JavaVM.st	Wed Jan 09 16:17:12 2013 +0000
+++ b/JavaVM.st	Wed Jan 09 17:38:47 2013 +0000
@@ -1855,7 +1855,7 @@
                 '1.0'.
                  "'sun.java.command'            . 'SystemProperties' ."
                 'java.home'.
-                '/usr/lib/jvm/java-6-openjdk/jre'.
+                Java release jreHome pathName.
                 'sun.arch.data.model'.
                 '32'.
                 'user.language'.
@@ -1923,7 +1923,7 @@
     "Modified (format): / 03-11-2011 / 12:40:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 21-12-2011 / 23:05:11 / jv"
     "Modified: / 13-09-2012 / 20:33:56 / m"
-    "Modified: / 30-11-2012 / 11:23:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-01-2013 / 17:11:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 initializeVM
@@ -9862,6 +9862,13 @@
     "Modified: / 08-12-2011 / 01:13:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+_java_util_TimeZone_getSystemGMTOffsetID: nativeContext
+
+    <javanative: 'java/util/TimeZone' name: 'getSystemGMTOffsetID()Ljava/lang/String;'>
+
+    ^ UnimplementedNativeMethodSignal raise
+!
+
 _java_util_TimeZone_getSystemTimeZoneID: nativeContext
 
     <javanative: 'java/util/TimeZone' name: 'getSystemTimeZoneID'>
--- a/libjava.rc	Wed Jan 09 16:17:12 2013 +0000
+++ b/libjava.rc	Wed Jan 09 17:38:47 2013 +0000
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Wed, 09 Jan 2013 16:15:41 GMT\0"
+      VALUE "ProductDate", "Wed, 09 Jan 2013 17:37:00 GMT\0"
     END
 
   END