Oops, moved stray reloading-related methods from stx:libjava/experiments to stx:libjava.
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 20 Jan 2015 10:41:54 +0100
changeset 3330 b14c58b2876c
parent 3329 4c3b0badaa5f
child 3331 ee36f2088d60
Oops, moved stray reloading-related methods from stx:libjava/experiments to stx:libjava.
GroovyEvaluatorTests.st
JUnitTestCaseProxy.st
JavaAntProjectResource.st
JavaByteCodeDisassemblerTests.st
JavaByteCodeProcessorTests.st
JavaClassLoadingTests.st
JavaClassReaderTests.st
JavaClassRefTests.st
JavaClassReloader.st
JavaExceptionTests.st
JavaFieldRefTests.st
JavaFreshlyInitializedResource.st
JavaInitializedResource.st
JavaInterfaceMethodRefTests.st
JavaJUnitTests.st
JavaLibrariesResource.st
JavaLookupResolutionAlgorithmTests.st
JavaLookupTests.st
JavaMethodRefTests.st
JavaMonitorsTests.st
JavaNativeMemoryTests.st
JavaRefMock.st
JavaRefsAndConstantPoolTestCase.st
JavaReleaseTests.st
JavaRuntimeConstantPoolTests.st
JavaStringRef2.st
JavaTestCaseProxy.st
JavaTestsResource.st
JavaThreadingTests.st
JavaUTF8Tests.st
Make.proto
TestletTestCaseProxy.st
experiments/JavaByteCodeInterpreterTests.st
experiments/JavaClassReloaderTests.st
experiments/Make.proto
experiments/Make.spec
experiments/abbrev.stc
experiments/bc.mak
experiments/experiments.rc
experiments/extensions.st
experiments/libInit.cc
experiments/stx_libjava_experiments.st
libjava.rc
stx_libjava.st
tools/JavaCompilerTests.st
tools/stx_libjava_tools.st
tools/tools.rc
--- a/GroovyEvaluatorTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/GroovyEvaluatorTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#GroovyEvaluatorTests
 	instanceVariableNames:'savedWorkspaceVariables'
 	classVariableNames:''
--- a/JUnitTestCaseProxy.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JUnitTestCaseProxy.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaTestCaseProxy subclass:#JUnitTestCaseProxy
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaAntProjectResource.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaAntProjectResource.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestResource subclass:#JavaAntProjectResource
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaByteCodeDisassemblerTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaByteCodeDisassemblerTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaByteCodeProcessorTests subclass:#JavaByteCodeDisassemblerTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaByteCodeProcessorTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaByteCodeProcessorTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaByteCodeProcessorTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaClassLoadingTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaClassLoadingTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaClassLoadingTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaClassReaderTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaClassReaderTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaRefsAndConstantPoolTestCase subclass:#JavaClassReaderTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaClassRefTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaClassRefTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaRefsAndConstantPoolTestCase subclass:#JavaClassRefTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaClassReloader.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaClassReloader.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#JavaClassReloader
 	instanceVariableNames:''
 	classVariableNames:''
@@ -109,6 +111,13 @@
     "Modified (comment): / 14-09-2013 / 15:51:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+unload: oldClass 
+    "Remove oldClass from the system"
+    ^ self new unload: oldClass
+
+    "Created: / 14-09-2013 / 15:52:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 unload: oldClass ignoring: ignoredClasses
     "Remove oldClass from the system"
     ^ self new unload: oldClass ignoring: ignoredClasses
--- a/JavaExceptionTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaExceptionTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaExceptionTests
 	instanceVariableNames:'signal'
 	classVariableNames:''
@@ -65,7 +67,6 @@
     "Created: / 30-03-2012 / 13:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaExceptionTests methodsFor:'callbacks'!
 
 call: trhower with: aBoolean 
