--- a/JavaAntProjectResource.st	Thu Jan 17 11:22:15 2013 +0000
+++ b/JavaAntProjectResource.st	Fri Jan 18 22:38:54 2013 +0000
@@ -191,3 +191,4 @@
 version_SVN
     ^ '§Id§'
 ! !
+

--- a/JavaByteCodeProcessorTests.st	Thu Jan 17 11:22:15 2013 +0000
+++ b/JavaByteCodeProcessorTests.st	Fri Jan 18 22:38:54 2013 +0000
@@ -121,3 +121,4 @@
 version_SVN
     ^ '§Id§'
 ! !
+

--- a/JavaRefsAndConstantPoolTestCase.st	Thu Jan 17 11:22:15 2013 +0000
+++ b/JavaRefsAndConstantPoolTestCase.st	Fri Jan 18 22:38:54 2013 +0000
@@ -403,3 +403,4 @@
 version_SVN
     ^ '§Id§'
 ! !
+

--- a/JavaTestCaseProxy.st	Thu Jan 17 11:22:15 2013 +0000
+++ b/JavaTestCaseProxy.st	Fri Jan 18 22:38:54 2013 +0000
@@ -209,4 +209,5 @@
     ^ '§Id§'
 ! !
 
+
 JavaTestCaseProxy initialize!

--- a/Make.proto	Thu Jan 17 11:22:15 2013 +0000
+++ b/Make.proto	Fri Jan 18 22:38:54 2013 +0000
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libhtml
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg2
 
 
 # if you need any additional defines for embedded C code,
@@ -132,23 +132,22 @@
 postMake:: cleanjunk
 
 prereq: $(REQUIRED_SUPPORT_DIRS)
+	cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
@@ -180,6 +179,7 @@
 $(OUTDIR)JavaClassQuery.$(O) JavaClassQuery.$(H): JavaClassQuery.st $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClassRegistry.$(O) JavaClassRegistry.$(H): JavaClassRegistry.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClassReloader.$(O) JavaClassReloader.$(H): JavaClassReloader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeLibraryOrBundle.$(O) JavaCodeLibraryOrBundle.$(H): JavaCodeLibraryOrBundle.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaCompiler_Eclipse.$(O) JavaCompiler_Eclipse.$(H): JavaCompiler_Eclipse.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaConstantPool.$(O) JavaConstantPool.$(H): JavaConstantPool.st $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaConstants.$(O) JavaConstants.$(H): JavaConstants.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -243,6 +243,8 @@
 $(OUTDIR)JavaClassContentRef2.$(O) JavaClassContentRef2.$(H): JavaClassContentRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClassReader.$(O) JavaClassReader.$(H): JavaClassReader.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClassRef2.$(O) JavaClassRef2.$(H): JavaClassRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeBundle.$(O) JavaCodeBundle.$(H): JavaCodeBundle.st $(INCLUDE_TOP)/stx/libjava/JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeLibrary.$(O) JavaCodeLibrary.$(H): JavaCodeLibrary.st $(INCLUDE_TOP)/stx/libjava/JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaEmbeddedFrameView.$(O) JavaEmbeddedFrameView.$(H): JavaEmbeddedFrameView.st $(INCLUDE_TOP)/stx/libjava/JavaView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaFieldAnnotationContainer.$(O) JavaFieldAnnotationContainer.$(H): JavaFieldAnnotationContainer.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaFieldDescriptor.$(O) JavaFieldDescriptor.$(H): JavaFieldDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -280,7 +282,7 @@
 $(OUTDIR)ProxyMethodJavaMethodInvocationNode.$(O) ProxyMethodJavaMethodInvocationNode.$(H): ProxyMethodJavaMethodInvocationNode.st $(INCLUDE_TOP)/stx/libjava/ProxyMethodMethodInvocationNode.$(H) $(INCLUDE_TOP)/stx/libjava/ProxyMethodInvocationNode.$(H) $(INCLUDE_TOP)/stx/libjava/ProxyMethodNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ProxyMethodJavaTypeCheckNode.$(O) ProxyMethodJavaTypeCheckNode.$(H): ProxyMethodJavaTypeCheckNode.st $(INCLUDE_TOP)/stx/libjava/ProxyMethodTypeCheckNode.$(H) $(INCLUDE_TOP)/stx/libjava/ProxyMethodConditionNode.$(H) $(INCLUDE_TOP)/stx/libjava/ProxyMethodNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaNativeMethod.$(O) JavaNativeMethod.$(H): JavaNativeMethod.st $(INCLUDE_TOP)/stx/libjava/JavaMethodWithHandler.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMethodWithException.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMethod.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/BooleanArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/BitArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/Delay.$(H) $(INCLUDE_TOP)/stx/libbasic/Process.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/SmallInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic3/WrappedMethod.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractNumberVector.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedLongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedWordArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ProgrammingLanguage.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Semaphore.$(H) $(INCLUDE_TOP)/stx/libbasic2/Socket.$(H) $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/BooleanArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/BitArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/Delay.$(H) $(INCLUDE_TOP)/stx/libbasic/Process.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/SmallInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic3/WrappedMethod.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractNumberVector.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedLongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SignedWordArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ProgrammingLanguage.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Semaphore.$(H) $(INCLUDE_TOP)/stx/libbasic2/Socket.$(H) $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 

