diff -r 78c4f4a03914 -r a00302fe5083 stx_libjava.st
--- a/stx_libjava.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/stx_libjava.st	Fri Sep 06 00:16:38 2013 +0100
@@ -144,7 +144,11 @@
      preRequisites scan. See #preRequisites for more."
 
     ^ #(
+        #'stx:libjava/experiments'
+        #'stx:libjava/tools'
     )
+
+    "Modified: / 06-09-2013 / 00:09:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 mandatoryPreRequisites
@@ -156,6 +160,7 @@
      (the browser has a menu function for that)"
 
     ^ #(
+        #'stx:goodies/sunit'    "TestAsserter - superclass of JUnitTestCaseProxy "
         #'stx:libbasic'    "AbstractNumberVector - extended "
         #'stx:libbasic2'    "BitArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
@@ -172,16 +177,15 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'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:libjava/experiments'    "JavaByteCodeInterpreter - referenced by JavaMethod>>interpretWithReceiver:arguments: "
-        #'stx:libjava/tools'    "JavaParser - referenced by GroovyLanguage>>parserClass "
         #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
         #'stx:libview2'    "GIFReader - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_GifImageDecoder_parseImage: "
         #'stx:libwidg'    "Button - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WButtonPeer_create: "
         #'stx:libwidg2'    "CheckBox - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WCheckboxPeer_create: "
     )
+
+    "Modified: / 06-09-2013 / 00:09:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 subProjects
@@ -191,8 +195,14 @@
      for those, redefine requiredPrerequisites"
 
     ^ #(
+        #'stx:libjava/libs'
+        #'stx:libjava/mauve'
+        #'stx:libjava/tools'
         #'stx:libjava/experiments'
-        #'stx:libjava/tools'
+        #'stx:libjava/examples'
+        #'stx:libjava/benchmarks'
+        #'stx:libjava/examples/tomcat6'
+        #'stx:libjava/startup'
     )
 ! !
 
@@ -309,7 +319,9 @@
         GroovyEvaluator
         GroovyLanguage
         GroovySourceFileWriter
+        (JavaTestCaseProxy autoload)
         (JUnitTestCaseProxy autoload)
+        (JavaRefsAndConstantPoolTestCase autoload)
         JavaAnnotation
         JavaAnnotationContainer
         JavaAnnotationDefault
@@ -318,9 +330,9 @@
         (JavaAntProjectResource autoload)
         JavaArray
         JavaByte
+        (JavaByteCodeProcessorTests autoload)
         (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeProcessor
-        (JavaByteCodeProcessorTests autoload)
         JavaClassAccessor
         (JavaClassLoadingTests autoload)
         JavaClassQuery
@@ -370,7 +382,6 @@
         JavaProcess
         JavaRef2
         (JavaRefMock autoload)
-        (JavaRefsAndConstantPoolTestCase autoload)
         JavaResolver
         (JavaRuntimeConstantPoolTests autoload)
         JavaShort
@@ -378,7 +389,6 @@
         JavaSocket
         JavaSourceCodeCache
         JavaSourceFileWriter
-        (JavaTestCaseProxy autoload)
         JavaTestsLoader
         (JavaTestsResource autoload)
         JavaTopView
@@ -456,6 +466,8 @@
         ProxyMethodJavaTypeCheckNode
         JavaNativeMethod
     )
+
+    "Modified: / 06-09-2013 / 00:14:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 extensionMethodNames
@@ -733,7 +745,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.12 2013-02-25 13:43:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN