--- a/Java.st	Tue May 25 14:23:15 1999 +0000
+++ b/Java.st	Wed May 26 11:15:10 1999 +0000
@@ -303,17 +303,20 @@
     |tryJDK1_2 tryJDK1_2beta tryJDK1_16 tryJDK1_15 tryJDK1_13 tryJDK1_11 tryJDK1_03 
      tryJDK1_02 directoriesToSearch 
      jHome jClasses jSources mozillaHome tryNetscape4_0
-     tryMS tryBorland tryVA fn|
+     tryMS tryBorland tryVA tryJRE1_1 fn|
 
     FailedToLoadClasses := nil.
 
     "/ cannot use JDK1.2 yet (they made so many changes ...)
+"/    tryJDK1_2 := true.
+"/    tryJDK1_2beta := true.
+
+    "/ cannot use those yet (they also made changes ...)
 "/    tryVA := true.    
 "/    tryNetscape4_0 := true.
 "/    tryMS := true.
+
     tryBorland := true.
-"/    tryJDK1_2 := true.
-"/    tryJDK1_2beta := true.
     tryJDK1_16 := true.
     tryJDK1_15 := true.
     tryJDK1_13 := true.
@@ -321,10 +324,15 @@
 "/    tryJDK1_03 := false.
 "/    tryJDK1_02 := false.
 
+    tryJRE1_1 := true.
+
     ExcludedClassPath := OrderedCollection new.
 
     directoriesToSearch := OrderedCollection new.
 
+    tryJRE1_1 == true ifTrue:[        
+        directoriesToSearch add:'C:\Program Files\JavaSoft\JRE\1.1'.
+    ].
     tryVA == true ifTrue:[        
         directoriesToSearch add:'C:\IBMVJava\EAB\jdk'.
     ].
@@ -526,10 +534,15 @@
                         jHome := aPath.
                         jClasses add:(libDir constructString:'classes.zip').
                     ] ifFalse:[
-                        (libDir construct:'classes') exists ifTrue:[
-                            (libDir construct:'classes') isDirectory ifTrue:[
-                                jHome := aPath.
-                                jClasses add:(libDir construct:'classes').
+                        (libDir construct:'rt.zip') exists ifTrue:[
+                            jHome := aPath.
+                            jClasses add:(libDir constructString:'rt.zip').
+                        ] ifFalse:[
+                            (libDir construct:'classes') exists ifTrue:[
+                                (libDir construct:'classes') isDirectory ifTrue:[
+                                    jHome := aPath.
+                                    jClasses add:(libDir construct:'classes').
+                                ]
                             ]
                         ]
                     ]
@@ -1387,6 +1400,6 @@
 !Java class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.96 1999/05/25 14:23:15 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.97 1999/05/26 11:15:10 cg Exp $'
 ! !
 Java initialize!