--- a/JavaFieldRefTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaFieldRefTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaRefsAndConstantPoolTestCase subclass:#JavaFieldRefTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaFreshlyInitializedResource.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaFreshlyInitializedResource.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestResource subclass:#JavaFreshlyInitializedResource
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaInitializedResource.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaInitializedResource.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaAntProjectResource subclass:#JavaInitializedResource
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaInterfaceMethodRefTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaInterfaceMethodRefTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaRefsAndConstantPoolTestCase subclass:#JavaInterfaceMethodRefTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaJUnitTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaJUnitTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaJUnitTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaLibrariesResource.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaLibrariesResource.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestResource subclass:#JavaLibrariesResource
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaLookupResolutionAlgorithmTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaLookupResolutionAlgorithmTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaLookupResolutionAlgorithmTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaLookupTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaLookupTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaLookupTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaMethodRefTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaMethodRefTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaRefsAndConstantPoolTestCase subclass:#JavaMethodRefTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaMonitorsTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaMonitorsTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaMonitorsTests
 	instanceVariableNames:'result reason thisProcess assertionAccess thisProcessAccess'
 	classVariableNames:''
--- a/JavaNativeMemoryTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaNativeMemoryTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaNativeMemoryTests
 	instanceVariableNames:'mem'
 	classVariableNames:''
--- a/JavaRefMock.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaRefMock.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaRef2 subclass:#JavaRefMock
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaRefsAndConstantPoolTestCase.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaRefsAndConstantPoolTestCase.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaRefsAndConstantPoolTestCase
 	instanceVariableNames:'exceptionThrowerBackup'
 	classVariableNames:''
--- a/JavaReleaseTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaReleaseTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaReleaseTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaRuntimeConstantPoolTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaRuntimeConstantPoolTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaRefsAndConstantPoolTestCase subclass:#JavaRuntimeConstantPoolTests
 	instanceVariableNames:'constantPoolCacheBackup'
 	classVariableNames:''
--- a/JavaStringRef2.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaStringRef2.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaRef2 subclass:#JavaStringRef2
 	instanceVariableNames:'valueIndex'
 	classVariableNames:''
@@ -118,6 +120,18 @@
     "Created: / 13-05-2011 / 17:20:22 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
+invalidateForClass: internalJavaClassName 
+    "Invalidates receiver iff it refers (even indirectly)
+     to a class ref that has been resolved to given class.
+     Returns true, if the receiver has been invalidated,
+     false otherwise"
+    
+    ^ false
+
+    "Created: / 13-05-2011 / 17:22:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 22-02-2012 / 20:52:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 name
     "dont use me, I'm here just because marcel was not sure he found and fixed all senders"
     self breakPoint: #mh.
--- a/JavaTestCaseProxy.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaTestCaseProxy.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaTestCaseProxy
 	instanceVariableNames:''
 	classVariableNames:'TestCases'
--- a/JavaTestsResource.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaTestsResource.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaAntProjectResource subclass:#JavaTestsResource
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaThreadingTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaThreadingTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaThreadingTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/JavaUTF8Tests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/JavaUTF8Tests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaUTF8Tests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/Make.proto	Tue Jan 20 09:42:35 2015 +0100
+++ b/Make.proto	Tue Jan 20 10:41:54 2015 +0100
@@ -72,7 +72,7 @@
 	ant -f java/build.xml 
 
 antIfPossible:
-	-ant -f java/build.xml
+	-ant -f java/build.xml 
 
 full::  ant
 
--- a/TestletTestCaseProxy.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/TestletTestCaseProxy.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaTestCaseProxy subclass:#TestletTestCaseProxy
 	instanceVariableNames:'harness'
 	classVariableNames:'TestCases'
--- a/experiments/JavaByteCodeInterpreterTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/JavaByteCodeInterpreterTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava/experiments' }"
 
+"{ NameSpace: Smalltalk }"
+
 JavaByteCodeProcessorTests subclass:#JavaByteCodeInterpreterTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/experiments/JavaClassReloaderTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/JavaClassReloaderTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libjava/experiments' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaClassReloaderTests
 	instanceVariableNames:'testClassLoader'
 	classVariableNames:''
--- a/experiments/Make.proto	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/Make.proto	Tue Jan 20 10:41:54 2015 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libjava
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libjava/tools
 
 
 # if you need any additional defines for embedded C code,
