hg/stx-libjava: changeset 763:1e82b558abd3

--- a/src/JavaClass.st	Sat May 07 16:18:07 2011 +0000
+++ b/src/JavaClass.st	Sat May 07 18:23:38 2011 +0000
@@ -2039,15 +2039,13 @@
 !JavaClass methodsFor:'support - sUnit'!
 
 asTestCase
-    self halt.
     self isTestletLike 
-        ifTrue: 
-            [ self halt.
-            ^ TestletTestCaseProxy for: self ].
+        ifTrue: [^ TestletTestCaseProxy for: self ].
     ^ JUnitTestCaseProxy for: self.
 
     "Created: / 04-03-2011 / 08:20:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 29-04-2011 / 17:52:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 07-05-2011 / 18:59:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 asTestlet
@@ -2136,5 +2134,3 @@
 ! !
 
 JavaClass initialize!
-
-

--- a/src/JavaRuntimeConstantPoolTests.st	Sat May 07 16:18:07 2011 +0000
+++ b/src/JavaRuntimeConstantPoolTests.st	Sat May 07 18:23:38 2011 +0000
@@ -38,5 +38,3 @@
 version_SVN
     ^ '$Id$'
 ! !
-
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/JavaTestsLoader.st	Sat May 07 18:23:38 2011 +0000
@@ -0,0 +1,56 @@
+"{ Package: 'stx:libjava' }"
+
+Object subclass:#JavaTestsLoader
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Languages-Java-Tests'
+!
+
+
+!JavaTestsLoader class methodsFor:'loading'!
+
+load
+
+    self loadIn: JavaTestsResource testsClasspath
+
+    "Created: / 07-05-2011 / 18:43:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+load: testdir
+
+    | base dirs |
+    base := (UserPreferences current 
+                javaTestsDirectory asFilename  / testdir) pathName.
+    dirs := JavaTestsResource testsClasspath select:
+                [:each|each startsWith: base].
+
+    self loadIn: dirs.
+
+    "
+        JavaTestsLoader load: 'libjava'
+    "
+
+    "Created: / 07-05-2011 / 18:40:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaTestsLoader class methodsFor:'private'!
+
+loadIn: directories
+
+    JavaLibrariesResource new setUp.
+    JavaTestsResource new setUp.
+
+    directories do:
+            [:each|
+            each asFilename exists ifTrue:
+                [JavaClassReader loadClassesIn: each]]
+
+    "Created: / 07-05-2011 / 18:42:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!JavaTestsLoader class methodsFor:'documentation'!
+
+version_SVN
+    ^ '$Id$'
+! !

--- a/src/JavaTestsResource.st	Sat May 07 16:18:07 2011 +0000
+++ b/src/JavaTestsResource.st	Sat May 07 18:23:38 2011 +0000
@@ -7,7 +7,7 @@
 	category:'Languages-Java-Tests'
 !
 
-JavaTestsResource class instanceVariableNames:'projectDir projectBuilded'
+JavaTestsResource class instanceVariableNames:'testsBuilded'
 
 "
  The following class instance variables are inherited by this class:
@@ -30,64 +30,90 @@
         (Smalltalk packageDirectoryForPackageId: 'stx:libjava') asFilename
             / 'java' / 'libjava-tests' .
 
-    projectBuilded := false.
+    testsBuilded := false.
 
     "Modified: / 16-03-2011 / 14:33:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaTestsResource class methodsFor:'accessing'!
 
-projectBuilded:aBoolean
+testsBuilded
+    
+    ^testsBuilded == true
 
+    "Created: / 07-05-2011 / 18:44:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testsBuilded:aBoolean 
     "
         JavaTestsResource projectBuilded: true.
-        JavaTestsResource projectBuilded: false.
-    "
-
-    projectBuilded := aBoolean.
+        JavaTestsResource projectBuilded: false."
+    
+    testsBuilded := aBoolean.
 
     "Modified: / 16-03-2011 / 15:20:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-projectDir