--- a/Make.spec	Thu Jan 17 11:22:15 2013 +0000
+++ b/Make.spec	Fri Jan 18 22:38:54 2013 +0000
@@ -168,134 +168,134 @@
 	JavaClassQuery \
 	JavaCodeLibraryOrBundle \
 	JavaCodeBundle \
+	JavaRootBundle \
 	JavaCodeLibrary \
-	JavaRootBundle \
 
 
 
 
 COMMON_OBJS= \
-    $(OUTDIR)GroovyCompiler.$(O) \
-    $(OUTDIR)GroovyEvaluator.$(O) \
-    $(OUTDIR)GroovyLanguage.$(O) \
-    $(OUTDIR)GroovySourceFileWriter.$(O) \
-    $(OUTDIR)Java.$(O) \
-    $(OUTDIR)JavaAnnotation.$(O) \
-    $(OUTDIR)JavaAnnotationContainer.$(O) \
-    $(OUTDIR)JavaAnnotationDefault.$(O) \
-    $(OUTDIR)JavaAnnotationDictionary.$(O) \
-    $(OUTDIR)JavaAnnotationValue.$(O) \
-    $(OUTDIR)JavaArray.$(O) \
-    $(OUTDIR)JavaByte.$(O) \
-    $(OUTDIR)JavaByteCodeProcessor.$(O) \
-    $(OUTDIR)JavaClassAccessor.$(O) \
-    $(OUTDIR)JavaClassRegistry.$(O) \
-    $(OUTDIR)JavaClassReloader.$(O) \
-    $(OUTDIR)JavaConstantPool.$(O) \
-    $(OUTDIR)JavaConstants.$(O) \
-    $(OUTDIR)JavaContext.$(O) \
-    $(OUTDIR)JavaDecompiler.$(O) \
-    $(OUTDIR)JavaDescriptor.$(O) \
-    $(OUTDIR)JavaError.$(O) \
-    $(OUTDIR)JavaExceptionTableEntry.$(O) \
-    $(OUTDIR)JavaField.$(O) \
-    $(OUTDIR)JavaLanguage.$(O) \
-    $(OUTDIR)JavaLibraries.$(O) \
-    $(OUTDIR)JavaLocalVariableTable.$(O) \
-    $(OUTDIR)JavaLocalVariableTableEntry.$(O) \
-    $(OUTDIR)JavaLookup.$(O) \
-    $(OUTDIR)JavaMathSupport.$(O) \
-    $(OUTDIR)JavaMonitor.$(O) \
-    $(OUTDIR)JavaNameAndType2.$(O) \
-    $(OUTDIR)JavaNativeMemory.$(O) \
-    $(OUTDIR)JavaObject.$(O) \
-    $(OUTDIR)JavaObjectDictionary.$(O) \
-    $(OUTDIR)JavaPackage.$(O) \
-    $(OUTDIR)JavaPopUpView.$(O) \
-    $(OUTDIR)JavaProcess.$(O) \
-    $(OUTDIR)JavaRef2.$(O) \
-    $(OUTDIR)JavaRelease.$(O) \
-    $(OUTDIR)JavaResolver.$(O) \
-    $(OUTDIR)JavaShort.$(O) \
-    $(OUTDIR)JavaSlotIndexCache.$(O) \
-    $(OUTDIR)JavaSocket.$(O) \
-    $(OUTDIR)JavaSourceCodeCache.$(O) \
-    $(OUTDIR)JavaSourceFileWriter.$(O) \
-    $(OUTDIR)JavaStartup.$(O) \
-    $(OUTDIR)JavaTestsLoader.$(O) \
-    $(OUTDIR)JavaTopView.$(O) \
-    $(OUTDIR)JavaUnresolvedConstant.$(O) \
-    $(OUTDIR)JavaUtilities.$(O) \
-    $(OUTDIR)JavaView.$(O) \
-    $(OUTDIR)JavaZipSupport.$(O) \
-    $(OUTDIR)PPJavaNode.$(O) \
-    $(OUTDIR)ProxyMethod.$(O) \
-    $(OUTDIR)ProxyMethodCompiler.$(O) \
-    $(OUTDIR)ProxyMethodNode.$(O) \
-    $(OUTDIR)SmalltalkAppletContext.$(O) \
-    $(OUTDIR)SmalltalkAppletStub.$(O) \
-    $(OUTDIR)stx_libjava.$(O) \
-    $(OUTDIR)JavaAnnotationArrayValue.$(O) \
-    $(OUTDIR)JavaAnnotationClassValue.$(O) \
-    $(OUTDIR)JavaAnnotationEnumValue.$(O) \
-    $(OUTDIR)JavaAnnotationNestedAnnotationValue.$(O) \
-    $(OUTDIR)JavaAnnotationPrimitiveValue.$(O) \
-    $(OUTDIR)JavaBehavior.$(O) \
-    $(OUTDIR)JavaByteCodeDisassembler.$(O) \
-    $(OUTDIR)JavaByteCodeEnumerator.$(O) \
-    $(OUTDIR)JavaByteCodeProcessorAdapter.$(O) \
-    $(OUTDIR)JavaClassAnnotationContainer.$(O) \
-    $(OUTDIR)JavaClassContentRef2.$(O) \
-    $(OUTDIR)JavaClassReader.$(O) \
-    $(OUTDIR)JavaClassRef2.$(O) \
-    $(OUTDIR)JavaEmbeddedFrameView.$(O) \
-    $(OUTDIR)JavaFieldAnnotationContainer.$(O) \
-    $(OUTDIR)JavaFieldDescriptor.$(O) \
-    $(OUTDIR)JavaFieldDescriptorWithUnionType.$(O) \
-    $(OUTDIR)JavaInvalidRefError.$(O) \
-    $(OUTDIR)JavaMethod.$(O) \
-    $(OUTDIR)JavaMethodAnnotationContainer.$(O) \
-    $(OUTDIR)JavaMethodDeclarationNode.$(O) \
-    $(OUTDIR)JavaMethodDescriptor.$(O) \
-    $(OUTDIR)JavaStringRef2.$(O) \
-    $(OUTDIR)JavaUnhandledExceptionError.$(O) \
-    $(OUTDIR)JavaUnresolvedClassConstant.$(O) \
-    $(OUTDIR)JavaUnresolvedStringConstant.$(O) \
-    $(OUTDIR)JavaVM.$(O) \
-    $(OUTDIR)JavadocDeclarationNode.$(O) \
-    $(OUTDIR)ProxyMethodConditionNode.$(O) \
-    $(OUTDIR)ProxyMethodGuardNode.$(O) \
-    $(OUTDIR)ProxyMethodInvocationNode.$(O) \
-    $(OUTDIR)JavaByteCodePreresolver.$(O) \
-    $(OUTDIR)JavaClass.$(O) \
-    $(OUTDIR)JavaFieldRef2.$(O) \
-    $(OUTDIR)JavaMethodRef2.$(O) \
-    $(OUTDIR)JavaMethodWithException.$(O) \
-    $(OUTDIR)ProxyMethodAndNode.$(O) \
-    $(OUTDIR)ProxyMethodBlockInvocationNode.$(O) \
-    $(OUTDIR)ProxyMethodMethodInvocationNode.$(O) \
-    $(OUTDIR)ProxyMethodTypeCheckNode.$(O) \
-    $(OUTDIR)GroovyClass.$(O) \
-    $(OUTDIR)JavaInterfaceMethodRef2.$(O) \
-    $(OUTDIR)JavaMethodWithHandler.$(O) \
-    $(OUTDIR)ProxyMethodJavaMethodInvocationNode.$(O) \
-    $(OUTDIR)ProxyMethodJavaTypeCheckNode.$(O) \
-    $(OUTDIR)JavaNativeMethod.$(O) \
-    $(OUTDIR)ProxyMethodJavaFieldAccessor.$(O) \
-    $(OUTDIR)ProxyMethodJavaFieldGetter.$(O) \
-    $(OUTDIR)ProxyMethodJavaFieldSetter.$(O) \
-    $(OUTDIR)JavaCompiler_Eclipse.$(O) \
-    $(OUTDIR)JavaMetaclass.$(O) \
-    $(OUTDIR)GroovyMetaclass.$(O) \
-    $(OUTDIR)JavaNioSupport.$(O) \
-    $(OUTDIR)JavaFinalizationRegistry.$(O) \
-    $(OUTDIR)JavaMirror.$(O) \
-    $(OUTDIR)JavaClassQuery.$(O) \
-    $(OUTDIR)JavaCodeLibraryOrBundle.$(O) \
-    $(OUTDIR)JavaCodeBundle.$(O) \
-    $(OUTDIR)JavaCodeLibrary.$(O) \
-    $(OUTDIR)JavaRootBundle.$(O) \
-    $(OUTDIR)extensions.$(O) \
+    $(OUTDIR_SLASH)GroovyCompiler.$(O) \
+    $(OUTDIR_SLASH)GroovyEvaluator.$(O) \
+    $(OUTDIR_SLASH)GroovyLanguage.$(O) \
+    $(OUTDIR_SLASH)GroovySourceFileWriter.$(O) \
+    $(OUTDIR_SLASH)Java.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotation.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationContainer.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationDefault.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationDictionary.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationValue.$(O) \
+    $(OUTDIR_SLASH)JavaArray.$(O) \
+    $(OUTDIR_SLASH)JavaByte.$(O) \
+    $(OUTDIR_SLASH)JavaByteCodeProcessor.$(O) \
+    $(OUTDIR_SLASH)JavaClassAccessor.$(O) \
+    $(OUTDIR_SLASH)JavaClassRegistry.$(O) \
+    $(OUTDIR_SLASH)JavaClassReloader.$(O) \
+    $(OUTDIR_SLASH)JavaConstantPool.$(O) \
+    $(OUTDIR_SLASH)JavaConstants.$(O) \
+    $(OUTDIR_SLASH)JavaContext.$(O) \
+    $(OUTDIR_SLASH)JavaDecompiler.$(O) \
+    $(OUTDIR_SLASH)JavaDescriptor.$(O) \
+    $(OUTDIR_SLASH)JavaError.$(O) \
+    $(OUTDIR_SLASH)JavaExceptionTableEntry.$(O) \
+    $(OUTDIR_SLASH)JavaField.$(O) \
+    $(OUTDIR_SLASH)JavaLanguage.$(O) \
+    $(OUTDIR_SLASH)JavaLibraries.$(O) \
+    $(OUTDIR_SLASH)JavaLocalVariableTable.$(O) \
+    $(OUTDIR_SLASH)JavaLocalVariableTableEntry.$(O) \
+    $(OUTDIR_SLASH)JavaLookup.$(O) \
+    $(OUTDIR_SLASH)JavaMathSupport.$(O) \
+    $(OUTDIR_SLASH)JavaMonitor.$(O) \
+    $(OUTDIR_SLASH)JavaNameAndType2.$(O) \
+    $(OUTDIR_SLASH)JavaNativeMemory.$(O) \
+    $(OUTDIR_SLASH)JavaObject.$(O) \
+    $(OUTDIR_SLASH)JavaObjectDictionary.$(O) \
+    $(OUTDIR_SLASH)JavaPackage.$(O) \
+    $(OUTDIR_SLASH)JavaPopUpView.$(O) \
+    $(OUTDIR_SLASH)JavaProcess.$(O) \
+    $(OUTDIR_SLASH)JavaRef2.$(O) \
+    $(OUTDIR_SLASH)JavaRelease.$(O) \
+    $(OUTDIR_SLASH)JavaResolver.$(O) \
+    $(OUTDIR_SLASH)JavaShort.$(O) \
+    $(OUTDIR_SLASH)JavaSlotIndexCache.$(O) \
+    $(OUTDIR_SLASH)JavaSocket.$(O) \
+    $(OUTDIR_SLASH)JavaSourceCodeCache.$(O) \
+    $(OUTDIR_SLASH)JavaSourceFileWriter.$(O) \
+    $(OUTDIR_SLASH)JavaStartup.$(O) \
+    $(OUTDIR_SLASH)JavaTestsLoader.$(O) \
+    $(OUTDIR_SLASH)JavaTopView.$(O) \
+    $(OUTDIR_SLASH)JavaUnresolvedConstant.$(O) \
+    $(OUTDIR_SLASH)JavaUtilities.$(O) \
+    $(OUTDIR_SLASH)JavaView.$(O) \
+    $(OUTDIR_SLASH)JavaZipSupport.$(O) \
+    $(OUTDIR_SLASH)PPJavaNode.$(O) \
+    $(OUTDIR_SLASH)ProxyMethod.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodCompiler.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodNode.$(O) \
+    $(OUTDIR_SLASH)SmalltalkAppletContext.$(O) \
+    $(OUTDIR_SLASH)SmalltalkAppletStub.$(O) \
+    $(OUTDIR_SLASH)stx_libjava.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationArrayValue.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationClassValue.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationEnumValue.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationNestedAnnotationValue.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationPrimitiveValue.$(O) \
+    $(OUTDIR_SLASH)JavaBehavior.$(O) \
+    $(OUTDIR_SLASH)JavaByteCodeDisassembler.$(O) \
+    $(OUTDIR_SLASH)JavaByteCodeEnumerator.$(O) \
+    $(OUTDIR_SLASH)JavaByteCodeProcessorAdapter.$(O) \
+    $(OUTDIR_SLASH)JavaClassAnnotationContainer.$(O) \
+    $(OUTDIR_SLASH)JavaClassContentRef2.$(O) \
+    $(OUTDIR_SLASH)JavaClassReader.$(O) \
+    $(OUTDIR_SLASH)JavaClassRef2.$(O) \
+    $(OUTDIR_SLASH)JavaEmbeddedFrameView.$(O) \
+    $(OUTDIR_SLASH)JavaFieldAnnotationContainer.$(O) \
+    $(OUTDIR_SLASH)JavaFieldDescriptor.$(O) \
+    $(OUTDIR_SLASH)JavaFieldDescriptorWithUnionType.$(O) \
+    $(OUTDIR_SLASH)JavaInvalidRefError.$(O) \
+    $(OUTDIR_SLASH)JavaMethod.$(O) \
+    $(OUTDIR_SLASH)JavaMethodAnnotationContainer.$(O) \
+    $(OUTDIR_SLASH)JavaMethodDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)JavaMethodDescriptor.$(O) \
+    $(OUTDIR_SLASH)JavaStringRef2.$(O) \
+    $(OUTDIR_SLASH)JavaUnhandledExceptionError.$(O) \
+    $(OUTDIR_SLASH)JavaUnresolvedClassConstant.$(O) \
+    $(OUTDIR_SLASH)JavaUnresolvedStringConstant.$(O) \
+    $(OUTDIR_SLASH)JavaVM.$(O) \
+    $(OUTDIR_SLASH)JavadocDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodConditionNode.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodGuardNode.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodInvocationNode.$(O) \
+    $(OUTDIR_SLASH)JavaByteCodePreresolver.$(O) \
+    $(OUTDIR_SLASH)JavaClass.$(O) \
+    $(OUTDIR_SLASH)JavaFieldRef2.$(O) \
+    $(OUTDIR_SLASH)JavaMethodRef2.$(O) \
+    $(OUTDIR_SLASH)JavaMethodWithException.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodAndNode.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodBlockInvocationNode.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodMethodInvocationNode.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodTypeCheckNode.$(O) \
+    $(OUTDIR_SLASH)GroovyClass.$(O) \
+    $(OUTDIR_SLASH)JavaInterfaceMethodRef2.$(O) \
+    $(OUTDIR_SLASH)JavaMethodWithHandler.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodJavaMethodInvocationNode.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodJavaTypeCheckNode.$(O) \
+    $(OUTDIR_SLASH)JavaNativeMethod.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodJavaFieldAccessor.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodJavaFieldGetter.$(O) \
+    $(OUTDIR_SLASH)ProxyMethodJavaFieldSetter.$(O) \
+    $(OUTDIR_SLASH)JavaCompiler_Eclipse.$(O) \
+    $(OUTDIR_SLASH)JavaMetaclass.$(O) \
+    $(OUTDIR_SLASH)GroovyMetaclass.$(O) \
+    $(OUTDIR_SLASH)JavaNioSupport.$(O) \
+    $(OUTDIR_SLASH)JavaFinalizationRegistry.$(O) \
+    $(OUTDIR_SLASH)JavaMirror.$(O) \
+    $(OUTDIR_SLASH)JavaClassQuery.$(O) \
+    $(OUTDIR_SLASH)JavaCodeLibraryOrBundle.$(O) \
+    $(OUTDIR_SLASH)JavaCodeBundle.$(O) \
+    $(OUTDIR_SLASH)JavaRootBundle.$(O) \
+    $(OUTDIR_SLASH)JavaCodeLibrary.$(O) \
+    $(OUTDIR_SLASH)extensions.$(O) \
 
 
 

