--- a/stx_libjava.st	Mon May 13 00:59:43 2013 +0100
+++ b/stx_libjava.st	Tue May 14 15:36:56 2013 +0100
@@ -51,14 +51,6 @@
      as of 1.9.2010
 
 "
-!
-
-extensionsVersion_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/extensions.st,v 1.4 2013-03-08 09:47:48 cg Exp $'
-!
-
-extensionsVersion_SVN
-    ^ '$Id: stx_libjava.st,v 1.12 2013-02-25 13:43:08 cg Exp $'
 ! !
 
 !stx_libjava class methodsFor:'accessing'!
@@ -166,7 +158,7 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'stx:goodies/sunit'    "TestAsserter - superclass of JUnitTestCaseProxy "
+        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaAntProjectResource "
         #'stx:libbasic'    "AbstractNumberVector - extended "
         #'stx:libbasic2'    "BitArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
@@ -202,8 +194,6 @@
 
     ^ #(
         #'stx:libjava/tools'
-        #'stx:libjava/benchmarks'
-        #'stx:libjava/libs'
         #'stx:libjava/experiments'
     )
 ! !
@@ -321,6 +311,7 @@
         GroovyEvaluator
         GroovyLanguage
         GroovySourceFileWriter
+        (JUnitTestCaseProxy autoload)
         JavaAnnotation
         JavaAnnotationContainer
         JavaAnnotationDefault
@@ -329,11 +320,14 @@
         (JavaAntProjectResource autoload)
         JavaArray
         JavaByte
+        (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeProcessor
         (JavaByteCodeProcessorTests autoload)
         JavaClassAccessor
         (JavaClassLoadingTests autoload)
         JavaClassQuery
+        (JavaClassReaderTests autoload)
+        (JavaClassRefTests autoload)
         JavaClassReloader
         JavaCodeLibraryOrBundle
         #'JavaCompiler_Eclipse'
@@ -346,8 +340,11 @@
         JavaExceptionTable
         (JavaExceptionTests autoload)
         JavaField
+        (JavaFieldRefTests autoload)
         JavaFinalizationRegistry
         (JavaFreshlyInitializedResource autoload)
+        (JavaInitializedResource autoload)
+        (JavaInterfaceMethodRefTests autoload)
         (JavaJUnitTests autoload)
         JavaLanguage
         JavaLibraries
@@ -360,6 +357,7 @@
         (JavaLookupTestsResource autoload)
         JavaMathSupport
         JavaMetaclass
+        (JavaMethodRefTests autoload)
         JavaMirror
         JavaMonitor
         (JavaMonitorsTests autoload)
@@ -373,8 +371,10 @@
         JavaPopUpView
         JavaProcess
         JavaRef2
+        (JavaRefMock autoload)
         (JavaRefsAndConstantPoolTestCase autoload)
         JavaResolver
+        (JavaRuntimeConstantPoolTests autoload)
         JavaShort
         JavaSlotIndexCache
         JavaSocket
@@ -382,6 +382,7 @@
         JavaSourceFileWriter
         (JavaTestCaseProxy autoload)
         JavaTestsLoader
+        (JavaTestsResource autoload)
         JavaTopView
         (JavaUTF8Tests autoload)
         JavaUnresolvedCompilationError
@@ -395,9 +396,9 @@
         ProxyMethodNode
         SmalltalkAppletContext
         SmalltalkAppletStub
+        (TestletTestCaseProxy autoload)
         #'stx_libjava'
         GroovyMetaclass
-        (JUnitTestCaseProxy autoload)
         Java
         JavaAnnotationArrayValue
         JavaAnnotationClassValue
@@ -406,15 +407,12 @@
         JavaAnnotationPrimitiveValue
         JavaBehavior
         JavaByteCodeDisassembler
-        (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeEnumerator
         JavaByteCodeProcessorAdapter
         JavaClassAnnotationContainer
         JavaClassContentRef2
         JavaClassReader
-        (JavaClassReaderTests autoload)
         JavaClassRef2
-        (JavaClassRefTests autoload)
         JavaClassRegistry
         JavaCodeBundle
         JavaCodeLibrary
@@ -422,20 +420,13 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
-        (JavaFieldRefTests autoload)
-        (JavaInitializedResource autoload)
-        (JavaInterfaceMethodRefTests autoload)
         JavaInvalidRefError
         JavaMethod
         JavaMethodAnnotationContainer
         JavaMethodDescriptor
-        (JavaMethodRefTests autoload)
         #'JavaNativeMethodImpl_OpenJDK6'
-        (JavaRefMock autoload)
         JavaRelease
-        (JavaRuntimeConstantPoolTests autoload)
         JavaStringRef2
-        (JavaTestsResource autoload)
         JavaUnhandledExceptionError
         JavaUnresolvedClassConstant
         JavaUnresolvedStringConstant
@@ -444,7 +435,6 @@
         ProxyMethodGuardNode
         ProxyMethodInvocationNode
         ProxyMethodJavaFieldAccessor
-        (TestletTestCaseProxy autoload)
         JavaByteCodePreresolver
         JavaClass
         JavaClassPathBundle
@@ -633,6 +623,36 @@
         Context arg1Index
         'Float class' javaUnbox:onError:
         'ShortFloat class' javaUnbox:onError:
+        BooleanArray #'_ARRAYLENGTH:'
+        BooleanArray #'_CHECKCAST:'
+        BooleanArray #'_INSTANCEOF:'
+        ByteArray #'_ARRAYLENGTH:'
+        ByteArray #'_CHECKCAST:'
+        ByteArray #'_INSTANCEOF:'
+        CharacterArray #'_ARRAYLENGTH:'
+        CharacterArray #'_CHECKCAST:'
+        CharacterArray #'_INSTANCEOF:'
+        DoubleArray #'_ARRAYLENGTH:'
+        DoubleArray #'_CHECKCAST:'
+        DoubleArray #'_INSTANCEOF:'
+        FloatArray #'_ARRAYLENGTH:'
+        FloatArray #'_CHECKCAST:'
+        FloatArray #'_INSTANCEOF:'
+        Object #'_ARRAYLENGTH:'
+        Object #'_CHECKCAST:'
+        Object #'_INSTANCEOF:'
+        SignedIntegerArray #'_ARRAYLENGTH:'
+        SignedIntegerArray #'_CHECKCAST:'
+        SignedIntegerArray #'_INSTANCEOF:'
+        SignedLongIntegerArray #'_ARRAYLENGTH:'
+        SignedLongIntegerArray #'_CHECKCAST:'
+        SignedLongIntegerArray #'_INSTANCEOF:'
+        SignedWordArray #'_ARRAYLENGTH:'
+        SignedWordArray #'_CHECKCAST:'
+        SignedWordArray #'_INSTANCEOF:'
+        UndefinedObject #'_ARRAYLENGTH:'
+        UndefinedObject #'_CHECKCAST:'
+        UndefinedObject #'_INSTANCEOF:'
     )
 ! !