@@ -165,7 +165,6 @@
 $(OUTDIR)SetSample.$(O) SetSample.$(H): SetSample.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(STCHDR)
 $(OUTDIR)stx_libjava_experiments.$(O) stx_libjava_experiments.$(H): stx_libjava_experiments.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)JavaByteCodeSteppableInterpreter.$(O) JavaByteCodeSteppableInterpreter.$(H): JavaByteCodeSteppableInterpreter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)/stx/libjava/experiments/JavaByteCodeInterpreter.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaClassReloader.$(H) $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaStringRef2.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/experiments/Make.spec	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/Make.spec	Tue Jan 20 10:41:54 2015 +0100
@@ -72,7 +72,6 @@
     $(OUTDIR_SLASH)SetSample.$(O) \
     $(OUTDIR_SLASH)stx_libjava_experiments.$(O) \
     $(OUTDIR_SLASH)JavaByteCodeSteppableInterpreter.$(O) \
-    $(OUTDIR_SLASH)extensions.$(O) \
 
 
 
--- a/experiments/abbrev.stc	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/abbrev.stc	Tue Jan 20 10:41:54 2015 +0100
@@ -2,6 +2,7 @@
 # this file is needed for stc to be able to compile modules independently.
 # it provides information about a classes filename, category and especially namespace.
 JavaByteCodeInterpreter JavaByteCodeInterpreter stx:libjava/experiments 'Languages-Java-Bytecode' 0
+JavaClassReloaderTests JavaClassReloaderTests stx:libjava/experiments 'Languages-Java-Tests-ClassReloading' 1
 JavaMethodWrapperCompiler JavaMethodWrapperCompiler stx:libjava/experiments 'Languages-Java-Experiments-Lookup' 0
 NoReflectionObject NoReflectionObject stx:libjava/experiments 'Languages-Java-Experiments-Lookup' 0
 PersonSample PersonSample stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
@@ -11,4 +12,3 @@
 JavaByteCodeSteppableInterpreter JavaByteCodeSteppableInterpreter stx:libjava/experiments 'Languages-Java-Bytecode' 0
 Benchmarks::JavaLookup Benchmarks__JavaLookup stx:libjava/experiments 'benchmarks-Misc' 0
 JavaByteCodeInterpreterTests JavaByteCodeInterpreterTests stx:libjava/experiments 'Languages-Java-Tests' 1
-JavaClassReloaderTests JavaClassReloaderTests stx:libjava/experiments 'Languages-Java-Tests-ClassReloading' 1
--- a/experiments/bc.mak	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/bc.mak	Tue Jan 20 10:41:54 2015 +0100
@@ -35,7 +35,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libjava
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libjava\tools
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -90,7 +90,6 @@
 $(OUTDIR)SetSample.$(O) SetSample.$(H): SetSample.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(STCHDR)
 $(OUTDIR)stx_libjava_experiments.$(O) stx_libjava_experiments.$(H): stx_libjava_experiments.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)JavaByteCodeSteppableInterpreter.$(O) JavaByteCodeSteppableInterpreter.$(H): JavaByteCodeSteppableInterpreter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)\stx\libjava\experiments\JavaByteCodeInterpreter.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaClassReloader.$(H) $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaStringRef2.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/experiments/experiments.rc	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/experiments.rc	Tue Jan 20 10:41:54 2015 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava_experiments.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,32767,32767
+  FILEVERSION     6,2,4305,4305
   PRODUCTVERSION  6,2,5,0
 #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.32767.32767\0"
+      VALUE "FileVersion", "6.2.4305.4305\0"
       VALUE "InternalName", "stx:libjava/experiments\0"
-      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2014\nCopyright eXept Software AG 1998-2014\0"
+      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2015\nCopyright eXept Software AG 1998-2015\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.5.0\0"
-      VALUE "ProductDate", "Sat, 20 Dec 2014 00:46:16 GMT\0"
+      VALUE "ProductDate", "Tue, 20 Jan 2015 09:39:27 GMT\0"
     END
 
   END
