--- a/Make.proto	Thu Nov 15 22:13:24 2012 +0000
+++ b/Make.proto	Thu Nov 15 23:47:09 2012 +0000
@@ -63,8 +63,11 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs::  zlib support/fdlibm/libfdm.a 
+pre_objs::  zlib support/fdlibm/libfdm.a java 
+
 
+java:
+	ant -f java/build.xml
 
 zlib:
 	cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)

--- a/bc.mak	Thu Nov 15 22:13:24 2012 +0000
+++ b/bc.mak	Thu Nov 15 23:47:09 2012 +0000
@@ -42,7 +42,7 @@
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
 
-ALL:: $(ZLIB) support\fdlibm\libfdm.lib classLibRule
+ALL:: $(ZLIB) support\fdlibm\libfdm.lib java classLibRule
 
 classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
 
@@ -70,6 +70,9 @@
 
 
 
+java:
+	ant -f java\build.xml
+
 $(ZLIB):
 	cd $(ZLIB_DIR)
 	$(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)

--- a/libjava.rc	Thu Nov 15 22:13:24 2012 +0000
+++ b/libjava.rc	Thu Nov 15 23:47:09 2012 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,2190,2190
+  FILEVERSION     6,2,2196,2196
   PRODUCTVERSION  6,2,3,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.2190.2190\0"
+      VALUE "FileVersion", "6.2.2196.2196\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.3.1\0"
-      VALUE "ProductDate", "Sun, 11 Nov 2012 15:19:14 GMT\0"
+      VALUE "ProductDate", "Thu, 15 Nov 2012 23:47:42 GMT\0"
     END
 
   END

--- a/stx_libjava.st	Thu Nov 15 22:13:24 2012 +0000
+++ b/stx_libjava.st	Thu Nov 15 23:47:09 2012 +0000
@@ -155,17 +155,17 @@
      exclude individual packages in the #excludedFromPrerequisites method."
 
     ^ #(
-        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaTestsResource "
-        #'stx:libbasic'    "PeekableStream - superclass of JavaSocket "
+        #'stx:goodies/sunit'    "TestSuite - referenced by stx_libjava class>>testSuite "
+        #'stx:libbasic'    "LibraryDefinition - superclass of stx_libjava "
         #'stx:libbasic2'    "BitArray - superclass of extended BooleanArray "
         #'stx:libbasic3'    "WrappedMethod - extended "
-        #'stx:libcomp'    "MessageNode - referenced by ProxyMethodBlockInvocationNode>>generate: "
+        #'stx:libcomp'    "SourceFileLoader - referenced by GroovyCompiler class>>compile:forClass:inCategory:notifying:install:skipIfSame:silent: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
         #'stx:libtool'    "WorkspaceApplication - referenced by GroovyEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
-        #'stx:libview'    "View - superclass of JavaEmbeddedFrameView "
+        #'stx:libview'    "GraphicsContext - superclass of JavaTopView "
         #'stx:libview2'    "GIFReader - referenced by JavaVM class>>_GifImageDecoder_parseImage: "
-        #'stx:libwidg'    "HorizontalScrollBar - referenced by JavaVM class>>_WScrollPanePeer__getHScrollbarHeight: "
-        #'stx:libwidg2'    "ComboListView - referenced by JavaVM class>>_WChoicePeer_create: "
+        #'stx:libwidg'    "HVScrollableView - referenced by JavaVM class>>_WTextAreaPeer_create: "
+        #'stx:libwidg2'    "ComboBoxView - referenced by JavaVM class>>processEvent: "
     )
 ! !
 
@@ -187,6 +187,9 @@
 
 additionalRules_bc_dot_mak
     ^ '
+java:
+        ant -f java\build.xml
+
 $(ZLIB):
         cd $(ZLIB_DIR)
         $(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
@@ -204,11 +207,14 @@
 
 '
 
-    "Modified: / 07-09-2011 / 17:04:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-11-2012 / 23:23:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 additionalRules_make_dot_proto
     ^ '
+java:
+        ant -f java/build.xml
+
 zlib:
         cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)
 
@@ -217,22 +223,22 @@
 
 '
 
-    "Modified: / 07-09-2011 / 17:01:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-11-2012 / 23:22:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 additionalTargets_bc_dot_mak
 
-    ^ '$(ZLIB) support\fdlibm\libfdm.lib'
+    ^ '$(ZLIB) support\fdlibm\libfdm.lib java'
 
-    "Modified: / 07-09-2011 / 17:03:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-11-2012 / 23:20:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 additionalTargets_make_dot_proto
 
-    ^ ' zlib support/fdlibm/libfdm.a'
+    ^ ' zlib support/fdlibm/libfdm.a java'
 
     "Created: / 05-09-2006 / 16:05:12 / cg"
-    "Modified: / 07-09-2011 / 17:00:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-11-2012 / 23:20:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 localIncludes
@@ -570,20 +576,6 @@
         Object getJavaLockWord
         Object getJavaMonitor
         Object javaWrapRequired
-        'java/lang/Byte class' javaWrap:
-        'java/lang/Byte class' javaWrapRequired
-        'java/lang/Double class' javaWrap:
-        'java/lang/Double class' javaWrapRequired
-        'java/lang/Float class' javaWrap:
-        'java/lang/Float class' javaWrapRequired
-        'java/lang/Integer class' javaWrap:
-        'java/lang/Integer class' javaWrapRequired
-        'java/lang/Long class' javaWrap:
-        'java/lang/Long class' javaWrapRequired
-        'java/lang/Short class' javaWrap:
-        'java/lang/Short class' javaWrapRequired
-        'java/lang/String class' javaWrap:
-        'java/lang/String class' javaWrapRequired
     )
 ! !