- system properties polished jk_new_structure
authorvranyj1
Fri, 09 Dec 2011 13:27:34 +0000
branchjk_new_structure
changeset 1251 14f94a33376d
parent 1250 3904fc7212b4
child 1252 bf86657563f1
- system properties polished - some extensive logging commented out - tomcat startup improved
src/JavaRef2.st
src/JavaRelease.st
src/JavaUtilities.st
src/JavaVM.st
src/Make.proto
src/Make.spec
src/bc.mak
src/libjava.rc
src/stx_libjava.st
--- a/src/JavaRef2.st	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/JavaRef2.st	Fri Dec 09 13:27:34 2011 +0000
@@ -231,10 +231,11 @@
      Hides implementation details of the way of dealing with invalidation etc. User should not need to call anything
      else."
     
-    Logger log: self printString , ': dont call resolveStatic anymore, call resolve its safe' severity:#info facility:#JVM.
+"/    Logger log: self printString , ': dont call resolveStatic anymore, call resolve its safe' severity:#info facility:#JVM.
     ^ self resolve.
 
     "Created: / 26-04-2011 / 13:19:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 08-12-2011 / 22:21:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 updateClassRefsFrom: oldOwner to: newOwner 
--- a/src/JavaRelease.st	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/JavaRelease.st	Fri Dec 09 13:27:34 2011 +0000
@@ -448,7 +448,9 @@
     classPath add: (jreHome / 'lib' / 'rt.jar') asString.
 
     self searchForClassPathIn: jreHome / 'lib' .
-    "/self searchForClassPathIn: jreHome / 'lib' / 'ext'.
+    self searchForClassPathIn: jreHome / 'lib' / 'modules'.
+
+    ^self classPath
 
     "
         Java release searchForClassPath.
@@ -461,8 +463,9 @@
 
 searchForClassPathIn: dir 
     dir exists ifFalse: [ ^ self ].