--- a/experiments/extensions.st	Tue Jan 20 09:42:35 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-"{ Package: 'stx:libjava/experiments' }"!
-
-!JavaClassReloader class methodsFor:'reloading'!
-
-unload: oldClass 
-    "Remove oldClass from the system"
-    ^ self new unload: oldClass
-
-    "Created: / 14-09-2013 / 15:52:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaStringRef2 methodsFor:'accessing'!
-
-invalidateForClass: internalJavaClassName 
-    "Invalidates receiver iff it refers (even indirectly)
-     to a class ref that has been resolved to given class.
-     Returns true, if the receiver has been invalidated,
-     false otherwise"
-    
-    ^ false
-
-    "Created: / 13-05-2011 / 17:22:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 22-02-2012 / 20:52:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!stx_libjava_experiments class methodsFor:'documentation'!
-
-extensionsVersion_HG
-
-    ^ '$Changeset: <not expanded> $'
-! !
--- a/experiments/libInit.cc	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/libInit.cc	Tue Jan 20 10:41:54 2015 +0100
@@ -36,6 +36,6 @@
 _stx_137libjava_137experiments_Init(pass,__pRT__,snd);
 _JavaByteCodeSteppableInterpreter_Init(pass,__pRT__,snd);
 
-_stx_137libjava_137experiments_extensions_Init(pass,__pRT__,snd);
+
 __END_PACKAGE__();
 }
--- a/experiments/stx_libjava_experiments.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/experiments/stx_libjava_experiments.st	Tue Jan 20 10:41:54 2015 +0100
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libjava/experiments' }"
 
+"{ NameSpace: Smalltalk }"
+
 LibraryDefinition subclass:#stx_libjava_experiments
 	instanceVariableNames:''
 	classVariableNames:''
@@ -87,7 +89,7 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:libbasic'    "Collection - superclass of SetSample"
+        #'stx:libbasic'    "Autoload - superclass of Benchmarks::JavaLookup"
         #'stx:libjava'    "Java - superclass of JavaMethodWrapperCompiler"
     )
 !
@@ -192,9 +194,7 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
-        (#'Benchmarks::JavaLookup' autoload)
         JavaByteCodeInterpreter
-        (JavaByteCodeInterpreterTests autoload)
         (JavaClassReloaderTests autoload)
         JavaMethodWrapperCompiler
         NoReflectionObject
@@ -203,6 +203,8 @@
         SetSample
         #'stx_libjava_experiments'
         JavaByteCodeSteppableInterpreter
+        (#'Benchmarks::JavaLookup' autoload)
+        (JavaByteCodeInterpreterTests autoload)
     )
 !
 
@@ -211,8 +213,6 @@
      A correponding method with real names must be present in my concrete subclasses"
 
     ^ #(
-        JavaStringRef2 invalidateForClass:
-        'JavaClassReloader class' unload:
     )
 ! !
 
--- a/libjava.rc	Tue Jan 20 09:42:35 2015 +0100
+++ b/libjava.rc	Tue Jan 20 10:41:54 2015 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,32767,32767
+  FILEVERSION     6,2,4305,4305
   PRODUCTVERSION  6,2,5,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG & SWING Research Group\0"
       VALUE "FileDescription", "Java support for Smalltalk/X (LIB)\0"
-      VALUE "FileVersion", "6.2.32767.32767\0"
+      VALUE "FileVersion", "6.2.4305.4305\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\n          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.5.0\0"
-      VALUE "ProductDate", "Sat, 20 Dec 2014 00:46:14 GMT\0"
+      VALUE "ProductDate", "Tue, 20 Jan 2015 09:39:24 GMT\0"
     END
 
   END
--- a/stx_libjava.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/stx_libjava.st	Tue Jan 20 10:41:54 2015 +0100
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 LibraryDefinition subclass:#stx_libjava
 	instanceVariableNames:''
 	classVariableNames:''
@@ -308,7 +310,6 @@
         "<className> or (<className> attributes...) in load order"
         GroovyCompiler
         GroovyEvaluator
-        (GroovyEvaluatorTests autoload)
         GroovyLanguage
         GroovySourceFileWriter
         JavaAnnotation
@@ -316,15 +317,12 @@
         JavaAnnotationDefault
         JavaAnnotationDictionary
         JavaAnnotationValue
-        (JavaAntProjectResource autoload)
         JavaArray
         JavaBooleanArray
         JavaByte
         JavaByteCodeProcessor
-        (JavaByteCodeProcessorTests autoload)
         JavaClassAccessor
         JavaClassEnvironment
-        (JavaClassLoadingTests autoload)
         JavaClassQuery
         JavaClassReloader
         JavaCodeLibraryOrBundle
@@ -337,46 +335,33 @@
         JavaDescriptor
         JavaError
         JavaExceptionTable