-    ^ projectDir
+testsClasspath
+
+    | cp |
+    cp := OrderedCollection new.
+
+    self testsDirectory directoryContentsAsFilenamesDo:
+            [:entry | 
+            entry isDirectory 
+                ifTrue:
+                    [ (entry / 'bin') exists 
+                        ifTrue:[ cp add:(entry / 'bin') asString ].
+                    (entry / 'lib') exists 
+                        ifTrue:[ cp addAll: ((entry / 'lib') directoryContentsAsFilenames select:[:jar|jar suffix = 'jar' ] ) ] ] ].
+
+    ^cp
+
+    "
+        JavaTestsResource testsClasspath      
+    "
+
+    "Created: / 07-05-2011 / 18:15:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testsDirectory
+    ^ UserPreferences current javaTestsDirectory asFilename
+
+    "Modified: / 07-05-2011 / 17:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaTestsResource class methodsFor:'running'!
 
 buildProject
-
     "
         JavaTestsResource projectBuilded: true.
-        JavaTestsResource projectBuilded: false.
-    "
-
-
-    projectBuilded == true ifFalse:[ 
-        "Check for ant"
-        self assert: (OperatingSystem canExecuteCommand:'ant')
-             description: 'Cannot execute ant'.
-
-        self assert: (self projectDir / 'build.xml') exists
-             description: 'No build.xml in ' , self projectDir asString.
-
-
-        "Launch ant"
-        Transcript show:'Running ant in '; showCR: self projectDir asString.
-        OperatingSystem
-                executeCommand:'ant -f build.xml' 
-                inputFrom:nil 
-                outputTo:Stdout 
-                errorTo:Stderr 
-                inDirectory: self projectDir
+        JavaTestsResource projectBuilded: false."
+    
+    testsBuilded == true 
+        ifFalse:
+            [ "Check for ant"
+            self assert:(OperatingSystem canExecuteCommand:'ant')
+                description:'Cannot execute ant'.
+            self assert:(self testsDirectory / 'build.xml') exists
+                description:'No build.xml in ' , self testsDirectory asString.
+             "Launch ant"
+            Transcript
+                show:'Running ant in ';
+                showCR:self testsDirectory asString.
+            OperatingSystem 
+                executeCommand:'ant -f build.xml'
+                inputFrom:nil
+                outputTo:Stdout
+                errorTo:Stderr
+                inDirectory:self testsDirectory
                 onError:
                     [:status | 
                     Transcript showCR:'ANT FAILED!!!!!!'.
                     self error:'ant failed'.
-                    ^self].
-
-        Transcript show:'Ant finished'].
-    ^ projectBuilded
+                    ^ self ].
+            Transcript show:'Ant finished' ].
+    ^ testsBuilded
 
     "Modified: / 16-03-2011 / 15:20:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -96,10 +122,16 @@
 
 setUp
     self class buildProject.
-    Java addToClassPath: (self class projectDir / 'bin') asString
+    self class testsClasspath do:
+        [:each|Java addToClassPath: each].
+
+    "
+        JavaTestsResource basicNew setUp
+        Java classPath
+    "
 
     "Created: / 06-03-2011 / 14:50:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 16-03-2011 / 14:38:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-05-2011 / 18:19:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaTestsResource class methodsFor:'documentation'!

--- a/src/Make.proto	Sat May 07 16:18:07 2011 +0000
+++ b/src/Make.proto	Sat May 07 18:23:38 2011 +0000
@@ -68,8 +68,11 @@
 
 
 update-svn-revision:
-	sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
-		stx_libjava.st
+	if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
+		svnversion -n > .svnversion; \
+		sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
+			stx_libjava.st; \
+	fi
 .PHONY: update-svn-revision
 
 