-    dir recursiveDirectoryContentsAsFilenames do: [
+    dir directoryContentsAsFilenames do: [
         :file | 
+        " this is to make sure that rt.jar is always first --v     "
         (file suffix = 'jar' and: [ file baseName ~= 'rt.jar' ]) ifTrue: [
             classPath add: file asString
         ]
@@ -470,6 +473,7 @@
 
     "Created: / 27-10-2010 / 21:38:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-11-2011 / 17:49:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified (format): / 09-12-2011 / 02:11:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 searchForJavaHome
--- a/src/JavaUtilities.st	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/JavaUtilities.st	Fri Dec 09 13:27:34 2011 +0000
@@ -69,13 +69,14 @@
     "Created: / 08-12-2011 / 00:32:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !JavaUtilities::Tomcat methodsFor:'initialization'!
 
 initializeVM
+
     Java flushAllJavaResources.
     Java initialize.
     JavaVM initializeVM.
-    JavaLibraries addToClassPath.
 
     "Created: / 08-12-2011 / 00:01:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -84,19 +85,23 @@
 
 start
 
-    | tomcat java_lang_System |
-    tomcat := '/home/jv/Projects/libjava/libs/tomcat/tomcat-6.0.28-src'.
-    Java addToClassPath: tomcat , '/bin/bootstrap.jar'.
+    | catalinaHome java_lang_System |
+
+    Java addToClassPath: self classPath1.
+    Java addToClassPath: self classPath2.
+    Java addToSourcePath: self sourcePath.
     JavaVM booted ifFalse:[self initializeVM].
+
+    catalinaHome := self catalinaHome.
     java_lang_System := Java classForName:'java.lang.System'.
 
     {
-        'java.util.logging.config.file'.    tomcat , '/conf/logging.properties' .
+        'java.util.logging.config.file'.    catalinaHome , '/conf/logging.properties' .
         'java.util.logging.manager'.        'org.apache.juli.ClassLoaderLogManager' .
-        'java.endorsed.dirs'.               tomcat , '/endorsed' .
-        'catalina.base'.                    tomcat .
-        'catalina.home'.                    tomcat .
-        'java.io.tmpdir'.                   tomcat , '/temp' .
+        'java.endorsed.dirs'.               catalinaHome , '/endorsed' .
+        'catalina.base'.                    catalinaHome .
+        'catalina.home'.                    catalinaHome .
+        'java.io.tmpdir'.                   catalinaHome , '/temp' .
     } pairWiseDo:[:key :value|
         java_lang_System perform: #'setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;'
             with: (Java as_String: key)
--- a/src/JavaVM.st	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/JavaVM.st	Fri Dec 09 13:27:34 2011 +0000
@@ -1682,7 +1682,10 @@
      being already loaded (used with jdk >= 1.2)"
     
     OperatingSystem isUNIXlike ifTrue: [
-        SimulatedNativeLibs := #( 'libawt.so' 'libnet.so' 'libcmm.so' 'libzip.so' 'libmanagement.so'  'libjpeg.so' ).
+        SimulatedNativeLibs := #( 'libawt.so' 'libnet.so' 'libcmm.so' 'libzip.so' 
+                                  'libmanagement.so'        "/ Management Beans - req'd by Tomcat
+                                  'libjpeg.so' 'liblcms.so' "/ Some UI stuff - req'd by Tomcat !!?!!
+                                    ).
         ^ self.
     ].
     OperatingSystem isMSWINDOWSlike ifTrue: [
@@ -1695,8 +1698,8 @@
      self initializeSimulatedNativeLibs"
 
     "Modified: / 27-01-1998 / 18:43:10 / cg"
-    "Modified: / 01-04-2011 / 23:02:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 03-11-2011 / 19:00:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 09-12-2011 / 12:03:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 initializeSimulatedNativeMemory
@@ -1720,7 +1723,9 @@
 !
 
 initializeSystemPropertiesInto: props 
-    | cpu  os  jHome |
+
+   | cpu  os |
+
     "/ use JAVA compatible cpu-name
     cpu := OperatingSystem getCPUType.
     cpu = 'i386' ifTrue: [ cpu := 'ix86' ].
@@ -1728,29 +1733,63 @@
         os := OperatingSystem getOSType.
         os := os asUppercaseFirst.
     ].
-    props at: 'java.version' put: '1'.
-    props at: 'java.vendor' put: 'eXept Software AG & SWING Reseach Group'.
-    props at: 'java.vendor.url'
-        put: 'http://www.exept.de & http://swing.fit.cvut.cz'.
-    props at: 'java.vm.name' put: 'Smalltalk/X'.
-    (jHome := self defaultJAVAHome) notNil ifTrue: [
-        props at: 'java.home' put: (jHome asFilename pathName).
-    ].
-    props at: 'java.class.version' put: '1'.
-    props at: 'java.class.path' put: (self defaultCLASSPATH).
-    props at: 'java.ext.dirs' put: (self defaultExtDirs).
-    props at: 'os.name' put: os.
-    props at: 'os.arch' put: cpu.
-    props at: 'os.version' put: '1'.
-    props at: 'file.separator' put: (Filename separator asString).
-    props at: 'path.separator' put: OperatingSystem pathSeparator asString.
-    props at: 'line.separator' put: (Character cr asString).
-    props at: 'user.name' put: (OperatingSystem getLoginName).
-    props at: 'user.home'
-        put: (OperatingSystem getHomeDirectory ? Filename currentDirectory name).
-    props at: 'user.dir'
-        put: (UserPreferences current javaTestsDirectory asFilename 
-                / 'libjava' asFilename) pathName.
+
+    props addPairsFrom:
+        {
+            'java.runtime.name'             . 'OpenJDK Runtime Environment' .
+            'sun.boot.library.path'         . '/usr/lib/jvm/java-6-openjdk/jre/lib/amd64' .
+            'java.vm.version'               . '20.0-b11' .
+            'java.vm.vendor'                . 'eXept Software AG & SWING Research Group' .
+            'java.vendor.url'               . 'http://www.exept.de & http://swing.fit.cvut.cz' .
+            'path.separator'                .  OperatingSystem pathSeparator asString. 
+            'java.vm.name'                  . 'Smalltalk/X 6.2.1 VM' .
+            'file.encoding.pkg'             . 'sun.io' .
+            'sun.java.launcher'             . 'SUN_STANDARD' .
+            'user.country'                  . 'US' .
+            'sun.os.patch.level'            . 'unknown' .
+            'java.vm.specification.name'    . 'Java Virtual Machine Specification' .
+            'user.dir'                      . Filename currentDirectory pathName .
+
+            'java.awt.graphicsenv'          . 'sun.awt.X11GraphicsEnvironment' .
+            'java.endorsed.dirs'            . '/usr/lib/jvm/java-6-openjdk/jre/lib/endorsed' .
+            'os.arch'                       . cpu .
+            'java.io.tmpdir'                . Filename tempDirectory pathName .
+            'line.separator'                . Character cr asString .
+            'java.vm.specification.vendor' . 'Sun Microsystems Inc.' .
+            'os.name'                       . os .
+            'sun.jnu.encoding'              . 'UTF-8' .
+            'java.library.path'             . self defaultJavaLibraryPath.
+            'java.specification.name'       . 'Java Platform API Specification' .
+            'java.class.version'            . '50.0' .
+            'sun.management.compiler'       . 'Smalltalk/X jinterpreter' .
+            'os.version'                    . OperatingSystem getSystemInfo at: #version .
+            'user.home'                     . Filename homeDirectory pathName .
+            'user.timezone'                 . '' .
+            'java.awt.printerjob'           . 'sun.print.PSPrinterJob' .
+            'file.encoding'                 . 'UTF-8' .
+            'java.specification.version'    . '1.6' .
+            'java.class.path'               . self defaultCLASSPATH.
+            'user.name'                     . OperatingSystem getLoginName .
+            'java.vm.specification.version' . '1.0' .
+            "'sun.java.command'            . 'SystemProperties' ."
+            'java.home'                     . '/usr/lib/jvm/java-6-openjdk/jre' .
+            'sun.arch.data.model'           . '32' .
+            'user.language'                 . Smalltalk language .   
+            'java.specification.vendor'     . 'Sun Microsystems Inc.' .
+            'java.vm.info'                  . 'Smalltalk/X 6.2.1' .
+            'java.version'                  . '1.6' .
+            'java.ext.dirs'                 . self defaultExtDirs .
+            'sun.boot.class.path'           . self defaultSunBootLibraryPath.
+            'java.vendor'                   . 'Sun Microsystems Inc.' .
+            'file.separator'                . Filename separatorString .
+            'java.vendor.url.bug'           . 'http://java.sun.com/cgi-bin/bugreport.cgi' .
+            'sun.io.unicode.encoding'       . 'UnicodeLittle' .
+            'sun.cpu.endian'                . 'little' .
+            'sun.desktop'                   . 'gnome' .
+            'sun.cpu.isalist'               . '' .
+        }.
+
+
     
     "/ props at:'user.dir'           put:(Filename currentDirectory pathName).
     "/props at:'awt.toolkit'        put:(self defaultWindowingToolKit).
@@ -1760,10 +1799,7 @@
     
     "/ new with jdk 1.1.8
     "/ undocumented ?
-    
-    props at: 'file.encoding.pkg' put: 'sun.io'.
-    props at: 'file.encoding' put: 'UTF-8'.
-    
+
     "/ suppress copyright view in appletViewer ...
     
     props at: 'appletviewer.version' put: '1.1'.
@@ -1778,8 +1814,6 @@
     "/ new with jws 2.0 ...
     "/props at:'jws.startcmd'         put:'jws.showwin.mainide'.
     
-    props at: 'java.library.path' put: self defaultJavaLibraryPath.
-    props at: 'sun.boot.library.path' put: self defaultSunBootLibraryPath.
     props at: 'stx.libjava.tomcat.dir'
         put: (JavaLibraries directory / 'tomcat6') pathName.
     
@@ -1792,8 +1826,8 @@
 
     "Created: / 03-01-1998 / 14:26:39 / cg"
     "Modified: / 27-01-2000 / 02:20:18 / cg"
-    "Modified: / 31-08-2011 / 20:03:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (format): / 03-11-2011 / 12:40:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 09-12-2011 / 02:04:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 initializeVM
@@ -2684,29 +2718,17 @@
 
 defaultSunBootLibraryPath
 
-    | dirs |
-    dirs := OrderedCollection new
-            add: Java release javaHome asFilename / 'lib';
-            add: Java release javaHome asFilename / 'lib' / 'amd64';
-            add: Java release javaHome asFilename / 'lib' / 'i386';
-            add: Java release javaHome asFilename / 'jre' / 'lib' ;
-            add: Java release javaHome asFilename / 'jre' / 'lib' / 'amd64'  ;
-            add: Java release javaHome asFilename / 'jre' / 'lib' / 'i386' ;
-            yourself.
-    OperatingSystem isMSWINDOWSlike ifTrue:[
-        dirs
-            add: Java release javaHome asFilename / 'bin'.
-    ].
-
-
-    ^String streamContents:
-        [:path|
-        (dirs select:[:d|d exists])
-            do:[:d|path nextPutAll:d pathName]
-            separatedBy:[path nextPut: OperatingSystem pathSeparator]]
-
-    "
-        JavaVM defaultJavaLibraryPath
+    |s|
+
+    s := '' writeStream.
+    Java release classPath 
+        do:[:p | s nextPutAll:p ]
+        separatedBy: [s nextPut: OperatingSystem pathSeparator].
+
+    ^ s contents    
+
+    "    
+        JavaVM defaultSunBootLibraryPath
     "
 
     "Created: / 10-12-2010 / 14:37:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
--- a/src/Make.proto	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/Make.proto	Fri Dec 09 13:27:34 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-12-09 11:14:07.228.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-09 14:25:36.599.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -211,7 +211,7 @@
 $(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(STCHDR)
 $(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/src/Make.spec	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/Make.spec	Fri Dec 09 13:27:34 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-12-09 11:14:06.452.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-09 14:25:35.417.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/bc.mak	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/bc.mak	Fri Dec 09 13:27:34 2011 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2011-12-09 11:14:07.667.
+# automagically generated from the projectDefinition: stx_libjava at 2011-12-09 14:25:37.249.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -166,7 +166,7 @@
 $(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(STCHDR)
 $(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/src/libjava.rc	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/libjava.rc	Fri Dec 09 13:27:34 2011 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1589,1589
+  FILEVERSION     6,2,1604,1604
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "6.2.1589.1589\0"
+      VALUE "FileVersion", "6.2.1604.1604\0"
       VALUE "InternalName", "stx:libjava\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\b          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Fri, 09 Dec 2011 10:14:21 GMT\0"
+      VALUE "ProductDate", "Fri, 09 Dec 2011 13:25:48 GMT\0"
     END
 
   END
--- a/src/stx_libjava.st	Fri Dec 09 12:46:11 2011 +0000
+++ b/src/stx_libjava.st	Fri Dec 09 13:27:34 2011 +0000
@@ -162,18 +162,18 @@
      exclude individual packages in the #excludedFromPrerequisites method."
 
     ^ #(
-        #'squeak:petitparser'    "PPParser - superclass of JavaParser::LineNumberParser "
-        #'stx:goodies/sunit'    "TestCase - superclass of JavaByteCodeProcessorTests "
-        #'stx:libbasic'    "Method - superclass of extended WrappedMethod "
+        #'squeak:petitparser'    "PPParser - superclass of JavaParser::MultilineCommentParser "
+        #'stx:goodies/sunit'    "TestSuite - referenced by stx_libjava class>>testSuite "
+        #'stx:libbasic'    "Dictionary - superclass of JavaAnnotationDictionary "
         #'stx:libbasic2'    "Socket - superclass of JavaSocket "
         #'stx:libbasic3'    "WrappedMethod - extended "
         #'stx:libcomp'    "ObjectFileLoader - referenced by JavaVM class>>_Runtime_loadFileInternalI: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-        #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
-        #'stx:libview'    "PopUpView - superclass of JavaPopUpView "
-        #'stx:libview2'    "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
-        #'stx:libwidg'    "SelectionInListView - referenced by JavaVM class>>_WListPeer_create: "
-        #'stx:libwidg2'    "ComboBoxView - referenced by JavaVM class>>processEvent: "
+        #'stx:libtool'    "WorkspaceApplication - referenced by JavaEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
+        #'stx:libview'    "DeviceGraphicsContext - superclass of JavaPopUpView "
+        #'stx:libview2'    "GIFReader - referenced by JavaVM class>>_GifImageDecoder_parseImage: "
+        #'stx:libwidg'    "EditField - referenced by JavaVM class>>_WTextFieldPeer_create: "
+        #'stx:libwidg2'    "MenuPanel - referenced by JavaVM class>>processEvent: "
     )
 ! !
 
@@ -582,7 +582,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'1602'"$"
+    ^ "$SVN-Revision:"        '1604M'"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!