-        (JavaExceptionTests autoload)
         JavaField
         JavaFinalizationRegistry
-        (JavaFreshlyInitializedResource autoload)
         JavaInnerClasses
-        (JavaJUnitTests autoload)
         JavaLanguage
         JavaLibraries
-        (JavaLibrariesResource autoload)
         JavaLocalVariableTable
         JavaLocalVariableTableEntry
         JavaLookup
-        (JavaLookupResolutionAlgorithmTests autoload)
-        (JavaLookupTests autoload)
         JavaMetaclass
         JavaMonitor
-        (JavaMonitorsTests autoload)
         JavaNameAndType2
         JavaNativeMemory
-        (JavaNativeMemoryTests autoload)
         JavaNioSupport
         JavaObject
         JavaObjectDictionary
         JavaPopUpView
         JavaProcess
         JavaRef2
-        (JavaRefsAndConstantPoolTestCase autoload)
         JavaRelease
-        (JavaReleaseTests autoload)
         JavaResolver
         JavaShort
         JavaSlotIndexCache
         JavaSocket
         JavaSourceCodeCache
         JavaSourceFileWriter
-        (JavaTestCaseProxy autoload)
         JavaTestsLoader
-        (JavaThreadingTests autoload)
         JavaTopView
-        (JavaUTF8Tests autoload)
         JavaUnresolvedCompilationError
         JavaUnresolvedConstant
         JavaUtilities
@@ -392,7 +377,6 @@
         SmalltalkAppletStub
         #'stx_libjava'
         GroovyMetaclass
-        (JUnitTestCaseProxy autoload)
         Java
         JavaAnnotationArrayValue
         JavaAnnotationClassValue
@@ -401,15 +385,12 @@
         JavaAnnotationPrimitiveValue
         JavaBehavior
         JavaByteCodeDisassembler
-        (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeEnumerator
         JavaByteCodeProcessorAdapter
         JavaClassAnnotationContainer
         JavaClassMemberRef2
         JavaClassReader
-        (JavaClassReaderTests autoload)
         JavaClassRef2
-        (JavaClassRefTests autoload)
         JavaClassRegistry
         JavaCodeBundle
         JavaCodeLibrary
@@ -417,23 +398,16 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
-        (JavaFieldRefTests autoload)
-        (JavaInitializedResource autoload)
-        (JavaInterfaceMethodRefTests autoload)
         JavaInvalidRefError
         JavaInvokeDynamic2
         JavaMethod
         JavaMethodAnnotationContainer
         JavaMethodDescriptor
         JavaMethodHandle2
-        (JavaMethodRefTests autoload)
         JavaMethodType2
         JavaMirror
         #'JavaNativeMethodImpl_OpenJDK6'
-        (JavaRefMock autoload)
-        (JavaRuntimeConstantPoolTests autoload)
         JavaStringRef2
-        (JavaTestsResource autoload)
         JavaUnhandledExceptionError
         JavaUnhandledThreadDeathError
         JavaUnresolvedClassConstant
@@ -443,7 +417,6 @@
         ProxyMethodGuardNode
         ProxyMethodInvocationNode
         ProxyMethodJavaFieldAccessor
-        (TestletTestCaseProxy autoload)
         JavaAlienMirror
         JavaArrayMirror
         JavaByteCodePreresolver
@@ -473,12 +446,36 @@
         ProxyMethodJavaTypeCheckNode
         JavaNativeMethod
         #'JavaNativeMethodImpl_OracleJDK8'
-        (JavaTestCaseProxy autoload)
-        (JavaRefsAndConstantPoolTestCase autoload)
+        (GroovyEvaluatorTests autoload)
+        (JUnitTestCaseProxy autoload)
+        (JavaAntProjectResource autoload)
         (JavaByteCodeDisassemblerTests autoload)
+        (JavaByteCodeProcessorTests autoload)
+        (JavaClassLoadingTests autoload)
+        (JavaClassReaderTests autoload)
+        (JavaClassRefTests autoload)
+        (JavaExceptionTests autoload)
+        (JavaFieldRefTests autoload)
+        (JavaFreshlyInitializedResource autoload)
+        (JavaInitializedResource autoload)
+        (JavaInterfaceMethodRefTests autoload)
+        (JavaJUnitTests autoload)
+        (JavaLibrariesResource autoload)
+        (JavaLookupResolutionAlgorithmTests autoload)
+        (JavaLookupTests autoload)
+        (JavaMethodRefTests autoload)
+        (JavaMonitorsTests autoload)
+        (JavaNativeMemoryTests autoload)
+        (JavaRefMock autoload)
+        (JavaRefsAndConstantPoolTestCase autoload)
+        (JavaReleaseTests autoload)
+        (JavaRuntimeConstantPoolTests autoload)
+        (JavaTestCaseProxy autoload)
+        (JavaTestsResource autoload)
+        (JavaThreadingTests autoload)
+        (JavaUTF8Tests autoload)
+        (TestletTestCaseProxy autoload)
     )