@@ -94,9 +97,10 @@
 	cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../goodies/xml/stx && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -158,6 +162,7 @@
 $(OUTDIR)JavaSourceCodeCache.$(O) JavaSourceCodeCache.$(H): JavaSourceCodeCache.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaSourceFileWriter.$(O) JavaSourceFileWriter.$(H): JavaSourceFileWriter.st $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaTestsLoader.$(O) JavaTestsLoader.$(H): JavaTestsLoader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTopView.$(O) JavaTopView.$(H): JavaTopView.st $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(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)JavaUnresolvedConstant.$(O) JavaUnresolvedConstant.$(H): JavaUnresolvedConstant.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaVM.$(O) JavaVM.$(H): JavaVM.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -193,7 +198,7 @@
 $(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodWithException.$(O) JavaMethodWithException.$(H): JavaMethodWithException.st $(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)JavaMethodref.$(O) JavaMethodref.$(H): JavaMethodref.st $(INCLUDE_TOP)/stx/libjava/JavaRef.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(STCHDR)
 $(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnresolvedClassConstant.$(O) JavaUnresolvedClassConstant.$(H): JavaUnresolvedClassConstant.st $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -223,9 +228,7 @@
 $(OUTDIR)JavaInterfaceMethodRef2.$(O) JavaInterfaceMethodRef2.$(H): JavaInterfaceMethodRef2.st $(INCLUDE_TOP)/stx/libjava/JavaMethodRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaClassContentRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(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)JavaUnresolvedInterfaceMethodrefConstant.$(O) JavaUnresolvedInterfaceMethodrefConstant.$(H): JavaUnresolvedInterfaceMethodrefConstant.st $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedMethodrefConstant.$(H) $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedRefConstant.$(H) $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(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/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic2/IntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic2/LongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(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/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/DoubleArray.$(H) $(INCLUDE_TOP)/stx/libbasic/FloatArray.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic2/ZipArchive.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Float.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic2/IntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/UnboxedIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/LargeInteger.$(H) $(INCLUDE_TOP)/stx/libbasic2/LongIntegerArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ShortFloat.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic2/WordArray.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
-
-

--- a/src/Make.spec	Sat May 07 16:18:07 2011 +0000
+++ b/src/Make.spec	Sat May 07 18:23:38 2011 +0000
@@ -91,6 +91,7 @@
 	JavaSourceCodeCache \
 	JavaSourceFileWriter \
 	JavaStartup \
+	JavaTestsLoader \
 	JavaTopView \
 	JavaUnresolvedConstant \
 	JavaVM \
@@ -202,6 +203,7 @@
     $(OUTDIR)JavaSourceCodeCache.$(O) \
     $(OUTDIR)JavaSourceFileWriter.$(O) \
     $(OUTDIR)JavaStartup.$(O) \
+    $(OUTDIR)JavaTestsLoader.$(O) \
     $(OUTDIR)JavaTopView.$(O) \
     $(OUTDIR)JavaUnresolvedConstant.$(O) \
     $(OUTDIR)JavaVM.$(O) \
@@ -271,5 +273,3 @@
 
 
 
-
-

--- a/src/abbrev.stc	Sat May 07 16:18:07 2011 +0000
+++ b/src/abbrev.stc	Sat May 07 18:23:38 2011 +0000
@@ -14,19 +14,19 @@
 JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 4
 JavaClassReader JavaClassReader stx:libjava 'Languages-Java-Support' 0
 JavaClassReaderTests JavaClassReaderTests stx:libjava 'Languages-Java-Tests' 4
-JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
+JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaConstantPool JavaConstantPool stx:libjava 'Languages-Java-Reader-Support' 0
-JavaConstantPoolsTests JavaConstantPoolsTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
+JavaConstantPoolsTests JavaConstantPoolsTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaContext JavaContext stx:libjava 'Languages-Java-Support' 0
 JavaDecompiler JavaDecompiler stx:libjava 'Languages-Java-Support-Decompiling' 0
 JavaDescriptor JavaDescriptor stx:libjava 'Languages-Java-Support' 0
 JavaError JavaError stx:libjava 'Languages-Java-Support' 1
 JavaExceptionTableEntry JavaExceptionTableEntry stx:libjava 'Languages-Java-Support' 0
 JavaExceptionThrowerMock JavaExceptionThrowerMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 0
-JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests' 0
+JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
+JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 1
+JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
+JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests' 4
 JavaJavadocNode JavaJavadocNode stx:libjava 'Languages-Java-AST' 0
 JavaLanguage JavaLanguage stx:libjava 'Languages-Java-Support' 1
 JavaLibraries JavaLibraries stx:libjava 'Languages-Java-Support' 0
@@ -34,9 +34,9 @@
 JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support' 0
 JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support' 0
 JavaLookup JavaLookup stx:libjava 'Languages-Java-Lookup' 0
-JavaLookupTestsResource JavaLookupTestsResource stx:libjava 'Languages-Java-Lookup-Tests' 0
+JavaLookupTestsResource JavaLookupTestsResource stx:libjava 'Languages-Java-Lookup-Tests' 3
 JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
-JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
+JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaNameandType JavaNameandType stx:libjava 'Languages-Java-Reader-Support' 0
 JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support' 0
@@ -44,30 +44,31 @@
 JavaObject JavaObject stx:libjava 'Languages-Java-Classes' 0
 JavaObjectDictionary JavaObjectDictionary stx:libjava 'Languages-Java-Support' 0
 JavaParseResult JavaParseResult stx:libjava 'Languages-Java-Parser' 0
-JavaParserNavigationTests JavaParserNavigationTests stx:libjava 'Languages-Java-Tests' 0
-JavaParserTestCase JavaParserTestCase stx:libjava 'Languages-Java-Tests' 0
-JavaParserTests JavaParserTests stx:libjava 'Languages-Java-Tests' 0
+JavaParserNavigationTests JavaParserNavigationTests stx:libjava 'Languages-Java-Tests' 4
+JavaParserTestCase JavaParserTestCase stx:libjava 'Languages-Java-Tests' 4
+JavaParserTests JavaParserTests stx:libjava 'Languages-Java-Tests' 4
 JavaPopUpView JavaPopUpView stx:libjava 'Languages-Java-Views-Support' 2
 JavaProcess JavaProcess stx:libjava 'Languages-Java-Classes' 0
 JavaRef JavaRef stx:libjava 'Languages-Java-Reader-Support' 0
 JavaRef2 JavaRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
+JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 0
 JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaResolverTests JavaResolverTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
+JavaResolverTests JavaResolverTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
+JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaSlotIndexCache JavaSlotIndexCache stx:libjava 'Languages-Java-Support' 0
 JavaSourceCodeCache JavaSourceCodeCache stx:libjava 'Languages-Java-Support' 1
 JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
 JavaStartup JavaStartup stx:libjava 'Languages-Java-Support' 1
-JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 0
+JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
+JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
 JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
-JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 0
+JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 4
 JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support' 0
 JavaVM JavaVM stx:libjava 'Languages-Java-Support' 0
 JavaView JavaView stx:libjava 'Languages-Java-Views-Support' 2
-LookupTests LookupTests stx:libjava 'Languages-Java-Lookup-Tests' 0
+LookupTests LookupTests stx:libjava 'Languages-Java-Lookup-Tests' 4
 PPJavaNode PPJavaNode stx:libjava 'Languages-Java-AST' 0
 Short Short stx:libjava 'Magnitude-Numbers' 0
 SmalltalkAppletContext SmalltalkAppletContext stx:libjava 'Languages-Java-Views-Support' 0
@@ -130,5 +131,3 @@
 JavaInterfaceMethodRef2 JavaInterfaceMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes' 0
 JavaUnresolvedInterfaceMethodrefConstant JavaUnresolvedInterfaceMethodrefConstant stx:libjava 'Languages-Java-Reader-Support' 0
-
-

--- a/src/bc.mak	Sat May 07 16:18:07 2011 +0000
+++ b/src/bc.mak	Sat May 07 18:23:38 2011 +0000
@@ -52,9 +52,10 @@
 	pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\goodies\xml\vw & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\goodies\xml\stx & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -108,6 +109,7 @@
 $(OUTDIR)JavaSourceCodeCache.$(O) JavaSourceCodeCache.$(H): JavaSourceCodeCache.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaSourceFileWriter.$(O) JavaSourceFileWriter.$(H): JavaSourceFileWriter.st $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaTestsLoader.$(O) JavaTestsLoader.$(H): JavaTestsLoader.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTopView.$(O) JavaTopView.$(H): JavaTopView.st $(INCLUDE_TOP)\stx\libview\StandardSystemView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(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)JavaUnresolvedConstant.$(O) JavaUnresolvedConstant.$(H): JavaUnresolvedConstant.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaVM.$(O) JavaVM.$(H): JavaVM.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -143,7 +145,7 @@
 $(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodWithException.$(O) JavaMethodWithException.$(H): JavaMethodWithException.st $(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)JavaMethodref.$(O) JavaMethodref.$(H): JavaMethodref.st $(INCLUDE_TOP)\stx\libjava\JavaRef.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(STCHDR)
 $(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnresolvedClassConstant.$(O) JavaUnresolvedClassConstant.$(H): JavaUnresolvedClassConstant.st $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -173,8 +175,6 @@
 $(OUTDIR)JavaInterfaceMethodRef2.$(O) JavaInterfaceMethodRef2.$(H): JavaInterfaceMethodRef2.st $(INCLUDE_TOP)\stx\libjava\JavaMethodRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaClassContentRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(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)JavaUnresolvedInterfaceMethodrefConstant.$(O) JavaUnresolvedInterfaceMethodrefConstant.$(H): JavaUnresolvedInterfaceMethodrefConstant.st $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedMethodrefConstant.$(H) $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedRefConstant.$(H) $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(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\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\DoubleArray.$(H) $(INCLUDE_TOP)\stx\libbasic\FloatArray.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\ZipArchive.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic2\IntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\LargeInteger.$(H) $(INCLUDE_TOP)\stx\libbasic2\LongIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ShortFloat.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic2\WordArray.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(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\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\DoubleArray.$(H) $(INCLUDE_TOP)\stx\libbasic\FloatArray.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic2\ZipArchive.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Float.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic2\IntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\LargeInteger.$(H) $(INCLUDE_TOP)\stx\libbasic2\LongIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ShortFloat.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic2\WordArray.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
-
-

--- a/src/builder/package.deps.rake	Sat May 07 16:18:07 2011 +0000
+++ b/src/builder/package.deps.rake	Sat May 07 18:23:38 2011 +0000
@@ -40,6 +40,9 @@
 task "stx:libhtml" => "stx:libview"
 task "stx:libhtml" => "stx:libbasic"
 
+task "stx:goodies/xml/stx" => "stx:goodies/xml/vw"
+task "stx:goodies/xml/stx" => "stx:libbasic2"
+task "stx:goodies/xml/stx" => "stx:libbasic"
 
 task "stx:libtool" => "stx:libwidg2"
 task "stx:libtool" => "stx:libbasic3"
@@ -69,6 +72,10 @@
 task "stx:libbasic3" => "stx:libbasic2"
 task "stx:libbasic3" => "stx:libbasic"
 
+task "stx:goodies/xml/vw" => "stx:libbasic2"
+task "stx:goodies/xml/vw" => "stx:libbasic3"
+task "stx:goodies/xml/vw" => "stx:libbasic"
+
 task "stx:libui" => "stx:libview2"
 task "stx:libui" => "stx:libview"
 task "stx:libui" => "stx:libbasic"
@@ -87,5 +94,3 @@
 task "stx:libjava" => "stx:libtool"
 
 
-
-

--- a/src/extensions.st	Sat May 07 16:18:07 2011 +0000
+++ b/src/extensions.st	Sat May 07 18:23:38 2011 +0000
@@ -75,6 +75,34 @@
     "Created: / 07-02-2011 / 11:18:03 / Marcel Hlopko <hlopik@gmail.com>"
     "Modified: / 08-02-2011 / 01:08:15 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
+!UserPreferences methodsFor:'accessing-java-devel'!
+
+javaTestsDirectory
+
+    ^self at:#javaTestsDirectory ifAbsent:[
+        | nm |
+        nm := OperatingSystem getLoginName.
+        nm = 'jv' ifTrue:['/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/tests'] ifFalse:[
+        nm = 'jk' ifTrue:['path for Jan'] ifFalse:[
+        nm = 'mh' ifTrue:['path for Marcel'] ifFalse:[
+            self error:'No tests path specified'
+        ]]]
+    ]
+
+    "
+        UserPreferences current javaTestsDirectory 
+    "
+
+    "Created: / 07-05-2011 / 17:43:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+!UserPreferences methodsFor:'accessing-java-devel'!
+
+javaTestsDirectory: aStringOrFilename
+
+    self at:#javaTestsDirectory put: aStringOrFilename asString.
+
+    "Created: / 07-05-2011 / 17:45:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
 !ZipArchive methodsFor:'reading - java support'!
 
 nextBytes: bytesToRead of: zmember startingAt: pos into: b startingAt: off
@@ -634,5 +662,3 @@
 
     ^'['.
 ! !
-
-

--- a/src/libInit.cc	Sat May 07 16:18:07 2011 +0000
+++ b/src/libInit.cc	Sat May 07 18:23:38 2011 +0000
@@ -68,6 +68,7 @@
 _JavaSourceCodeCache_Init(pass,__pRT__,snd);
 _JavaSourceFileWriter_Init(pass,__pRT__,snd);
 _JavaStartup_Init(pass,__pRT__,snd);
+_JavaTestsLoader_Init(pass,__pRT__,snd);
 _JavaTopView_Init(pass,__pRT__,snd);
 _JavaUnresolvedConstant_Init(pass,__pRT__,snd);
 _JavaVM_Init(pass,__pRT__,snd);
@@ -137,5 +138,3 @@
 _stx_137libjava_extensions_Init(pass,__pRT__,snd);
 __END_PACKAGE__();
 }
-
-

--- a/src/libjava.rc	Sat May 07 16:18:07 2011 +0000
+++ b/src/libjava.rc	Sat May 07 18:23:38 2011 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,1,0,1
+  FILEVERSION     6,1,1096,1096
   PRODUCTVERSION  6,1,2,1
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
   FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -18,12 +18,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "6.1.0.1\0"
+      VALUE "FileVersion", "6.1.1096.1096\0"
       VALUE "InternalName", "stx:libjava\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2010\nCopyright eXept Software AG 1998-2010\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.1.2.1\0"
-      VALUE "ProductDate", "Fri, 29 Apr 2011 15:57:34 GMT\0"
+      VALUE "ProductDate", "Sat, 07 May 2011 18:22:27 GMT\0"
     END
 
   END
@@ -33,5 +33,3 @@
     VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
   END
 END
-
-

--- a/src/stx_libjava.st	Sat May 07 16:18:07 2011 +0000
+++ b/src/stx_libjava.st	Sat May 07 18:23:38 2011 +0000
@@ -21,33 +21,6 @@
     "Created: / 08-04-2011 / 16:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!stx_libjava class methodsFor:'accessing - tests'!
-
-testSuite
-
-    | suite javaTestClasses |
-    suite := super testSuite.
-    JavaTestsResource autoload.
-    JavaTestsResource buildProject.
-    javaTestClasses := JavaClassReader loadClassesIn: JavaTestsResource projectDir / 'bin'.
-    Java addToClassPath:  '/usr/share/java/junit4.jar'.
-    javaTestClasses do:
-        [:javaClass|
-        
-        ((javaClass name endsWith: 'JUnit4Tests') not and:
-            [(javaClass name endsWith: 'JUnit3Tests') not
-                and:[javaClass isTestCaseLike]]) 
-                    ifTrue:
-                        [suite addTests:javaClass asTestCase buildSuite tests]].
-
-    ^suite
-
-    "
-        stx_libjava testSuite
-    "
-
-    "Created: / 01-04-2011 / 15:25:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
 
 !stx_libjava class methodsFor:'description'!
 
@@ -69,14 +42,14 @@
 
     ^ #(
         #'squeak:petitparser'    "PPParser - superclass of JavaParser::BlockParser "
-        #'stx:goodies/sunit'
+        #'stx:goodies/sunit'    "TestAsserter - superclass of JUnitTestCaseProxy "
         #'stx:libbasic'    "Object - superclass of JavaUnresolvedFieldrefConstant "
         #'stx:libbasic2'    "ZipArchive - referenced by Java class>>classSource:package:in: "
         #'stx:libbasic3'    "MessageTracer - referenced by JavaMethod>>setBreakPoint "
         #'stx:libcomp'    "Parser - referenced by JavaClass>>evaluatorClass "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
         #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
-        #'stx:libview'    "DeviceGraphicsContext - superclass of JavaEmbeddedFrameView "
+        #'stx:libview'    "DisplaySurface - superclass of JavaView "
         #'stx:libview2'    "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
         #'stx:libwidg'    "Label - referenced by JavaVM class>>processEvent: "
         #'stx:libwidg2'    "MenuPanel - referenced by JavaVM class>>processEvent: "
@@ -156,6 +129,7 @@
         JavaSourceCodeCache
         JavaSourceFileWriter
         JavaStartup
+        JavaTestsLoader
         (JavaTestsResource autoload)
         JavaTopView
         (JavaUTF8Tests autoload)
@@ -240,6 +214,8 @@
         Object isJavaArray
         Object isJavaRef
         String asArrayOfSubstringsSeparatedBy:
+        UserPreferences javaTestsDirectory
+        UserPreferences javaTestsDirectory:
         ZipArchive nextBytes:of:startingAt:into:startingAt:
         'Boolean class' arrayClass
         'Boolean class' isJavaPrimitiveType
@@ -370,5 +346,3 @@
 version_SVN
     ^ '$Id$'
 ! !
-
-

author	vranyj1
	Sat, 07 May 2011 18:23:38 +0000
branch	jk_new_structure
changeset 763	1e82b558abd3
parent 762	d995915ebc0b
child 764	3c1d3f2d29a5

src/JavaClass.st		file \| annotate \| diff \| comparison \| revisions
src/JavaRuntimeConstantPoolTests.st		file \| annotate \| diff \| comparison \| revisions
src/JavaTestsLoader.st		file \| annotate \| diff \| comparison \| revisions
src/JavaTestsResource.st		file \| annotate \| diff \| comparison \| revisions
src/Make.proto		file \| annotate \| diff \| comparison \| revisions
src/Make.spec		file \| annotate \| diff \| comparison \| revisions
src/abbrev.stc		file \| annotate \| diff \| comparison \| revisions
src/bc.mak		file \| annotate \| diff \| comparison \| revisions
src/builder/package.deps.rake		file \| annotate \| diff \| comparison \| revisions
src/extensions.st		file \| annotate \| diff \| comparison \| revisions
src/libInit.cc		file \| annotate \| diff \| comparison \| revisions
src/libjava.rc		file \| annotate \| diff \| comparison \| revisions
src/stx_libjava.st		file \| annotate \| diff \| comparison \| revisions