--- a/Makefile	Thu Jan 17 11:22:15 2013 +0000
+++ b/Makefile	Fri Jan 18 22:38:54 2013 +0000
@@ -15,5 +15,7 @@
 #only needed for the definition of $(TOP)
 include Make.proto
 
-makefile:
+makefile: mf
+
+mf:
 	$(TOP)/rules/stmkmf

--- a/abbrev.stc	Thu Jan 17 11:22:15 2013 +0000
+++ b/abbrev.stc	Fri Jan 18 22:38:54 2013 +0000
@@ -144,4 +144,7 @@
 JavaLookupResolutionAlgorithmTests JavaLookupResolutionAlgorithmTests stx:libjava 'Languages-Java-Tests-Interop' 1
 JavaLookupTests JavaLookupTests stx:libjava 'Languages-Java-Tests-Interop' 1
 JavaLookupTestsResource JavaLookupTestsResource stx:libjava 'Languages-Java-Tests-Interop' 3
+JavaCodeLibraryOrBundle JavaCodeLibraryOrBundle stx:libjava 'Languages-Java-Support-Libraries' 0
+JavaCodeBundle JavaCodeBundle stx:libjava 'Languages-Java-Support-Libraries' 0
 JavaRootBundle JavaRootBundle stx:libjava 'Languages-Java-Support-Libraries' 0