-
-    "Modified: / 07-12-2014 / 02:10:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 extensionMethodNames
@@ -664,6 +661,16 @@
         UndefinedObject #'_CHECKCAST:'
         UndefinedObject #'_INSTANCEOF:'
         ZipArchive isValidFile:
+        'ProjectDefinition class' generateJavaBuildPrereqs
+        'ProjectDefinition class' generateJavaBuildPrereqsClasspathPaths
+        'ProjectDefinition class' generateJavaBuildPrereqsClasspathRefs
+        'ProjectDefinition class' generateJavaBuildPrereqsUsingTemplate:
+        'ProjectDefinition class' #'generate_java_build_auto_dot_xml'
+        'ProjectDefinition class' #'generate_java_build_dot_xml'
+        'ProjectDefinition class' #'java_build_auto_dot_xml'
+        'ProjectDefinition class' #'java_build_auto_dot_xml_mappings'
+        'ProjectDefinition class' #'java_build_dot_xml'
+        'ProjectDefinition class' #'java_build_dot_xml_mappings'
     )
 ! !
 
--- a/tools/JavaCompilerTests.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/tools/JavaCompilerTests.st	Tue Jan 20 10:41:54 2015 +0100
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libjava/tools' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#JavaCompilerTests
 	instanceVariableNames:'classloader'
 	classVariableNames:''
--- a/tools/stx_libjava_tools.st	Tue Jan 20 09:42:35 2015 +0100
+++ b/tools/stx_libjava_tools.st	Tue Jan 20 10:41:54 2015 +0100
@@ -1,5 +1,7 @@
 "{ Package: 'stx:libjava/tools' }"
 
+"{ NameSpace: Smalltalk }"
+
 LibraryDefinition subclass:#stx_libjava_tools
 	instanceVariableNames:''
 	classVariableNames:''
@@ -32,7 +34,7 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:libbasic'    "ConfigurableFeatures - extended"
+        #'stx:libbasic'    "Autoload - superclass of JavaCompilerTests"
         #'stx:libjava'    "JavaObject - extended"
         #'stx:libtool'    "AbstractSettingsApplication - superclass of JavaSettingsApplication"
         #'stx:libview'    "DisplaySurface - superclass of JavaListInspectorView"
@@ -127,7 +129,6 @@
         JavaCodeBundleEditor
         JavaCodeLibraryEditor
         JavaCompiler
-        (JavaCompilerTests autoload)
         JavaLintAnnotation
         JavaLintHighlighter
         JavaLintPopupWindow
@@ -147,6 +148,7 @@
         GroovyScanner
         JavaLexicalHighlighter
         GroovySourceHighlighter
+        (JavaCompilerTests autoload)
     )
 !
 
--- a/tools/tools.rc	Tue Jan 20 09:42:35 2015 +0100
+++ b/tools/tools.rc	Tue Jan 20 10:41:54 2015 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava_tools.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,32767,32767
+  FILEVERSION     6,2,4305,4305
   PRODUCTVERSION  6,2,5,0
 #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.32767.32767\0"
+      VALUE "FileVersion", "6.2.4305.4305\0"
       VALUE "InternalName", "stx:libjava/tools\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.5.0\0"
-      VALUE "ProductDate", "Sat, 20 Dec 2014 00:46:19 GMT\0"
+      VALUE "ProductDate", "Tue, 20 Jan 2015 09:39:29 GMT\0"
     END
 
   END