--- a/stx_libjava.st	Wed Mar 19 11:12:50 2014 +0000
+++ b/stx_libjava.st	Wed Mar 19 11:48:10 2014 +0000
@@ -152,14 +152,15 @@
 !
 
 mandatoryPreRequisites
-    "list all required mandatory packages.
-     Packages are mandatory, if they contain superclasses of the package's classes
-     or classes which are extended by this package.
-     This list can be maintained manually or (better) generated and
-     updated by scanning the superclass hierarchies
-     (the browser has a menu function for that)"
+    "list packages which are mandatory as a prerequisite.
+     This are packages containing superclasses of my classes and classes which
+     are extended by myself.
+     They are mandatory, beacuse we need these packages as a prerequisite for loading and compiling.
+     This method is generated automatically,
+     by searching along the inheritance chain of all of my classes."
 
     ^ #(
+        #'stx:goodies/sunit'    "TestAsserter - superclass of GroovyEvaluatorTests "
         #'stx:libbasic'    "AbstractNumberVector - extended "
         #'stx:libbasic2'    "SignedIntegerArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
@@ -168,15 +169,13 @@
 !
 
 referencedPreRequisites
-    "list all packages containing classes referenced by the packages's members.
-     This list can be maintained manually or (better) generated and
-     updated by looking for global variable accesses
-     (the browser has a menu function for that)
-     However, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPreRequisites method."
+    "list packages which are a prerequisite, because they contain
+     classes which are referenced by my classes.
+     We do not need these packages as a prerequisite for loading or compiling.
+     This method is generated automatically,
+     by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
-        #'stx:goodies/sunit'    "TestSuite - referenced by JavaTestsLoader class>>buildSuiteFrom: "
         #'stx:libcomp'    "BlockNode - referenced by JavaNativeMethod>>numberOfArgs: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
         #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
@@ -309,6 +308,7 @@
         "<className> or (<className> attributes...) in load order"
         GroovyCompiler
         GroovyEvaluator
+        (GroovyEvaluatorTests autoload)
         GroovyLanguage
         GroovySourceFileWriter
         JavaAnnotation
@@ -316,11 +316,14 @@
         JavaAnnotationDefault
         JavaAnnotationDictionary
         JavaAnnotationValue
+        (JavaAntProjectResource autoload)
         JavaArray
         JavaBooleanArray
         JavaByte
         JavaByteCodeProcessor
+        (JavaByteCodeProcessorTests autoload)
         JavaClassAccessor
+        (JavaClassLoadingTests autoload)
         JavaClassQuery
         JavaClassReloader
         JavaCodeLibraryOrBundle
@@ -333,18 +336,26 @@
         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
@@ -352,6 +363,7 @@
         JavaPopUpView
         JavaProcess
         JavaRef2
+        (JavaRefsAndConstantPoolTestCase autoload)
         JavaRelease
         JavaResolver
         JavaShort
@@ -359,8 +371,10 @@
         JavaSocket
         JavaSourceCodeCache
         JavaSourceFileWriter
+        (JavaTestCaseProxy autoload)
         JavaTestsLoader
         JavaTopView
+        (JavaUTF8Tests autoload)
         JavaUnresolvedCompilationError
         JavaUnresolvedConstant
         JavaUtilities
@@ -374,6 +388,7 @@
         SmalltalkAppletStub
         #'stx_libjava'
         GroovyMetaclass
+        (JUnitTestCaseProxy autoload)
         Java
         JavaAnnotationArrayValue
         JavaAnnotationClassValue
@@ -382,12 +397,15 @@
         JavaAnnotationPrimitiveValue
         JavaBehavior
         JavaByteCodeDisassembler
+        (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeEnumerator
         JavaByteCodeProcessorAdapter
         JavaClassAnnotationContainer
         JavaClassMemberRef2
         JavaClassReader
+        (JavaClassReaderTests autoload)
         JavaClassRef2
+        (JavaClassRefTests autoload)
         JavaClassRegistry
         JavaCodeBundle
         JavaCodeLibrary
@@ -395,13 +413,20 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
+        (JavaFieldRefTests autoload)
+        (JavaInitializedResource autoload)
+        (JavaInterfaceMethodRefTests autoload)
         JavaInvalidRefError
         JavaMethod
         JavaMethodAnnotationContainer
         JavaMethodDescriptor
+        (JavaMethodRefTests autoload)
         JavaMirror
         #'JavaNativeMethodImpl_OpenJDK6'
+        (JavaRefMock autoload)
+        (JavaRuntimeConstantPoolTests autoload)
         JavaStringRef2
+        (JavaTestsResource autoload)
         JavaUnhandledExceptionError
         JavaUnresolvedClassConstant
         JavaUnresolvedStringConstant
@@ -410,6 +435,7 @@
         ProxyMethodGuardNode
         ProxyMethodInvocationNode
         ProxyMethodJavaFieldAccessor
+        (TestletTestCaseProxy autoload)
         JavaAlienMirror
         JavaArrayMirror
         JavaByteCodePreresolver
@@ -436,40 +462,12 @@
         ProxyMethodJavaMethodInvocationNode
         ProxyMethodJavaTypeCheckNode
         JavaNativeMethod
-        (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)
-        (JavaLookupTestsResource autoload)
-        (JavaMethodRefTests autoload)
-        (JavaMonitorsTests autoload)
-        (JavaNativeMemoryTests autoload)
-        (JavaRefMock autoload)
-        (JavaRefsAndConstantPoolTestCase autoload)
-        (JavaRuntimeConstantPoolTests autoload)
-        (JavaTestCaseProxy autoload)
-        (JavaTestsResource autoload)
-        (JavaUTF8Tests autoload)
-        (TestletTestCaseProxy autoload)
     )
 !
 
 extensionMethodNames
-    "lists the extension methods which are to be included in the project.
-     Entries are 2-element array literals, consisting of class-name and selector."
+    "list class/selector pairs of extensions.
+     A correponding method with real names must be present in my concrete subclasses"
 
     ^ #(
         Behavior isInterface