+JavaCodeLibrary JavaCodeLibrary stx:libjava 'Languages-Java-Support-Libraries' 0

--- a/bc.mak	Thu Jan 17 11:22:15 2013 +0000
+++ b/bc.mak	Fri Jan 18 22:38:54 2013 +0000
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libwidg2 -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libhtml
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg2
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -50,23 +50,22 @@
 
 # build all prerequisite packages for this package
 prereq:
+	pushd ..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
@@ -114,6 +113,7 @@
 $(OUTDIR)JavaClassQuery.$(O) JavaClassQuery.$(H): JavaClassQuery.st $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClassRegistry.$(O) JavaClassRegistry.$(H): JavaClassRegistry.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClassReloader.$(O) JavaClassReloader.$(H): JavaClassReloader.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeLibraryOrBundle.$(O) JavaCodeLibraryOrBundle.$(H): JavaCodeLibraryOrBundle.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaCompiler_Eclipse.$(O) JavaCompiler_Eclipse.$(H): JavaCompiler_Eclipse.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaConstantPool.$(O) JavaConstantPool.$(H): JavaConstantPool.st $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaConstants.$(O) JavaConstants.$(H): JavaConstants.st $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -177,6 +177,8 @@
 $(OUTDIR)JavaClassContentRef2.$(O) JavaClassContentRef2.$(H): JavaClassContentRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClassReader.$(O) JavaClassReader.$(H): JavaClassReader.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaClassRef2.$(O) JavaClassRef2.$(H): JavaClassRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeBundle.$(O) JavaCodeBundle.$(H): JavaCodeBundle.st $(INCLUDE_TOP)\stx\libjava\JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeLibrary.$(O) JavaCodeLibrary.$(H): JavaCodeLibrary.st $(INCLUDE_TOP)\stx\libjava\JavaCodeLibraryOrBundle.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaEmbeddedFrameView.$(O) JavaEmbeddedFrameView.$(H): JavaEmbeddedFrameView.st $(INCLUDE_TOP)\stx\libjava\JavaView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaFieldAnnotationContainer.$(O) JavaFieldAnnotationContainer.$(H): JavaFieldAnnotationContainer.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaFieldDescriptor.$(O) JavaFieldDescriptor.$(H): JavaFieldDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -214,7 +216,7 @@
 $(OUTDIR)ProxyMethodJavaMethodInvocationNode.$(O) ProxyMethodJavaMethodInvocationNode.$(H): ProxyMethodJavaMethodInvocationNode.st $(INCLUDE_TOP)\stx\libjava\ProxyMethodMethodInvocationNode.$(H) $(INCLUDE_TOP)\stx\libjava\ProxyMethodInvocationNode.$(H) $(INCLUDE_TOP)\stx\libjava\ProxyMethodNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ProxyMethodJavaTypeCheckNode.$(O) ProxyMethodJavaTypeCheckNode.$(H): ProxyMethodJavaTypeCheckNode.st $(INCLUDE_TOP)\stx\libjava\ProxyMethodTypeCheckNode.$(H) $(INCLUDE_TOP)\stx\libjava\ProxyMethodConditionNode.$(H) $(INCLUDE_TOP)\stx\libjava\ProxyMethodNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaNativeMethod.$(O) JavaNativeMethod.$(H): JavaNativeMethod.st $(INCLUDE_TOP)\stx\libjava\JavaMethodWithHandler.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMethodWithException.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMethod.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\BooleanArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\BitArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\Delay.$(H) $(INCLUDE_TOP)\stx\libbasic\Process.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\SmallInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic3\WrappedMethod.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic2\ZipArchive.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libbasic\DoubleArray.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractNumberVector.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\FloatArray.$(H) $(INCLUDE_TOP)\stx\libbasic\LargeInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ShortFloat.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedLongIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedWordArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic2\WordArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ProgrammingLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Semaphore.$(H) $(INCLUDE_TOP)\stx\libbasic2\Socket.$(H) $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\BooleanArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\BitArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\Delay.$(H) $(INCLUDE_TOP)\stx\libbasic\Process.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\SmallInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic3\WrappedMethod.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic2\ZipArchive.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libbasic\DoubleArray.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractNumberVector.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\FloatArray.$(H) $(INCLUDE_TOP)\stx\libbasic\LargeInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ShortFloat.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedLongIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SignedWordArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic2\WordArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ProgrammingLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Semaphore.$(H) $(INCLUDE_TOP)\stx\libbasic2\Socket.$(H) $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 

--- a/extensions.st	Thu Jan 17 11:22:15 2013 +0000
+++ b/extensions.st	Fri Jan 18 22:38:54 2013 +0000
@@ -1713,6 +1713,14 @@
     "Modified: / 08-02-2011 / 01:08:15 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
+!String class methodsFor:'accessing'!
+
+javaName
+    ^ '[C'
+
+    "Created: / 18-01-2013 / 22:27:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !UndefinedObject class methodsFor:'queries'!
 
 isJavaPrimitiveType

--- a/libjava.rc	Thu Jan 17 11:22:15 2013 +0000
+++ b/libjava.rc	Fri Jan 18 22:38:54 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, 16 Jan 2013 13:35:24 GMT\0"
+      VALUE "ProductDate", "Fri, 18 Jan 2013 22:35:25 GMT\0"
     END
 
   END

--- a/stx_libjava.st	Thu Jan 17 11:22:15 2013 +0000
+++ b/stx_libjava.st	Fri Jan 18 22:38:54 2013 +0000
@@ -20,7 +20,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-LibraryDefinition subclass:#'stx_libjava'
+LibraryDefinition subclass:#stx_libjava
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -160,16 +160,16 @@
 
     ^ #(
         #'stx:goodies/sunit'    "TestSuite - referenced by stx_libjava class>>testSuite "
-        #'stx:libbasic'    "IdentityDictionary - superclass of extended UserPreferences "
-        #'stx:libbasic2'    "UnboxedIntegerArray - superclass of extended WordArray "
+        #'stx:libbasic'    "ClassDescription - superclass of JavaMetaclass "
+        #'stx:libbasic2'    "BitArray - superclass of extended BooleanArray "
         #'stx:libbasic3'    "MessageTracer - referenced by JavaMethod>>setBreakPoint "
-        #'stx:libcomp'    "StatementNode - referenced by ProxyMethodGuardNode>>generate: "
+        #'stx:libcomp'    "MessageNode - referenced by ProxyMethodGuardNode>>generate: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-        #'stx:libtool'    "WorkspaceApplication - referenced by GroovyEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
-        #'stx:libview'    "SimpleView - superclass of JavaEmbeddedFrameView "
+        #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
+        #'stx:libview'    "StandardSystemView - superclass of JavaTopView "
         #'stx:libview2'    "GIFReader - referenced by JavaVM class>>_GifImageDecoder_parseImage: "
-        #'stx:libwidg'    "HorizontalScrollBar - referenced by JavaVM class>>_WScrollPanePeer__getHScrollbarHeight: "
-        #'stx:libwidg2'    "MenuPanel - referenced by JavaVM class>>processEvent: "
+        #'stx:libwidg'    "TextView - referenced by JavaVM class>>processEvent: "
+        #'stx:libwidg2'    "CheckBox - referenced by JavaVM class>>_WCheckboxPeer_create: "
     )
 ! !
 
@@ -411,8 +411,13 @@
         (JavaLookupResolutionAlgorithmTests autoload)
         (JavaLookupTests autoload)
         (JavaLookupTestsResource autoload)
+        JavaCodeLibraryOrBundle
+        JavaCodeBundle
         JavaRootBundle
+        JavaCodeLibrary
     )
+
+    "Modified: / 18-01-2013 / 22:35:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 extensionMethodNames
@@ -578,9 +583,8 @@
         CharacterArray withoutSuffix:
         ExecutableFunction isProxyMethod
         'ProjectDefinition class' javaBundle
+        'String class' javaName
     )
-
-    "Modified: / 16-01-2013 / 13:31:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !stx_libjava class methodsFor:'description - java'!
@@ -600,9 +604,7 @@
     ^#()
 
     "Created: / 15-01-2013 / 18:04:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
- !
+! !
 
 !stx_libjava class methodsFor:'description - project information'!
 
@@ -689,3 +691,4 @@
 version_SVN
     ^ '§Id§'
 ! !
+