Added version_CVS to all classes and build files regenerated & cleaned. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 06 Sep 2013 00:16:38 +0100
branchdevelopment
changeset 2711 a00302fe5083
parent 2710 78c4f4a03914
child 2712 69af63cd04a3
child 2745 d82859be4462
child 2747 fc8ef16dcb5c
Added version_CVS to all classes and build files regenerated & cleaned. This is necessary step before updating CVS.
GroovyClass.st
GroovyCompiler.st
GroovyEvaluator.st
GroovyLanguage.st
GroovyMetaclass.st
GroovySourceFileWriter.st
JUnitTestCaseProxy.st
Java.st
JavaAnnotation.st
JavaAnnotationArrayValue.st
JavaAnnotationClassValue.st
JavaAnnotationContainer.st
JavaAnnotationDefault.st
JavaAnnotationDictionary.st
JavaAnnotationEnumValue.st
JavaAnnotationNestedAnnotationValue.st
JavaAnnotationPrimitiveValue.st
JavaAnnotationValue.st
JavaAntProjectResource.st
JavaArray.st
JavaBehavior.st
JavaByte.st
JavaByteCodeDisassembler.st
JavaByteCodeDisassemblerTests.st
JavaByteCodeEnumerator.st
JavaByteCodePreresolver.st
JavaByteCodeProcessor.st
JavaByteCodeProcessorAdapter.st
JavaByteCodeProcessorTests.st
JavaClass.st
JavaClassAccessor.st
JavaClassAnnotationContainer.st
JavaClassContentRef2.st
JavaClassLoadingTests.st
JavaClassPathBundle.st
JavaClassQuery.st
JavaClassReader.st
JavaClassReaderTests.st
JavaClassRef2.st
JavaClassRefTests.st
JavaClassRegistry.st
JavaClassReloader.st
JavaCodeBundle.st
JavaCodeLibrary.st
JavaCodeLibraryOrBundle.st
JavaCompiler_Eclipse.st
JavaConstantPool.st
JavaConstants.st
JavaContext.st
JavaDecompiler.st
JavaDescriptor.st
JavaEmbeddedFrameView.st
JavaError.st
JavaExceptionTable.st
JavaExceptionTests.st
JavaField.st
JavaFieldAnnotationContainer.st
JavaFieldDescriptor.st
JavaFieldDescriptorWithUnionType.st
JavaFieldRef2.st
JavaFieldRefTests.st
JavaFinalizationRegistry.st
JavaFreshlyInitializedResource.st
JavaInitializedResource.st
JavaInterfaceMethodRef2.st
JavaInterfaceMethodRefTests.st
JavaInvalidRefError.st
JavaJUnitTests.st
JavaLanguage.st
JavaLibraries.st
JavaLibrariesResource.st
JavaLocalVariableTable.st
JavaLocalVariableTableEntry.st
JavaLookup.st
JavaLookupResolutionAlgorithmTests.st
JavaLookupTests.st
JavaLookupTestsResource.st
JavaMathSupport.st
JavaMetaclass.st
JavaMethod.st
JavaMethodAnalyzer.st
JavaMethodAnnotationContainer.st
JavaMethodDescriptor.st
JavaMethodRef2.st
JavaMethodRefTests.st
JavaMethodWithException.st
JavaMethodWithHandler.st
JavaMirror.st
JavaMonitor.st
JavaMonitorsTests.st
JavaNameAndType2.st
JavaNativeMemory.st
JavaNativeMemoryTests.st
JavaNativeMethod.st
JavaNativeMethodImpl_OpenJDK6.st
JavaNativeMethodImpl_OpenJDK7.st
JavaNativeMethodImpl_SunJDK6.st
JavaNativeMethodImpl_SunJDK7.st
JavaNioSupport.st
JavaObject.st
JavaObjectDictionary.st
JavaPackage.st
JavaPopUpView.st
JavaProcess.st
JavaRef2.st
JavaRefMock.st
JavaRefsAndConstantPoolTestCase.st
JavaRelease.st
JavaResolver.st
JavaRuntimeConstantPoolTests.st
JavaShort.st
JavaSlotIndexCache.st
JavaSocket.st
JavaSourceCodeCache.st
JavaSourceFileWriter.st
JavaStringRef2.st
JavaTestCaseProxy.st
JavaTestsLoader.st
JavaTestsResource.st
JavaTopView.st
JavaUTF8Tests.st
JavaUnhandledExceptionError.st
JavaUnresolvedClassConstant.st
JavaUnresolvedCompilationError.st
JavaUnresolvedConstant.st
JavaUnresolvedStringConstant.st
JavaUtilities.st
JavaVM.st
JavaVMData.st
JavaView.st
JavaZipSupport.st
Make.proto
ProxyMethod.st
ProxyMethodAndNode.st
ProxyMethodBlockInvocationNode.st
ProxyMethodCompiler.st
ProxyMethodConditionNode.st
ProxyMethodGuardNode.st
ProxyMethodInvocationNode.st
ProxyMethodJavaFieldAccessor.st
ProxyMethodJavaFieldGetter.st
ProxyMethodJavaFieldSetter.st
ProxyMethodJavaMethodInvocationNode.st
ProxyMethodJavaTypeCheckNode.st
ProxyMethodMethodInvocationNode.st
ProxyMethodNode.st
ProxyMethodTypeCheckNode.st
SmalltalkAppletContext.st
SmalltalkAppletStub.st
TestletTestCaseProxy.st
abbrev.stc
bc.mak
benchmarks/Ackerman.st
benchmarks/Ary.st
benchmarks/CrossLanguageInvocation.st
benchmarks/Groovy.st
benchmarks/Hash.st
benchmarks/Jasper.st
benchmarks/JavaBenchmark.st
benchmarks/JavaBenchmarkRunner.st
benchmarks/MethodInvocation.st
benchmarks/Native1.st
benchmarks/ObjectArguments.st
benchmarks/OverloadedMethods.st
benchmarks/OverloadedMethods2.st
benchmarks/PrimitiveArguments.st
benchmarks/Saxon.st
benchmarks/Strcat.st
benchmarks/Threadring.st
benchmarks/WrappedArguments.st
benchmarks/benchmarks.rc
benchmarks/stx_libjava_benchmarks.st
bmake.bat
examples/CDDatabaseHandler1.st
examples/CDDatabaseHandler2.st
examples/HelloWorldExampleS.st
examples/JavaExamples.st
examples/Make.proto
examples/Makefile.init
examples/STComparator.st
examples/bc.mak
examples/bmake.bat
examples/examples.rc
examples/lccmake.bat
examples/mingwmake.bat
examples/stx_libjava_examples.st
examples/tomcat6/ApacheTomcat6.st
examples/tomcat6/Make.proto
examples/tomcat6/Make.spec
examples/tomcat6/Makefile.init
examples/tomcat6/abbrev.stc
examples/tomcat6/autopackage/default.apspec
examples/tomcat6/bc.mak
examples/tomcat6/builder/baseline.rbspec
examples/tomcat6/builder/package.deps.rake
examples/tomcat6/mingwmake.bat
examples/tomcat6/modules.c
examples/tomcat6/modules.stx
examples/tomcat6/stx_libjava_examples_tomcat6.st
examples/tomcat6/tomcat6.nsi
examples/tomcat6/tomcat6WinRC.rc
examples/tomcat6/vcmake.bat
examples/vcmake.bat
experiments/Benchmarks__JavaLookup.st
experiments/JavaByteCodeInterpreter.st
experiments/JavaByteCodeInterpreterTests.st
experiments/JavaByteCodeSteppableInterpreter.st
experiments/JavaClassReloadingTests.st
experiments/JavaCompiler.st
experiments/JavaCompilerProblemRegistry.st
experiments/JavaCompilerTests.st
experiments/JavaMethodWrapperCompiler.st
experiments/JavaSingleClassReloadingTests.st
experiments/Make.proto
experiments/Make.spec
experiments/NoReflectionObject.st
experiments/PersonSample.st
experiments/SampleHandler.st
experiments/SetSample.st
experiments/abbrev.stc
experiments/bc.mak
experiments/experiments.rc
experiments/extensions.st
experiments/libInit.cc
experiments/stx_libjava_experiments.st
extensions.st
lccmake.bat
libjava.rc
libs/Makefile.init
libs/libs.rc
libs/stx_libjava_libs.st
mauve/Make.proto
mauve/Make.spec
mauve/Makefile.init
mauve/bc.mak
mauve/libInit.cc
mauve/mauve.rc
mauve/mingwmake.bat
mauve/stx_libjava_mauve.st
mauve/vcmake.bat
mingwmake.bat
startup/JavaStartup.st
startup/Make.proto
startup/Make.spec
startup/Makefile.init
startup/autopackage/default.apspec
startup/bc.mak
startup/builder/baseline.rbspec
startup/builder/package.deps.rake
startup/mingwmake.bat
startup/modules.c
startup/modules.stx
startup/startup.nsi
startup/startupWinRC.rc
startup/stx_libjava_startup.st
startup/vcmake.bat
stx_libjava.st
tools/JavaAnnotationDeclarationNode.st
tools/JavaClassDeclarationNode.st
tools/JavaCodeBundleEditor.st
tools/JavaCodeLibraryEditor.st
tools/JavaCompilerProblemHighlighter.st
tools/JavaCompilerProblemPopup.st
tools/JavaCompilerProblemService.st
tools/JavaConstructorDeclarationNode.st
tools/JavaDeclarationNode.st
tools/JavaEnumDeclarationNode.st
tools/JavaImportDeclarationNode.st
tools/JavaInterfaceDeclarationNode.st
tools/JavaListInspectorView.st
tools/JavaLiteralNode.st
tools/JavaMapInspectorView.st
tools/JavaMethodDeclarationNode.st
tools/JavaMethodLikeDeclarationNode.st
tools/JavaPackageDeclarationNode.st
tools/JavaParseNode.st
tools/JavaParseNodeBuilder.st
tools/JavaParser.st
tools/JavaParserI.st
tools/JavaParserII.st
tools/JavaParserIITests.st
tools/JavaParserITests.st
tools/JavaParser_Eclipse.st
tools/JavaScanner.st
tools/JavaScannerBase.st
tools/JavaSetInspectorView.st
tools/JavaSettingsApplication.st
tools/JavaSourceDocument.st
tools/JavaSourceFile.st
tools/JavaSourceHighlighter.st
tools/JavaSourcePartition.st
tools/JavaSourcePartitioner.st
tools/JavaSourcePartitionerTests.st
tools/JavaSourceReference.st
tools/JavaSyntaxHighlighter_Eclipse.st
tools/JavaSyntaxHighlighter_Old.st
tools/JavaToolbox.st
tools/JavaTypeDeclarationNode.st
tools/JavaVariableDeclarationNode.st
tools/stx_libjava_tools.st
tools/tools.rc
vcmake.bat
--- a/GroovyClass.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/GroovyClass.st	Fri Sep 06 00:16:38 2013 +0100
@@ -73,7 +73,7 @@
 !GroovyClass class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/GroovyClass.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/GroovyCompiler.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/GroovyCompiler.st	Fri Sep 06 00:16:38 2013 +0100
@@ -270,7 +270,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/GroovyCompiler.st,v 1.4 2013-04-11 09:35:13 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/GroovyEvaluator.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/GroovyEvaluator.st	Fri Sep 06 00:16:38 2013 +0100
@@ -246,7 +246,7 @@
 !GroovyEvaluator class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/GroovyEvaluator.st,v 1.3 2013-04-11 09:10:13 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/GroovyLanguage.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/GroovyLanguage.st	Fri Sep 06 00:16:38 2013 +0100
@@ -184,7 +184,7 @@
 !GroovyLanguage class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/GroovyLanguage.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/GroovyMetaclass.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/GroovyMetaclass.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !GroovyMetaclass class methodsFor:'accessing - template'!
 
 classTemplateFor:aSuperClass in:categoryString asNamespace:asNameSpace private:isPrivate
@@ -62,7 +61,6 @@
     "Created: / 04-04-2012 / 09:54:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !GroovyMetaclass methodsFor:'compiler interface'!
 
 programmingLanguage
@@ -79,11 +77,10 @@
     "Created: / 04-04-2012 / 02:24:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !GroovyMetaclass class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/GroovyMetaclass.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/GroovySourceFileWriter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/GroovySourceFileWriter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !GroovySourceFileWriter methodsFor:'source writing'!
 
 fileOut:class on:stream withTimeStamp:stampIt withInitialize:initIt withDefinition:withDefinition methodFilter:methodFilter encoder:encoderOrNil
@@ -75,7 +74,6 @@
     ^ self shouldImplement
 ! !
 
-
 !GroovySourceFileWriter methodsFor:'source writing - comments'!
 
 fileOutCommentEndOn:aStream
@@ -98,11 +96,10 @@
     "Modified: / 18-02-2012 / 18:35:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !GroovySourceFileWriter class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/GroovySourceFileWriter.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JUnitTestCaseProxy.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JUnitTestCaseProxy.st	Fri Sep 06 00:16:38 2013 +0100
@@ -182,7 +182,7 @@
 !JUnitTestCaseProxy class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JUnitTestCaseProxy.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/Java.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/Java.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1629,7 +1629,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/Java.st,v 1.142 2013-07-16 17:48:47 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaAnnotation.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotation.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaAnnotation class methodsFor:'instance creation'!
 
 for:parent
@@ -68,7 +67,6 @@
     "Modified: / 17-12-2010 / 16:32:46 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaAnnotation methodsFor:'accessing'!
 
 constantPool
@@ -132,7 +130,6 @@
     valuesCount := something.
 ! !
 
-
 !JavaAnnotation methodsFor:'initialization'!
 
 initialize
@@ -151,11 +148,10 @@
     "Modified: / 17-12-2010 / 16:33:59 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaAnnotation class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotation.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationArrayValue.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationArrayValue.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaAnnotationArrayValue methodsFor:'accessing'!
 
 count
@@ -90,11 +89,10 @@
     "Created: / 25-02-2011 / 12:12:31 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaAnnotationArrayValue class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationArrayValue.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationClassValue.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationClassValue.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaAnnotationClassValue methodsFor:'accessing'!
 
 classIndex
@@ -72,11 +71,10 @@
     "Modified: / 17-12-2010 / 14:42:17 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaAnnotationClassValue class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationClassValue.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationContainer.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationContainer.st	Fri Sep 06 00:16:38 2013 +0100
@@ -60,7 +60,6 @@
 "
 ! !
 
-
 !JavaAnnotationContainer class methodsFor:'instance creation'!
 
 for:parent 
@@ -76,7 +75,6 @@
     ^ self basicNew initialize.
 ! !
 
-
 !JavaAnnotationContainer class methodsFor:'accessing'!
 
 empty
@@ -88,7 +86,6 @@
     "Modified: / 16-03-2011 / 16:49:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaAnnotationContainer methodsFor:'accessing'!
 
 ensureRuntimeInvisible
@@ -123,7 +120,6 @@
     runtimeVisible := something.
 ! !
 
-
 !JavaAnnotationContainer methodsFor:'initialization'!
 
 initialize
@@ -147,11 +143,10 @@
     "Modified: / 16-03-2011 / 16:50:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaAnnotationContainer class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationContainer.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationDefault.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationDefault.st	Fri Sep 06 00:16:38 2013 +0100
@@ -60,7 +60,6 @@
 "
 ! !
 
-
 !JavaAnnotationDefault class methodsFor:'accessing'!
 
 empty
@@ -71,7 +70,6 @@
     "Created: / 03-03-2011 / 22:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaAnnotationDefault methodsFor:'accessing'!
 
 bytes
@@ -90,11 +88,10 @@
     value := something.
 ! !
 
-
 !JavaAnnotationDefault class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationDefault.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationDictionary.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationDictionary.st	Fri Sep 06 00:16:38 2013 +0100
@@ -60,7 +60,6 @@
 "
 ! !
 
-
 !JavaAnnotationDictionary class methodsFor:'accessing'!
 
 empty
@@ -72,7 +71,6 @@
     "Modified: / 16-03-2011 / 17:42:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaAnnotationDictionary methodsFor:'accessing'!
 
 bytes
@@ -94,11 +92,10 @@
     bytes := something.
 ! !
 
-
 !JavaAnnotationDictionary class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationDictionary.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationEnumValue.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationEnumValue.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaAnnotationEnumValue methodsFor:'accessing'!
 
 name 
@@ -88,11 +87,10 @@
     valueIndex := something.
 ! !
 
-
 !JavaAnnotationEnumValue class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationEnumValue.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationNestedAnnotationValue.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationNestedAnnotationValue.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaAnnotationNestedAnnotationValue methodsFor:'accessing'!
 
 nestedAnnotation
@@ -76,11 +75,10 @@
     "Modified: / 17-12-2010 / 14:44:38 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaAnnotationNestedAnnotationValue class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationNestedAnnotationValue.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationPrimitiveValue.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationPrimitiveValue.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaAnnotationPrimitiveValue methodsFor:'accessing'!
 
 value
@@ -76,11 +75,10 @@
     "Modified: / 27-07-2011 / 09:35:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaAnnotationPrimitiveValue class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationPrimitiveValue.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAnnotationValue.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAnnotationValue.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaAnnotationValue class methodsFor:'instance creation'!
 
 for:arg
@@ -62,7 +61,6 @@
     ^ self basicNew initializeFor:arg
 ! !
 
-
 !JavaAnnotationValue methodsFor:'accessing'!
 
 constantPool
@@ -91,7 +89,6 @@
     "Created: / 17-12-2010 / 14:38:44 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaAnnotationValue methodsFor:'initialization'!
 
 initializeFor:arg
@@ -102,11 +99,10 @@
     "Modified: / 17-12-2010 / 14:28:40 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaAnnotationValue class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAnnotationValue.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaAntProjectResource.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaAntProjectResource.st	Fri Sep 06 00:16:38 2013 +0100
@@ -184,7 +184,7 @@
 !JavaAntProjectResource class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaAntProjectResource.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaArray.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaArray.st	Fri Sep 06 00:16:38 2013 +0100
@@ -20,7 +20,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-Array subclass:#JavaArray
+Array variableSubclass:#JavaArray
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -60,7 +60,6 @@
 "
 ! !
 
-
 !JavaArray class methodsFor:'initialization'!
 
 classInit
@@ -83,7 +82,6 @@
     "Created: / 17-12-2010 / 13:25:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaArray class methodsFor:'accessing'!
 
 classLoader
@@ -132,7 +130,6 @@
     "Created: / 22-05-2011 / 18:03:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaArray class methodsFor:'accessing - java'!
 
 javaMirrorClass
@@ -145,7 +142,6 @@
     "Created: / 31-07-2012 / 18:28:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaArray class methodsFor:'autoboxing support'!
 
 javaUnwrap: anObject
@@ -190,7 +186,6 @@
     "Created: / 04-11-2012 / 23:33:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaArray class methodsFor:'class creation'!
 
 javaArrayClass
@@ -226,7 +221,6 @@
     "Modified: / 05-07-2012 / 23:23:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaArray class methodsFor:'queries'!
 
 hasInterface:aJavaInterface
@@ -320,11 +314,10 @@
     "Created: / 21-12-2010 / 12:51:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaArray class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaArray.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaBehavior.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaBehavior.st	Fri Sep 06 00:16:38 2013 +0100
@@ -382,7 +382,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaBehavior.st,v 1.8 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaByte.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaByte.st	Fri Sep 06 00:16:38 2013 +0100
@@ -117,7 +117,7 @@
 !JavaByte class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaByte.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaByteCodeDisassembler.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaByteCodeDisassembler.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaByteCodeDisassembler class methodsFor:'initialization'!
 
 initialize
@@ -66,7 +65,6 @@
     "Modified: / 22-03-2011 / 20:53:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler class methodsFor:'instance creation'!
 
 new
@@ -75,7 +73,6 @@
     ^ self basicNew initialize.
 ! !
 
-
 !JavaByteCodeDisassembler class methodsFor:'disassembling'!
 
 diassemble:aMethod 
@@ -90,7 +87,6 @@
     "Created: / 22-03-2011 / 21:13:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler methodsFor:'disassembling'!
 
 diassemble:aJavaMethod 
@@ -118,7 +114,6 @@
     "Modified: / 22-03-2011 / 15:59:50 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler methodsFor:'helpers - constants'!
 
 address
@@ -247,7 +242,6 @@
     "Created: / 20-03-2011 / 18:31:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler methodsFor:'helpers - instruction groups'!
 
 arrayValueLoader    
@@ -394,7 +388,6 @@
     "Modified: / 21-03-2011 / 14:55:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler methodsFor:'helpers - printing'!
 
 prettyPrintArgs: argsString 
@@ -612,7 +605,6 @@
     "Created: / 22-03-2011 / 20:53:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler methodsFor:'initialization'!
 
 initialize
@@ -629,7 +621,6 @@
     "Modified: / 22-03-2011 / 20:53:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler methodsFor:'instructions'!
 
 aaload
@@ -1830,7 +1821,6 @@
     "Modified: / 20-03-2011 / 21:48:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler methodsFor:'processing loop'!
 
 handleAbstractMethod
@@ -1857,11 +1847,10 @@
     "Created: / 22-03-2011 / 20:57:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodeDisassembler class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaByteCodeDisassembler.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaByteCodeDisassemblerTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaByteCodeDisassemblerTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -856,7 +856,7 @@
 !JavaByteCodeDisassemblerTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaByteCodeDisassemblerTests.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaByteCodeEnumerator.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaByteCodeEnumerator.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaByteCodeEnumerator methodsFor:'accessing'!
 
 literalAction
@@ -72,7 +71,6 @@
     "Created: / 9.11.1999 / 15:27:37 / cg"
 ! !
 
-
 !JavaByteCodeEnumerator methodsFor:'operand decoding'!
 
 constIndexByte
@@ -102,7 +100,6 @@
     "Modified: / 9.11.1999 / 15:29:31 / cg"
 ! !
 
-
 !JavaByteCodeEnumerator methodsFor:'processing'!
 
 instructionHookPC:pc op:op spec:spec
@@ -140,7 +137,6 @@
     "Modified: / 9.11.1999 / 17:22:00 / cg"
 ! !
 
-
 !JavaByteCodeEnumerator class methodsFor:'documentation'!
 
 version
@@ -148,7 +144,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaByteCodeEnumerator.st,v 1.8 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaByteCodePreresolver.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaByteCodePreresolver.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaByteCodePreresolver methodsFor:'instructions'!
 
 anewarray
@@ -162,7 +161,6 @@
     "Modified: / 28-02-2012 / 22:14:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodePreresolver methodsFor:'processing'!
 
 enterProcessingLoop
@@ -190,11 +188,10 @@
     "Created: / 09-02-2012 / 22:37:02 / mh <hlopik@gmail.com>"
 ! !
 
-
 !JavaByteCodePreresolver class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaByteCodePreresolver.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaByteCodeProcessor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaByteCodeProcessor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -2583,7 +2583,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaByteCodeProcessor.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaByteCodeProcessorAdapter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaByteCodeProcessorAdapter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1182,7 +1182,7 @@
 !JavaByteCodeProcessorAdapter class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaByteCodeProcessorAdapter.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaByteCodeProcessorTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaByteCodeProcessorTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -114,7 +114,7 @@
 !JavaByteCodeProcessorTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaByteCodeProcessorTests.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClass.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClass.st	Fri Sep 06 00:16:38 2013 +0100
@@ -2909,7 +2909,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.135 2013-04-27 12:31:15 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaClassAccessor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassAccessor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -218,7 +218,7 @@
 !JavaClassAccessor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassAccessor.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassAnnotationContainer.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassAnnotationContainer.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,11 +53,10 @@
 "
 ! !
 
-
 !JavaClassAnnotationContainer class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassAnnotationContainer.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassContentRef2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassContentRef2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -181,7 +181,7 @@
 !JavaClassContentRef2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassContentRef2.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassLoadingTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassLoadingTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -110,7 +110,7 @@
 !JavaClassLoadingTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassLoadingTests.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassPathBundle.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassPathBundle.st	Fri Sep 06 00:16:38 2013 +0100
@@ -274,7 +274,7 @@
 !JavaClassPathBundle class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassPathBundle.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassQuery.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassQuery.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaClassQuery class methodsFor:'queries'!
 
 query: className
@@ -66,7 +65,6 @@
     "Created: / 06-09-2012 / 11:52:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassQuery methodsFor:'accessing'!
 
 className
@@ -81,11 +79,10 @@
     "Created: / 06-09-2012 / 11:55:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassQuery class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassQuery.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassReader.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassReader.st	Fri Sep 06 00:16:38 2013 +0100
@@ -2471,7 +2471,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReader.st,v 1.97 2013-03-18 16:59:01 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaClassReaderTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassReaderTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -236,7 +236,7 @@
 !JavaClassReaderTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReaderTests.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassRef2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassRef2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -248,7 +248,7 @@
 !JavaClassRef2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassRef2.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassRefTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassRefTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -313,7 +313,7 @@
 !JavaClassRefTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassRefTests.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaClassRegistry.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassRegistry.st	Fri Sep 06 00:16:38 2013 +0100
@@ -489,7 +489,7 @@
 !JavaClassRegistry class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassRegistry.st,v 1.4 2013-04-25 13:10:25 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaClassReloader.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaClassReloader.st	Fri Sep 06 00:16:38 2013 +0100
@@ -405,7 +405,7 @@
 !JavaClassReloader class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReloader.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaCodeBundle.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaCodeBundle.st	Fri Sep 06 00:16:38 2013 +0100
@@ -243,6 +243,6 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaCodeBundle.st,v 1.3 2013-03-07 15:32:16 vrany Exp $'
+    ^ '$Header$'
 ! !
 
--- a/JavaCodeLibrary.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaCodeLibrary.st	Fri Sep 06 00:16:38 2013 +0100
@@ -153,6 +153,6 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaCodeLibrary.st,v 1.3 2013-03-07 15:32:02 vrany Exp $'
+    ^ '$Header$'
 ! !
 
--- a/JavaCodeLibraryOrBundle.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaCodeLibraryOrBundle.st	Fri Sep 06 00:16:38 2013 +0100
@@ -170,6 +170,6 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaCodeLibraryOrBundle.st,v 1.3 2013-03-07 15:32:09 vrany Exp $'
+    ^ '$Header$'
 ! !
 
--- a/JavaCompiler_Eclipse.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaCompiler_Eclipse.st	Fri Sep 06 00:16:38 2013 +0100
@@ -138,7 +138,7 @@
 !JavaCompiler_Eclipse class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaCompiler_Eclipse.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaConstantPool.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaConstantPool.st	Fri Sep 06 00:16:38 2013 +0100
@@ -20,7 +20,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-Array subclass:#JavaConstantPool
+Array variableSubclass:#JavaConstantPool
 	instanceVariableNames:'owner'
 	classVariableNames:'ConstantPools'
 	poolDictionaries:''
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaConstantPool class methodsFor:'accessing'!
 
 allConstantPools
@@ -74,7 +73,6 @@
     "Modified: / 11-04-2011 / 18:47:58 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaConstantPool class methodsFor:'special'!
 
 invalidateForClass: internalJavaClassName 
@@ -93,7 +91,6 @@
     "Created: / 08-04-2011 / 16:09:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaConstantPool methodsFor:'accessing'!
 
 owner
@@ -112,7 +109,6 @@
     "Created: 28.6.1996 / 21:12:22 / cg"
 ! !
 
-
 !JavaConstantPool methodsFor:'adding'!
 
 at: classRefIndex putClassRefWithNameAt: classNameIndex 
@@ -156,7 +152,6 @@
     "Created: / 13-05-2011 / 09:05:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaConstantPool methodsFor:'invalidation'!
 
 invalidateForClass: slashedJavaClassName
@@ -176,7 +171,6 @@
     "Modified: / 22-02-2012 / 20:53:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaConstantPool methodsFor:'printing & storing'!
 
 displayString
@@ -189,7 +183,6 @@
     "Modified: 28.6.1996 / 21:20:26 / cg"
 ! !
 
-
 !JavaConstantPool methodsFor:'queries'!
 
 refersToMethod:aJavaMethod
@@ -224,7 +217,6 @@
     "Modified: / 26-07-2011 / 17:54:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaConstantPool methodsFor:'special'!
 
 classReferencesDo:aBlock
@@ -299,7 +291,6 @@
     "Modified: / 4.2.1998 / 22:12:03 / cg"
 ! !
 
-
 !JavaConstantPool class methodsFor:'documentation'!
 
 version
@@ -307,7 +298,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaConstantPool.st,v 1.19 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaConstants.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaConstants.st	Fri Sep 06 00:16:38 2013 +0100
@@ -176,7 +176,7 @@
 !JavaConstants class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaConstants.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaContext.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaContext.st	Fri Sep 06 00:16:38 2013 +0100
@@ -676,7 +676,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaContext.st,v 1.40 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaDecompiler.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaDecompiler.st	Fri Sep 06 00:16:38 2013 +0100
@@ -78,7 +78,6 @@
 
 ! !
 
-
 !JavaDecompiler class methodsFor:'initialization'!
 
 initialize
@@ -381,14 +380,12 @@
     "Modified: / 16.11.1998 / 15:55:49 / cg"
 ! !
 
-
 !JavaDecompiler class methodsFor:'accessing'!
 
 instructionTable
     ^ DecoderTable
 ! !
 
-
 !JavaDecompiler class methodsFor:'class definition generation'!
 
 definitionOf:aJavaClass on:s
@@ -731,7 +728,6 @@
     "Modified (format): / 30-03-2012 / 19:52:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaDecompiler class methodsFor:'decompiling'!
 
 decompile:aJavaMethod
@@ -742,7 +738,6 @@
     self new decompile:aJavaMethod to:aStream
 ! !
 
-
 !JavaDecompiler methodsFor:'decompiling'!
 
 decompile:aJavaMethod to:aStream
@@ -844,7 +839,6 @@
     "Created: / 9.11.1999 / 15:35:19 / cg"
 ! !
 
-
 !JavaDecompiler methodsFor:'operand decoding'!
 
 arrayTypeByte
@@ -1149,7 +1143,6 @@
     "Modified: / 16.11.1998 / 15:45:33 / cg"
 ! !
 
-
 !JavaDecompiler methodsFor:'private'!
 
 popType:type
@@ -1164,7 +1157,6 @@
     "Created: 16.8.1997 / 03:14:11 / cg"
 ! !
 
-
 !JavaDecompiler methodsFor:'statistics'!
 
 remember_athrow
@@ -1280,7 +1272,6 @@
     "Created: / 16.11.1998 / 16:08:04 / cg"
 ! !
 
-
 !JavaDecompiler class methodsFor:'documentation'!
 
 version
@@ -1288,7 +1279,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaDecompiler.st,v 1.54 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaDescriptor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaDescriptor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaDescriptor class methodsFor:'instance creation'!
 
 fromString: aString
@@ -93,7 +92,6 @@
     "Modified: / 13-08-2011 / 01:37:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaDescriptor class methodsFor:'accessing'!
 
 baseTypes
@@ -110,7 +108,6 @@
     "Created: / 03-02-2011 / 21:08:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaDescriptor class methodsFor:'class initialization'!
 
 initialize
@@ -164,7 +161,6 @@
     "Modified (comment): / 24-02-2012 / 19:40:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaDescriptor class methodsFor:'queries'!
 
 isJavaPrimitiveArrayName: className 
@@ -178,7 +174,6 @@
         and: [BaseTypes includesKey: justTypeSymbol first].
 ! !
 
-
 !JavaDescriptor class methodsFor:'reading-private'!
 
 readArrayTypeFrom: stream onError: exceptionBlock 
@@ -309,11 +304,10 @@
     "Created: / 13-08-2011 / 01:39:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaDescriptor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaDescriptor.st,v 1.4 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaEmbeddedFrameView.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaEmbeddedFrameView.st	Fri Sep 06 00:16:38 2013 +0100
@@ -636,7 +636,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaEmbeddedFrameView.st,v 1.31 2013-04-27 12:31:24 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaError.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaError.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,11 +53,10 @@
 "
 ! !
 
-
 !JavaError class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaError.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaExceptionTable.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaExceptionTable.st	Fri Sep 06 00:16:38 2013 +0100
@@ -114,6 +114,10 @@
 
 !JavaExceptionTable class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/JavaExceptionTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaExceptionTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -300,7 +300,7 @@
 !JavaExceptionTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaExceptionTests.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaField.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaField.st	Fri Sep 06 00:16:38 2013 +0100
@@ -55,7 +55,6 @@
 "
 ! !
 
-
 !JavaField class methodsFor:'class initialization'!
 
 initialize
@@ -94,7 +93,6 @@
     "Modified: / 21-02-2012 / 09:28:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaField class methodsFor:'constants'!
 
 A_FINAL
@@ -139,7 +137,6 @@
 
 ! !
 
-
 !JavaField methodsFor:'accessing'!
 
 accessFlags
@@ -215,7 +212,6 @@
     "Created: / 15.10.1998 / 10:37:06 / cg"
 ! !
 
-
 !JavaField methodsFor:'initialization'!
 
 setAccessFlags:flags
@@ -271,7 +267,6 @@
     "Created: 16.4.1996 / 13:04:43 / cg"
 ! !
 
-
 !JavaField methodsFor:'printing & storing'!
 
 printOn: aStream 
@@ -295,7 +290,6 @@
     "Modified: / 07-12-2011 / 22:03:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaField methodsFor:'queries'!
 
 initialValue
@@ -375,7 +369,6 @@
     "Created: / 13-02-2013 / 19:21:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaField class methodsFor:'documentation'!
 
 version
@@ -383,7 +376,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaField.st,v 1.22 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaFieldAnnotationContainer.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaFieldAnnotationContainer.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,11 +53,10 @@
 "
 ! !
 
-
 !JavaFieldAnnotationContainer class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaFieldAnnotationContainer.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaFieldDescriptor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaFieldDescriptor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaFieldDescriptor class methodsFor:'instance creation'!
 
 javaClass: cls
@@ -70,7 +69,6 @@
     "Created: / 25-11-2010 / 18:08:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaFieldDescriptor methodsFor:'accessing'!
 
 dimensions
@@ -128,7 +126,6 @@
     "Created: / 16-08-2012 / 12:48:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaFieldDescriptor methodsFor:'comparing'!
 
 = another
@@ -158,7 +155,6 @@
     "Modified: / 14-12-2011 / 21:55:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaFieldDescriptor methodsFor:'initialization'!
 
 javaClass:aJavaClass
@@ -171,7 +167,6 @@
     "Modified: / 06-12-2011 / 21:41:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaFieldDescriptor methodsFor:'queries'!
 
 slots
@@ -187,11 +182,10 @@
     "Created: / 16-12-2011 / 00:22:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaFieldDescriptor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaFieldDescriptor.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaFieldDescriptorWithUnionType.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaFieldDescriptorWithUnionType.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaFieldDescriptorWithUnionType class methodsFor:'instance creation'!
 
 new
@@ -62,7 +61,6 @@
     ^ self basicNew initialize.
 ! !
 
-
 !JavaFieldDescriptorWithUnionType methodsFor:'accessing'!
 
 addDescriptor: desc
@@ -72,7 +70,6 @@
     "Created: / 10-12-2011 / 21:38:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaFieldDescriptorWithUnionType methodsFor:'comparing'!
 
 match: another
@@ -85,7 +82,6 @@
     "Created: / 10-12-2011 / 21:33:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaFieldDescriptorWithUnionType methodsFor:'initialization'!
 
 initialize
@@ -99,11 +95,10 @@
     "Modified: / 10-12-2011 / 21:31:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaFieldDescriptorWithUnionType class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaFieldDescriptorWithUnionType.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaFieldRef2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaFieldRef2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaFieldRef2 class methodsFor:'initialization'!
 
 initialize
@@ -63,7 +62,6 @@
     "Created: / 15-05-2011 / 22:31:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaFieldRef2 methodsFor:'accessing'!
 
 isJavaFieldRef
@@ -86,7 +84,6 @@
     "Created: / 15-05-2011 / 22:29:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaFieldRef2 methodsFor:'private - resolving'!
 
 findInstOffset
@@ -176,11 +173,10 @@
     "Created: / 15-05-2011 / 22:29:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaFieldRef2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaFieldRef2.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaFieldRefTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaFieldRefTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -450,7 +450,7 @@
 !JavaFieldRefTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaFieldRefTests.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaFinalizationRegistry.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaFinalizationRegistry.st	Fri Sep 06 00:16:38 2013 +0100
@@ -482,7 +482,7 @@
 !JavaFinalizationRegistry class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaFinalizationRegistry.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaFreshlyInitializedResource.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaFreshlyInitializedResource.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,7 @@
 !JavaFreshlyInitializedResource class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaFreshlyInitializedResource.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaInitializedResource.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaInitializedResource.st	Fri Sep 06 00:16:38 2013 +0100
@@ -83,7 +83,7 @@
 !JavaInitializedResource class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaInitializedResource.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaInterfaceMethodRef2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaInterfaceMethodRef2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaInterfaceMethodRef2 methodsFor:'private - resolving'!
 
 findResolvedStaticValue
@@ -90,7 +89,6 @@
     "Created: / 09-02-2012 / 23:10:44 / mh <hlopik@gmail.com>"
 ! !
 
-
 !JavaInterfaceMethodRef2 methodsFor:'queries'!
 
 isJavaInterfaceMethodRef
@@ -101,11 +99,10 @@
     "Created: / 14-04-2011 / 15:33:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaInterfaceMethodRef2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaInterfaceMethodRef2.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaInterfaceMethodRefTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaInterfaceMethodRefTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -194,7 +194,7 @@
 !JavaInterfaceMethodRefTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaInterfaceMethodRefTests.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaInvalidRefError.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaInvalidRefError.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaInvalidRefError methodsFor:'accessing'!
 
 index
@@ -72,11 +71,10 @@
     javaClass := aJavaClass.
 ! !
 
-
 !JavaInvalidRefError class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaInvalidRefError.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaJUnitTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaJUnitTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -132,7 +132,7 @@
 !JavaJUnitTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaJUnitTests.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaLanguage.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLanguage.st	Fri Sep 06 00:16:38 2013 +0100
@@ -241,7 +241,7 @@
 !JavaLanguage class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLanguage.st,v 1.5 2013-04-11 09:34:19 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaLibraries.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLibraries.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaLibraries class methodsFor:'accessing'!
 
 directory
@@ -71,7 +70,6 @@
     "Modified: / 16-11-2012 / 00:11:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLibraries class methodsFor:'private'!
 
 runMaven
@@ -85,7 +83,6 @@
     "Created: / 20-08-2012 / 19:39:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLibraries class methodsFor:'utilities'!
 
 addToClassPath
@@ -161,11 +158,10 @@
     "Modified: / 16-11-2012 / 00:16:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLibraries class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLibraries.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaLibrariesResource.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLibrariesResource.st	Fri Sep 06 00:16:38 2013 +0100
@@ -67,7 +67,7 @@
 !JavaLibrariesResource class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLibrariesResource.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaLocalVariableTable.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLocalVariableTable.st	Fri Sep 06 00:16:38 2013 +0100
@@ -20,7 +20,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-Array subclass:#JavaLocalVariableTable
+Array variableSubclass:#JavaLocalVariableTable
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaLocalVariableTable methodsFor:'queries'!
 
 nameForSlot:slot atPC:pc
@@ -85,7 +84,6 @@
     "Modified: / 8.1.1998 / 18:56:20 / cg"
 ! !
 
-
 !JavaLocalVariableTable class methodsFor:'documentation'!
 
 version
@@ -93,7 +91,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLocalVariableTable.st,v 1.13 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaLocalVariableTableEntry.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLocalVariableTableEntry.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaLocalVariableTableEntry methodsFor:'accessing'!
 
 endPC
@@ -80,7 +79,6 @@
     "Created: / 8.1.1998 / 18:40:27 / cg"
 ! !
 
-
 !JavaLocalVariableTableEntry methodsFor:'printing'!
 
 displayString
@@ -100,7 +98,6 @@
     "Created: / 23-11-2010 / 19:45:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLocalVariableTableEntry methodsFor:'private accessing'!
 
 startPC:start_pc length:l name:nm signature:sig slot:sl
@@ -113,7 +110,6 @@
     "Created: 6.5.1996 / 11:18:14 / cg"
 ! !
 
-
 !JavaLocalVariableTableEntry class methodsFor:'documentation'!
 
 version
@@ -121,7 +117,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLocalVariableTableEntry.st,v 1.12 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaLookup.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLookup.st	Fri Sep 06 00:16:38 2013 +0100
@@ -820,7 +820,7 @@
 !JavaLookup class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLookup.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaLookupResolutionAlgorithmTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLookupResolutionAlgorithmTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -195,7 +195,7 @@
 !JavaLookupResolutionAlgorithmTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLookupResolutionAlgorithmTests.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaLookupTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLookupTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -427,7 +427,7 @@
 !JavaLookupTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLookupTests.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaLookupTestsResource.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaLookupTestsResource.st	Fri Sep 06 00:16:38 2013 +0100
@@ -174,7 +174,7 @@
 !JavaLookupTestsResource class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaLookupTestsResource.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMathSupport.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMathSupport.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaMathSupport class methodsFor:'java-style FP functions'!
 
 cos:f
@@ -122,11 +121,10 @@
     "Created: / 07-09-2011 / 17:32:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMathSupport class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMathSupport.st,v 1.3 2013-05-21 21:15:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMetaclass.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMetaclass.st	Fri Sep 06 00:16:38 2013 +0100
@@ -137,7 +137,7 @@
 !JavaMetaclass class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMetaclass.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMethod.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMethod.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1938,17 +1938,6 @@
         arguments: (Array with: a1 with: a2 with: a3)
 
     "Created: / 24-02-2011 / 22:06:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-interpretWithReceiver: receiver arguments:args
-
-    ^ JavaByteCodeInterpreter 
-        interpret:self
-        receiver:receiver
-        arguments:args
-
-    "Modified: / 24-02-2011 / 23:00:42 / Marcel Hlopko <hlopik@gmail.com>"
-    "Created: / 24-02-2011 / 22:04:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaMethod methodsFor:'methodref interchangability'!
@@ -2703,7 +2692,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMethod.st,v 1.114 2013-04-25 13:11:44 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaMethodAnalyzer.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMethodAnalyzer.st	Fri Sep 06 00:16:38 2013 +0100
@@ -306,3 +306,9 @@
     "Created: / 31-08-2013 / 23:22:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!JavaMethodAnalyzer class methodsFor:'documentation'!
+
+version_CVS
+    ^ '$Header$'
+! !
+
--- a/JavaMethodAnnotationContainer.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMethodAnnotationContainer.st	Fri Sep 06 00:16:38 2013 +0100
@@ -54,7 +54,6 @@
 "
 ! !
 
-
 !JavaMethodAnnotationContainer methodsFor:'accessing'!
 
 default
@@ -107,7 +106,6 @@
     "Created: / 01-12-2012 / 22:39:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaMethodAnnotationContainer methodsFor:'initialization'!
 
 initialize
@@ -135,11 +133,10 @@
     "Modified: / 16-03-2011 / 17:28:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaMethodAnnotationContainer class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMethodAnnotationContainer.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMethodDescriptor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMethodDescriptor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaMethodDescriptor class methodsFor:'instance creation'!
 
 name: name parameters: parameterDescriptors
@@ -87,7 +86,6 @@
     "Created: / 25-11-2010 / 18:45:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodDescriptor methodsFor:'accessing'!
 
 name
@@ -153,7 +151,6 @@
     "Created: / 16-08-2012 / 12:54:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodDescriptor methodsFor:'comparing'!
 
 = another
@@ -189,7 +186,6 @@
     "Created: / 06-12-2011 / 22:55:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodDescriptor methodsFor:'initialization'!
 
 name: aString
@@ -210,7 +206,6 @@
     return := something.
 ! !
 
-
 !JavaMethodDescriptor methodsFor:'queries'!
 
 numArgs
@@ -231,11 +226,10 @@
     "Created: / 16-12-2011 / 00:24:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodDescriptor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMethodDescriptor.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMethodRef2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMethodRef2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaMethodRef2 methodsFor:'printing & storing'!
 
 printOn:aStream
@@ -62,7 +61,6 @@
     super printOn:aStream.
 ! !
 
-
 !JavaMethodRef2 methodsFor:'private - resolving'!
 
 findResolvedStaticValue
@@ -97,7 +95,6 @@
     "Modified: / 22-08-2012 / 14:53:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodRef2 methodsFor:'queries'!
 
 isJavaMethodRef
@@ -106,7 +103,6 @@
     "Created: / 11-04-2011 / 19:56:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaMethodRef2 methodsFor:'resolving'!
 
 preResolve
@@ -139,11 +135,10 @@
     "Created: / 15-10-2012 / 23:13:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodRef2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMethodRef2.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMethodRefTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMethodRefTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -426,7 +426,7 @@
 !JavaMethodRefTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMethodRefTests.st,v 1.3 2013/02/25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMethodWithException.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMethodWithException.st	Fri Sep 06 00:16:38 2013 +0100
@@ -102,7 +102,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMethodWithException.st,v 1.11 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMethodWithHandler.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMethodWithHandler.st	Fri Sep 06 00:16:38 2013 +0100
@@ -141,7 +141,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMethodWithHandler.st,v 1.13 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMirror.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMirror.st	Fri Sep 06 00:16:38 2013 +0100
@@ -835,7 +835,7 @@
 !JavaMirror class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMirror.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMonitor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMonitor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -54,7 +54,6 @@
 "
 ! !
 
-
 !JavaMonitor class methodsFor:'initialization'!
 
 initialize
@@ -64,7 +63,6 @@
     "Modified (format): / 09-01-2013 / 16:10:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMonitor class methodsFor:'instance creation'!
 
 for: owningObject
@@ -79,7 +77,6 @@
     "Created: / 26-08-2012 / 17:01:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMonitor methodsFor:'accessing'!
 
 activeProcess
@@ -103,7 +100,6 @@
     "Created: / 20-11-2011 / 13:22:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaMonitor methodsFor:'atomic'!
 
 addProcess: aProcess 
@@ -208,7 +204,6 @@
     "Created: / 30-11-2011 / 20:34:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaMonitor methodsFor:'initialization'!
 
 initialize
@@ -262,7 +257,6 @@
     "Created: / 26-08-2012 / 17:02:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMonitor methodsFor:'public'!
 
 acquire
@@ -404,7 +398,6 @@
     "Modified: / 10-05-2012 / 00:24:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMonitor methodsFor:'queries'!
 
 isAcquired
@@ -419,11 +412,10 @@
     "Created: / 20-11-2011 / 13:23:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaMonitor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMonitor.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaMonitorsTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaMonitorsTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -568,7 +568,7 @@
 !JavaMonitorsTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMonitorsTests.st,v 1.2 2013/02/25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaNameAndType2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNameAndType2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaNameAndType2 class methodsFor:'instance creation'!
 
 in: aJavaConstantPool withNameAt: arg1 andDescriptorAt: arg2 
@@ -67,7 +66,6 @@
     "Created: / 10-05-2011 / 15:45:28 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'* As yet uncategorized *'!
 
 invalidateForClass:aSymbol
@@ -78,7 +76,6 @@
     "Created: / 22-02-2012 / 20:50:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'accessing'!
 
 constantPool
@@ -126,7 +123,6 @@
     "Modified: / 12-05-2011 / 18:51:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'backward compatibility'!
 
 isUnresolved
@@ -141,7 +137,6 @@
     "Created: / 13-05-2011 / 18:45:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'comparing'!
 
 = aNameAndType 
@@ -159,7 +154,6 @@
     "Modified: / 12-05-2011 / 18:44:26 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'initialization'!
 
 initializeIn: aJavaConstantPool withNameAt: nameCPIndex andDescriptorAt: descriptorCPIndex 
@@ -171,7 +165,6 @@
     "Created: / 10-05-2011 / 15:45:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'logging'!
 
 info: arg 
@@ -190,7 +183,6 @@
     "Modified: / 14-09-2011 / 21:42:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'printing'!
 
 printString
@@ -201,7 +193,6 @@
     "Modified: / 12-05-2011 / 18:44:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'queries'!
 
 isJavaNameAndType
@@ -220,7 +211,6 @@
     "Created: / 10-05-2011 / 12:24:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 methodsFor:'resolving'!
 
 preresolve
@@ -255,11 +245,10 @@
     "Modified: / 04-06-2011 / 18:40:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaNameAndType2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNameAndType2.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaNativeMemory.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNativeMemory.st	Fri Sep 06 00:16:38 2013 +0100
@@ -67,7 +67,6 @@
 "
 ! !
 
-
 !JavaNativeMemory class methodsFor:'initialization'!
 
 initialize
@@ -80,7 +79,6 @@
     "Modified: / 10-07-2012 / 18:54:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory class methodsFor:'instance creation'!
 
 new
@@ -89,7 +87,6 @@
     ^ self basicNew initialize.
 ! !
 
-
 !JavaNativeMemory methodsFor:'accessing'!
 
 defaultMallocatedMemoryChunkSize
@@ -100,7 +97,6 @@
     defaultMallocatedMemoryChunkSize := something.
 ! !
 
-
 !JavaNativeMemory methodsFor:'accessing-tests'!
 
 chunks
@@ -110,7 +106,6 @@
     "Created: / 11-07-2012 / 09:13:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory methodsFor:'allocation'!
 
 free: address
@@ -140,7 +135,6 @@
     "Created: / 10-07-2012 / 18:45:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory methodsFor:'byte access'!
 
 byteAt:address
@@ -181,7 +175,6 @@
     "Created: / 16-07-2012 / 16:00:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory methodsFor:'byte transfer'!
 
 bcopy: dstAddr length: length from: bytearray offset: offset
@@ -225,7 +218,6 @@
     "Created: / 11-07-2012 / 10:27:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory methodsFor:'error reporting'!
 
 errorSegmentationViolation: message
@@ -234,7 +226,6 @@
     "Created: / 10-07-2012 / 18:59:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory methodsFor:'initialization'!
 
 initialize
@@ -248,7 +239,6 @@
     "Modified: / 11-07-2012 / 09:11:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory methodsFor:'private'!
 
 chunkFor: address
@@ -259,7 +249,6 @@
     "Created: / 10-07-2012 / 18:57:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk class methodsFor:'instance creation'!
 
 new
@@ -278,7 +267,6 @@
     "Created: / 10-07-2012 / 18:36:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk methodsFor:'accessing'!
 
 base
@@ -297,7 +285,6 @@
     size := something.
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk methodsFor:'accessing-tests'!
 
 data
@@ -307,7 +294,6 @@
     "Modified (comment): / 11-07-2012 / 10:01:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk methodsFor:'allocation'!
 
 free: gaddress
@@ -374,7 +360,6 @@
     "Created: / 07-12-2010 / 23:25:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk methodsFor:'byte access'!
 
 byteAt:address
@@ -417,7 +402,6 @@
     "Created: / 16-07-2012 / 16:00:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk methodsFor:'byte transfer'!
 
 bcopy: dstAddr length: length from: bytearray offset: offset
@@ -468,7 +452,6 @@
     "Created: / 11-07-2012 / 10:27:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk methodsFor:'error reporting'!
 
 errorFreeingUnallocatedMemory: message
@@ -489,7 +472,6 @@
     "Created: / 10-07-2012 / 19:00:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk methodsFor:'initialization'!
 
 initializeWithSize: sz
@@ -506,7 +488,6 @@
     "Created: / 10-07-2012 / 18:37:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk methodsFor:'private'!
 
 insert: entry into: list join: join
@@ -533,7 +514,6 @@
     "Created: / 09-07-2012 / 11:29:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk::FreeListEntry methodsFor:'accessing'!
 
 next
@@ -574,7 +554,6 @@
     stop := something.
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk::FreeListEntry methodsFor:'printing & storing'!
 
 printOn:aStream
@@ -590,7 +569,6 @@
     "Modified: / 09-07-2012 / 11:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory::MallocatedMemoryChunk::FreeListEntry methodsFor:'utilities'!
 
 next: next join: join
@@ -609,11 +587,10 @@
     "Created: / 09-07-2012 / 11:49:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMemory class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMemory.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaNativeMemoryTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNativeMemoryTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -162,7 +162,7 @@
 !JavaNativeMemoryTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMemoryTests.st,v 1.2 2013/02/25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaNativeMethod.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNativeMethod.st	Fri Sep 06 00:16:38 2013 +0100
@@ -569,7 +569,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethod.st,v 1.16 2013-04-25 13:11:51 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaNativeMethodImpl_OpenJDK6.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNativeMethodImpl_OpenJDK6.st	Fri Sep 06 00:16:38 2013 +0100
@@ -21322,7 +21322,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethodImpl_OpenJDK6.st,v 1.5 2013-08-10 11:19:30 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaNativeMethodImpl_OpenJDK7.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNativeMethodImpl_OpenJDK7.st	Fri Sep 06 00:16:38 2013 +0100
@@ -536,7 +536,7 @@
 !JavaNativeMethodImpl_OpenJDK7 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethodImpl_OpenJDK7.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaNativeMethodImpl_SunJDK6.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNativeMethodImpl_SunJDK6.st	Fri Sep 06 00:16:38 2013 +0100
@@ -11,7 +11,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-JavaNativeMethodImpl_OpenJDK6 subclass:#'JavaNativeMethodImpl_SunJDK6'
+JavaNativeMethodImpl_OpenJDK6 subclass:#JavaNativeMethodImpl_SunJDK6
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -34,7 +34,6 @@
 "
 ! !
 
-
 !JavaNativeMethodImpl_SunJDK6 class methodsFor:'native - java.io'!
 
 _java_io_Win32FileSystem_canonicalize0: this _: a1 
@@ -212,7 +211,6 @@
     ^ JavaVM unimplementedNativeMethodSignal raise
 ! !
 
-
 !JavaNativeMethodImpl_SunJDK6 class methodsFor:'native - java.lang'!
 
 _java_lang_ClassLoader_defineClass0: this _: a1 _: a2 _: a3 _: a4 _: a5 _: a6 
@@ -239,7 +237,6 @@
     ^ JavaVM unimplementedNativeMethodSignal raise
 ! !
 
-
 !JavaNativeMethodImpl_SunJDK6 class methodsFor:'native - java.util.zip'!
 
 _java_util_zip_ZipFile_open: this _: a1 _: a2 _: a3 _: a4 _: usemmap 
@@ -253,7 +250,6 @@
     "Modified: / 06-02-2013 / 13:24:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMethodImpl_SunJDK6 class methodsFor:'native - sun.jkernel'!
 
 _sun_jkernel_DownloadManager_addToTotalDownloadSize: this _: a1 
@@ -389,7 +385,6 @@
     ^ JavaVM unimplementedNativeMethodSignal raise
 ! !
 
-
 !JavaNativeMethodImpl_SunJDK6 class methodsFor:'native - sun.misc'!
 
 _sun_misc_Unsafe_copyMemory: this _: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8 
@@ -399,11 +394,10 @@
     ^ JavaVM unimplementedNativeMethodSignal raise
 ! !
 
-
 !JavaNativeMethodImpl_SunJDK6 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethodImpl_SunJDK6.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaNativeMethodImpl_SunJDK7.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNativeMethodImpl_SunJDK7.st	Fri Sep 06 00:16:38 2013 +0100
@@ -20,7 +20,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-JavaNativeMethodImpl_OpenJDK7 subclass:#'JavaNativeMethodImpl_SunJDK7'
+JavaNativeMethodImpl_OpenJDK7 subclass:#JavaNativeMethodImpl_SunJDK7
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -53,11 +53,10 @@
 "
 ! !
 
-
 !JavaNativeMethodImpl_SunJDK7 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethodImpl_SunJDK7.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaNioSupport.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaNioSupport.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaNioSupport class methodsFor:'sun.nio.ch.FileDispatcher'!
 
 _sun_nio_ch_FileDispatcher_init
@@ -76,7 +75,6 @@
     "Created: / 06-07-2012 / 22:35:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNioSupport class methodsFor:'sun.nio.ch.NativeThread'!
 
 _sun_nio_ch_NativeThread_current
@@ -127,11 +125,10 @@
     "Created: / 06-07-2012 / 22:37:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNioSupport class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNioSupport.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaObject.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaObject.st	Fri Sep 06 00:16:38 2013 +0100
@@ -498,7 +498,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaObject.st,v 1.58 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaObjectDictionary.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaObjectDictionary.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaObjectDictionary class methodsFor:'instance creation'!
 
 instance
@@ -72,7 +71,6 @@
     "Created: / 09-01-2011 / 20:48:16 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
-
 !JavaObjectDictionary methodsFor:'accessing'!
 
 hasReflection: stClassName
@@ -89,7 +87,6 @@
     "Modified: / 17-01-2011 / 10:39:43 / kursjan <kursjan@fit.cvut.cz>"
 ! !
 
-
 !JavaObjectDictionary methodsFor:'adding & removing'!
 
 flush
@@ -104,7 +101,6 @@
     "Created: / 09-01-2011 / 21:40:00 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
-
 !JavaObjectDictionary methodsFor:'initialization'!
 
 initialize
@@ -114,11 +110,10 @@
     "Modified: / 09-01-2011 / 21:36:58 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
-
 !JavaObjectDictionary class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaObjectDictionary.st,v 1.4 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaPackage.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaPackage.st	Fri Sep 06 00:16:38 2013 +0100
@@ -296,7 +296,7 @@
 !JavaPackage class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaPackage.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaPopUpView.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaPopUpView.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaPopUpView methodsFor:'accessing'!
 
 delegate:anObject
@@ -93,7 +92,6 @@
     "Created: / 4.12.1998 / 14:09:13 / cg"
 ! !
 
-
 !JavaPopUpView methodsFor:'defaults'!
 
 defaultShadow
@@ -102,7 +100,6 @@
     "Created: / 4.12.1998 / 15:12:13 / cg"
 ! !
 
-
 !JavaPopUpView methodsFor:'event handling'!
 
 exposeX:x y:y width:w height:h
@@ -128,7 +125,6 @@
     "Created: / 4.12.1998 / 14:09:13 / cg"
 ! !
 
-
 !JavaPopUpView methodsFor:'initialization'!
 
 initialize
@@ -140,7 +136,6 @@
     "Created: / 4.12.1998 / 14:09:13 / cg"
 ! !
 
-
 !JavaPopUpView methodsFor:'queries'!
 
 isJavaView
@@ -149,7 +144,6 @@
     "Created: / 4.12.1998 / 14:09:40 / cg"
 ! !
 
-
 !JavaPopUpView class methodsFor:'documentation'!
 
 version
@@ -157,7 +151,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaPopUpView.st,v 1.7 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaProcess.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaProcess.st	Fri Sep 06 00:16:38 2013 +0100
@@ -273,7 +273,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaProcess.st,v 1.20 2013-04-27 12:26:38 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaRef2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaRef2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaRef2 class methodsFor:'instance creation'!
 
 new
@@ -67,7 +66,6 @@
     "Modified: / 06-12-2011 / 17:02:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'accessing'!
 
 constantPool
@@ -113,7 +111,6 @@
     "Created: / 08-04-2011 / 11:37:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'comparing'!
 
 = anotherJavaRef
@@ -129,7 +126,6 @@
     "Created: / 08-04-2011 / 12:15:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'initialization'!
 
 initialize
@@ -139,7 +135,6 @@
     "Modified: / 08-04-2011 / 17:39:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'logging'!
 
 info: arg
@@ -158,7 +153,6 @@
     "Modified: / 14-09-2011 / 21:47:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'printing'!
 
 displayString
@@ -168,7 +162,6 @@
     "Created: / 14-08-2011 / 21:18:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'private - resolving'!
 
 findResolvedValue
@@ -187,7 +180,6 @@
     "Modified: / 10-04-2012 / 09:31:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'queries'!
 
 isJavaRef
@@ -205,7 +197,6 @@
     "Created: / 10-05-2011 / 12:20:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'resolving'!
 
 invalidate
@@ -288,7 +279,6 @@
     "Modified: / 04-06-2011 / 17:54:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaRef2 methodsFor:'testing'!
 
 isUnresolved
@@ -298,11 +288,10 @@
     "Created: / 22-05-2011 / 14:01:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaRef2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaRef2.st,v 1.4 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaRefMock.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaRefMock.st	Fri Sep 06 00:16:38 2013 +0100
@@ -101,7 +101,7 @@
 !JavaRefMock class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaRefMock.st,v 1.3 2013/02/25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaRefsAndConstantPoolTestCase.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaRefsAndConstantPoolTestCase.st	Fri Sep 06 00:16:38 2013 +0100
@@ -397,7 +397,7 @@
 !JavaRefsAndConstantPoolTestCase class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaRefsAndConstantPoolTestCase.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaRelease.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaRelease.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1878,7 +1878,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaRelease.st,v 1.10 2013-03-18 17:08:04 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaResolver.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaResolver.st	Fri Sep 06 00:16:38 2013 +0100
@@ -618,7 +618,7 @@
 !JavaResolver class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaResolver.st,v 1.5 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaRuntimeConstantPoolTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaRuntimeConstantPoolTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -127,7 +127,7 @@
 !JavaRuntimeConstantPoolTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaRuntimeConstantPoolTests.st,v 1.3 2013/02/25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaShort.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaShort.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaShort class methodsFor:'accessing'!
 
 javaArrayClass
@@ -75,7 +74,6 @@
     "Created: / 24-02-2012 / 19:42:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaShort class methodsFor:'autoboxing support'!
 
 javaBox: anObject 
@@ -106,7 +104,6 @@
     "Created: / 22-11-2011 / 11:44:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaShort class methodsFor:'queries'!
 
 isJavaPrimitiveType
@@ -116,11 +113,10 @@
     "Created: / 20-12-2010 / 22:18:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaShort class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaShort.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaSlotIndexCache.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaSlotIndexCache.st	Fri Sep 06 00:16:38 2013 +0100
@@ -59,7 +59,6 @@
 "
 ! !
 
-
 !JavaSlotIndexCache class methodsFor:'queries'!
 
 color_slot_pData_from:color
@@ -319,7 +318,6 @@
     "Created: 8.2.1997 / 13:19:14 / cg"
 ! !
 
-
 !JavaSlotIndexCache class methodsFor:'documentation'!
 
 version
@@ -327,7 +325,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaSlotIndexCache.st,v 1.7 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaSocket.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaSocket.st	Fri Sep 06 00:16:38 2013 +0100
@@ -97,7 +97,7 @@
 !JavaSocket class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaSocket.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaSourceCodeCache.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaSourceCodeCache.st	Fri Sep 06 00:16:38 2013 +0100
@@ -60,7 +60,6 @@
 "
 ! !
 
-
 !JavaSourceCodeCache class methodsFor:'instance creation'!
 
 new
@@ -70,7 +69,6 @@
     "Created: / 13-12-2010 / 13:56:31 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
-
 !JavaSourceCodeCache methodsFor:'adding & removing'!
 
 flush
@@ -79,7 +77,6 @@
     "Created: / 17-12-2010 / 16:32:49 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
-
 !JavaSourceCodeCache methodsFor:'initialize'!
 
 initialize
@@ -89,7 +86,6 @@
     "Modified: / 17-12-2010 / 13:35:36 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
-
 !JavaSourceCodeCache methodsFor:'private - searching'!
 
 findMethodLine: javaMethod inMethods: methods 
@@ -127,7 +123,6 @@
     ^ parsedCodes
 ! !
 
-
 !JavaSourceCodeCache methodsFor:'queries'!
 
 findLineForMethod:javaMethod inClass:javaClass 
@@ -140,11 +135,10 @@
     "Modified: / 08-01-2011 / 16:10:21 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
-
 !JavaSourceCodeCache class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaSourceCodeCache.st,v 1.4 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaSourceFileWriter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaSourceFileWriter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaSourceFileWriter methodsFor:'source writing'!
 
 fileOut:class on:stream withTimeStamp:stampIt withInitialize:initIt withDefinition:withDefinition methodFilter:methodFilter encoder:encoderOrNil
@@ -75,7 +74,6 @@
     ^ self shouldImplement
 ! !
 
-
 !JavaSourceFileWriter methodsFor:'source writing - comments'!
 
 fileOutCommentEndOn:aStream
@@ -104,11 +102,10 @@
     "Modified: / 27-10-2010 / 18:39:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSourceFileWriter class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaSourceFileWriter.st,v 1.4 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaStringRef2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaStringRef2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaStringRef2 class methodsFor:'instance creation'!
 
 in: aJavaConstantPool withValueAt: valueIndex 
@@ -63,7 +62,6 @@
     "Modified (format): / 28-09-2012 / 23:01:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaStringRef2 methodsFor:'accessing'!
 
 = another 
@@ -130,7 +128,6 @@
     "Created: / 13-05-2011 / 17:23:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaStringRef2 methodsFor:'initialization'!
 
 initializeIn: aJavaConstantPool withValueAt: valueCPIndex 
@@ -139,7 +136,6 @@
     super initialize.
 ! !
 
-
 !JavaStringRef2 methodsFor:'printing'!
 
 displayString
@@ -150,7 +146,6 @@
     "Modified: / 03-11-2011 / 12:44:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaStringRef2 methodsFor:'queries'!
 
 isJavaClassOrStringRef
@@ -159,11 +154,10 @@
 "Created: / 11-04-2011 / 19:10:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaStringRef2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaStringRef2.st,v 1.4 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaTestCaseProxy.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaTestCaseProxy.st	Fri Sep 06 00:16:38 2013 +0100
@@ -206,7 +206,7 @@
 !JavaTestCaseProxy class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaTestCaseProxy.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaTestsLoader.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaTestsLoader.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaTestsLoader class methodsFor:'accessing'!
 
 buildSuiteForLibjava
@@ -90,7 +89,6 @@
     "Created: / 21-06-2011 / 17:40:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestsLoader class methodsFor:'loading'!
 
 load
@@ -116,7 +114,6 @@
     "Modified: / 22-01-2013 / 23:27:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestsLoader class methodsFor:'loading - test suites'!
 
 loadLibjava
@@ -173,7 +170,6 @@
     "Created: / 11-06-2011 / 16:07:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestsLoader class methodsFor:'private'!
 
 buildSuiteFrom: classes
@@ -247,11 +243,10 @@
     "Modified: / 20-06-2011 / 19:02:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaTestsLoader class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaTestsLoader.st,v 1.3 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaTestsResource.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaTestsResource.st	Fri Sep 06 00:16:38 2013 +0100
@@ -156,7 +156,7 @@
 !JavaTestsResource class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaTestsResource.st,v 1.3 2013/02/25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaTopView.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaTopView.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaTopView methodsFor:'accessing'!
 
 delegate:anObject
@@ -93,7 +92,6 @@
     "Created: / 2.12.1998 / 23:32:13 / cg"
 ! !
 
-
 !JavaTopView methodsFor:'event handling'!
 
 exposeX:x y:y width:w height:h
@@ -119,7 +117,6 @@
     "Created: / 2.12.1998 / 23:32:13 / cg"
 ! !
 
-
 !JavaTopView methodsFor:'initialization'!
 
 initialize
@@ -130,7 +127,6 @@
     "Modified: / 2.12.1998 / 23:32:30 / cg"
 ! !
 
-
 !JavaTopView methodsFor:'queries'!
 
 isJavaView
@@ -139,7 +135,6 @@
     "Created: / 4.12.1998 / 14:09:37 / cg"
 ! !
 
-
 !JavaTopView class methodsFor:'documentation'!
 
 version
@@ -147,7 +142,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaTopView.st,v 1.11 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaUTF8Tests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaUTF8Tests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -139,7 +139,7 @@
 !JavaUTF8Tests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaUTF8Tests.st,v 1.3 2013/02/25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaUnhandledExceptionError.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaUnhandledExceptionError.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,11 +53,10 @@
 "
 ! !
 
-
 !JavaUnhandledExceptionError class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaUnhandledExceptionError.st,v 1.4 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaUnresolvedClassConstant.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaUnresolvedClassConstant.st	Fri Sep 06 00:16:38 2013 +0100
@@ -357,7 +357,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaUnresolvedClassConstant.st,v 1.48 2013-04-25 13:09:57 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaUnresolvedCompilationError.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaUnresolvedCompilationError.st	Fri Sep 06 00:16:38 2013 +0100
@@ -72,6 +72,10 @@
 
 !JavaUnresolvedCompilationError class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/JavaUnresolvedConstant.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaUnresolvedConstant.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaUnresolvedConstant class methodsFor:'instance creation'!
 
 pool:aPool poolIndex:index
@@ -63,7 +62,6 @@
 
 ! !
 
-
 !JavaUnresolvedConstant class methodsFor:'queries'!
 
 countUnresolved
@@ -84,7 +82,6 @@
     "
 ! !
 
-
 !JavaUnresolvedConstant class methodsFor:'resolving'!
 
 flushPatchLists
@@ -151,7 +148,6 @@
     "Modified: 17.8.1997 / 20:06:46 / cg"
 ! !
 
-
 !JavaUnresolvedConstant methodsFor:'accessing'!
 
 constantPool
@@ -191,7 +187,6 @@
     prevUnresolved := anUnresolvedConstant
 ! !
 
-
 !JavaUnresolvedConstant methodsFor:'printing & storing'!
 
 displayString
@@ -200,7 +195,6 @@
 
 ! !
 
-
 !JavaUnresolvedConstant methodsFor:'queries'!
 
 isJavaMethodRef
@@ -225,7 +219,6 @@
     "Created: / 20.10.1998 / 17:43:07 / cg"
 ! !
 
-
 !JavaUnresolvedConstant methodsFor:'resolving'!
 
 preResolve
@@ -257,7 +250,6 @@
 
 ! !
 
-
 !JavaUnresolvedConstant methodsFor:'special'!
 
 updateClassRefsFrom:oldClass to:newClass
@@ -265,7 +257,6 @@
     "Created: 7.8.1997 / 18:21:19 / cg"
 ! !
 
-
 !JavaUnresolvedConstant class methodsFor:'documentation'!
 
 version
@@ -273,7 +264,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaUnresolvedConstant.st,v 1.16 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaUnresolvedStringConstant.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaUnresolvedStringConstant.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaUnresolvedStringConstant class methodsFor:'instance creation'!
 
 pool:aPool poolIndex:index stringIndex:stringIndex
@@ -63,7 +62,6 @@
 
 ! !
 
-
 !JavaUnresolvedStringConstant methodsFor:'accessing'!
 
 pool:aPool poolIndex:i stringIndex:string_index
@@ -73,7 +71,6 @@
 
 ! !
 
-
 !JavaUnresolvedStringConstant methodsFor:'resolving'!
 
 preResolve
@@ -101,7 +98,6 @@
     "Modified: / 10-08-2011 / 23:28:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaUnresolvedStringConstant class methodsFor:'documentation'!
 
 version
@@ -109,7 +105,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaUnresolvedStringConstant.st,v 1.12 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaUtilities.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaUtilities.st	Fri Sep 06 00:16:38 2013 +0100
@@ -67,7 +67,6 @@
 "
 ! !
 
-
 !JavaUtilities class methodsFor:'instance creation'!
 
 tomcat
@@ -91,7 +90,6 @@
     "Created: / 07-05-2012 / 22:11:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaUtilities::Tomcat6x methodsFor:'accessing - paths'!
 
 catalinaHome
@@ -154,7 +152,6 @@
     "Modified: / 23-08-2012 / 01:58:54 / m"
 ! !
 
-
 !JavaUtilities::Tomcat6x methodsFor:'initialization'!
 
 initializeVM
@@ -202,7 +199,6 @@
     "Created: / 18-04-2012 / 08:08:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaUtilities::Tomcat6x methodsFor:'start/stop'!
 
 start
@@ -238,7 +234,6 @@
     "Created: / 08-12-2011 / 00:32:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaUtilities::Tomcat7x methodsFor:'accessing - paths'!
 
 catalinaHome
@@ -285,7 +280,6 @@
     "Modified: / 07-05-2012 / 22:05:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaUtilities::Tomcat7x methodsFor:'initialization'!
 
 initializeVM
@@ -329,7 +323,6 @@
     "Created: / 18-04-2012 / 08:08:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaUtilities::Tomcat7x methodsFor:'start/stop'!
 
 start
@@ -352,11 +345,10 @@
     "Created: / 08-12-2011 / 00:32:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaUtilities class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaUtilities.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaVM.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaVM.st	Fri Sep 06 00:16:38 2013 +0100
@@ -6722,7 +6722,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaVM.st,v 1.190 2013-05-07 13:42:51 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
--- a/JavaVMData.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaVMData.st	Fri Sep 06 00:16:38 2013 +0100
@@ -115,7 +115,7 @@
 !JavaVMData class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaVMData.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaView.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaView.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaView methodsFor:'accessing'!
 
 delegate:anObject
@@ -92,7 +91,6 @@
     "Created: 18.8.1997 / 22:34:30 / cg"
 ! !
 
-
 !JavaView methodsFor:'event handling'!
 
 buttonMotion:state x:x y:y
@@ -236,7 +234,6 @@
     "Created: / 10.12.1998 / 19:36:38 / cg"
 ! !
 
-
 !JavaView methodsFor:'initialization'!
 
 initialize
@@ -252,7 +249,6 @@
     "Modified: / 13.1.1998 / 14:29:30 / cg"
 ! !
 
-
 !JavaView methodsFor:'queries'!
 
 isJavaView
@@ -261,7 +257,6 @@
     "Created: / 4.12.1998 / 14:09:30 / cg"
 ! !
 
-
 !JavaView class methodsFor:'documentation'!
 
 version
@@ -269,7 +264,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaView.st,v 1.27 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/JavaZipSupport.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/JavaZipSupport.st	Fri Sep 06 00:16:38 2013 +0100
@@ -84,7 +84,6 @@
 "
 ! !
 
-
 !JavaZipSupport class methodsFor:'instance creation'!
 
 deflaterFor: vm
@@ -103,7 +102,6 @@
 
 ! !
 
-
 !JavaZipSupport::Deflater methodsFor:'* As yet uncategorized *'!
 
 > aSmallInteger
@@ -112,7 +110,6 @@
     "Created: / 20-07-2012 / 22:21:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaZipSupport::Deflater methodsFor:'accessing'!
 
 vm: javaVM
@@ -122,7 +119,6 @@
     "Created: / 30-08-2011 / 09:05:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaZipSupport::Deflater methodsFor:'deflater methods'!
 
 adler
@@ -525,7 +521,6 @@
     "Created: / 30-08-2011 / 12:45:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaZipSupport::Deflater methodsFor:'initialization & release'!
 
 finalize
@@ -535,7 +530,6 @@
     "Created: / 20-07-2012 / 21:50:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaZipSupport::Inflater methodsFor:'* As yet uncategorized *'!
 
 > aSmallInteger
@@ -544,7 +538,6 @@
     "Created: / 23-07-2012 / 21:06:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaZipSupport::Inflater methodsFor:'accessing'!
 
 vm: javaVM
@@ -554,7 +547,6 @@
     "Created: / 30-08-2011 / 09:05:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaZipSupport::Inflater methodsFor:'inflater methods'!
 
 adler
@@ -916,7 +908,6 @@
     "Created: / 30-08-2011 / 12:45:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaZipSupport::Inflater methodsFor:'initialization & release'!
 
 finalize
@@ -926,11 +917,10 @@
     "Created: / 20-07-2012 / 21:50:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaZipSupport class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaZipSupport.st,v 1.3 2013-05-21 21:15:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/Make.proto	Thu Sep 05 22:08:59 2013 +0100
+++ b/Make.proto	Fri Sep 06 00:16:38 2013 +0100
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS= experiments tools
+SUBDIRS= libs mauve tools experiments examples benchmarks examples/tomcat6 startup
 
 
 # subdirectories where Makefiles are to be made:
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libview
 
 
 # if you need any additional defines for embedded C code,
@@ -144,6 +144,8 @@
 	cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
--- a/ProxyMethod.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethod.st	Fri Sep 06 00:16:38 2013 +0100
@@ -26,7 +26,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-Method subclass:#ProxyMethod
+Method variableSubclass:#ProxyMethod
 	instanceVariableNames:'body'
 	classVariableNames:'InstallProxies'
 	poolDictionaries:''
@@ -88,7 +88,6 @@
 "
 ! !
 
-
 !ProxyMethod class methodsFor:'initialization'!
 
 initialize
@@ -100,7 +99,6 @@
     "Modified: / 23-12-2011 / 14:13:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod class methodsFor:'accessing'!
 
 installProxies
@@ -122,7 +120,6 @@
     "Created: / 23-12-2011 / 13:08:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod class methodsFor:'misc'!
 
 makeMetaMethod
@@ -153,7 +150,6 @@
     "Created: / 06-12-2011 / 21:18:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod methodsFor:'accessing'!
 
 body
@@ -239,7 +235,6 @@
     "Created: / 23-12-2011 / 13:51:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod methodsFor:'building'!
 
 addGuard: aGuard
@@ -257,7 +252,6 @@
     "Created: / 06-12-2011 / 21:37:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod methodsFor:'compiler interface'!
 
 syntaxHighlighterClass
@@ -270,7 +264,6 @@
     "Created: / 23-12-2011 / 13:52:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod methodsFor:'displaying'!
 
 printStringForBrowserWithSelector:selector inClass:class
@@ -280,7 +273,6 @@
     "Created: / 16-12-2011 / 01:16:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod methodsFor:'testing'!
 
 isProxyMethod
@@ -304,7 +296,6 @@
     "Created: / 13-04-2012 / 16:06:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod methodsFor:'utilities'!
 
 recompile
@@ -314,11 +305,10 @@
     "Created: / 06-12-2011 / 21:38:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethod class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethod.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodAndNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodAndNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !ProxyMethodAndNode methodsFor:'accessing'!
 
 left
@@ -84,7 +83,6 @@
     right := something.
 ! !
 
-
 !ProxyMethodAndNode methodsFor:'evaluation'!
 
 evaluateWithReceiver: receiver arguments: arguments
@@ -95,7 +93,6 @@
     "Created: / 06-12-2011 / 21:26:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodAndNode methodsFor:'generating'!
 
 generate: compiler
@@ -110,18 +107,16 @@
     "Created: / 22-12-2011 / 09:26:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodAndNode methodsFor:'testing'!
 
 isProxyMethodAndNode
     ^ true
 ! !
 
-
 !ProxyMethodAndNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodAndNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodBlockInvocationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodBlockInvocationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !ProxyMethodBlockInvocationNode methodsFor:'accessing'!
 
 block
@@ -76,7 +75,6 @@
     block := something.
 ! !
 
-
 !ProxyMethodBlockInvocationNode methodsFor:'evaluating'!
 
 evaluateWithReceiver: receiver arguments: arguments
@@ -86,7 +84,6 @@
     "Modified: / 06-12-2011 / 23:39:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodBlockInvocationNode methodsFor:'generating'!
 
 generate: compiler
@@ -102,18 +99,16 @@
     "Created: / 22-12-2011 / 09:26:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodBlockInvocationNode methodsFor:'testing'!
 
 isProxyMethodBlockInvocationNode
     ^ true
 ! !
 
-
 !ProxyMethodBlockInvocationNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodBlockInvocationNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodCompiler.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodCompiler.st	Fri Sep 06 00:16:38 2013 +0100
@@ -82,7 +82,6 @@
 "
 ! !
 
-
 !ProxyMethodCompiler class methodsFor:'compiling'!
 
 compile: tree arguments: numArgs selector: selector
@@ -95,7 +94,6 @@
     "Created: / 23-12-2011 / 13:38:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodCompiler methodsFor:'accessing'!
 
 args
@@ -134,7 +132,6 @@
     ^ tree
 ! !
 
-
 !ProxyMethodCompiler methodsFor:'compiling'!
 
 compile: proxyMethodNode arguments: numArgs selector: proxySelector
@@ -153,7 +150,6 @@
     "Created: / 23-12-2011 / 13:38:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodCompiler methodsFor:'compiling-private'!
 
 compile
@@ -206,7 +202,6 @@
     "Modified: / 03-12-2012 / 19:24:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodCompiler methodsFor:'node creation'!
 
 newGuard
@@ -251,11 +246,10 @@
     "Created: / 14-12-2011 / 21:27:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodCompiler class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodCompiler.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodConditionNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodConditionNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !ProxyMethodConditionNode methodsFor:'node creation'!
 
 and: anotherNode
@@ -75,18 +74,16 @@
     "Created: / 14-12-2011 / 21:28:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodConditionNode methodsFor:'testing'!
 
 isProxyMethodConditionNode
     ^ true
 ! !
 
-
 !ProxyMethodConditionNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodConditionNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodGuardNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodGuardNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !ProxyMethodGuardNode methodsFor:'accessing'!
 
 action
@@ -92,7 +91,6 @@
     fallback := something.
 ! !
 
-
 !ProxyMethodGuardNode methodsFor:'evaluating'!
 
 evaluateWithReceiver: receiver arguments: arguments
@@ -106,7 +104,6 @@
     "Created: / 06-12-2011 / 21:25:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodGuardNode methodsFor:'generating'!
 
 generate: compiler
@@ -144,18 +141,16 @@
     "Modified: / 03-12-2012 / 19:12:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodGuardNode methodsFor:'testing'!
 
 isProxyMethodGuardNode
     ^ true
 ! !
 
-
 !ProxyMethodGuardNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodGuardNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodInvocationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodInvocationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,18 +65,16 @@
 "
 ! !
 
-
 !ProxyMethodInvocationNode methodsFor:'testing'!
 
 isProxyMethodInvocationNode
     ^ true
 ! !
 
-
 !ProxyMethodInvocationNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodInvocationNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodJavaFieldAccessor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodJavaFieldAccessor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !ProxyMethodJavaFieldAccessor methodsFor:'accessing'!
 
 field
@@ -64,11 +63,10 @@
     field := something.
 ! !
 
-
 !ProxyMethodJavaFieldAccessor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodJavaFieldAccessor.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodJavaFieldGetter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodJavaFieldGetter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !ProxyMethodJavaFieldGetter methodsFor:'evaluating'!
 
 evaluateWithReceiver: receiver arguments: arguments
@@ -64,7 +63,6 @@
     "Modified: / 17-03-2012 / 16:56:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodJavaFieldGetter methodsFor:'generating'!
 
 generate:compiler
@@ -75,11 +73,10 @@
     "Modified: / 17-03-2012 / 16:59:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodJavaFieldGetter class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodJavaFieldGetter.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodJavaFieldSetter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodJavaFieldSetter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !ProxyMethodJavaFieldSetter methodsFor:'evaluating'!
 
 evaluateWithReceiver:receiver arguments:arguments
@@ -64,7 +63,6 @@
     "Modified: / 17-03-2012 / 16:57:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodJavaFieldSetter methodsFor:'generating'!
 
 generate:compiler
@@ -74,11 +72,10 @@
     ^ self shouldImplement
 ! !
 
-
 !ProxyMethodJavaFieldSetter class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodJavaFieldSetter.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodJavaMethodInvocationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodJavaMethodInvocationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -294,7 +294,7 @@
 !ProxyMethodJavaMethodInvocationNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodJavaMethodInvocationNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodJavaTypeCheckNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodJavaTypeCheckNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !ProxyMethodJavaTypeCheckNode methodsFor:'evaluating'!
 
 evaluateWithReceiver: receiver arguments: arguments
@@ -80,7 +79,6 @@
     "Created: / 06-12-2011 / 21:28:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodJavaTypeCheckNode methodsFor:'generating'!
 
 generate: compiler
@@ -122,11 +120,10 @@
     "Created: / 22-12-2011 / 09:26:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodJavaTypeCheckNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodJavaTypeCheckNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodMethodInvocationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodMethodInvocationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !ProxyMethodMethodInvocationNode class methodsFor:'instance creation'!
 
 method: method
@@ -75,7 +74,6 @@
     "Created: / 10-12-2011 / 19:48:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodMethodInvocationNode methodsFor:'accessing'!
 
 method
@@ -86,7 +84,6 @@
     method := aMethod.
 ! !
 
-
 !ProxyMethodMethodInvocationNode methodsFor:'evaluating'!
 
 evaluateWithReceiver: receiver arguments:args
@@ -99,7 +96,6 @@
     "Modified: / 23-12-2011 / 12:27:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodMethodInvocationNode methodsFor:'generating'!
 
 generate: compiler
@@ -114,18 +110,16 @@
     "Created: / 22-12-2011 / 09:26:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodMethodInvocationNode methodsFor:'testing'!
 
 isProxyMethodMethodInvocationNode
     ^ true
 ! !
 
-
 !ProxyMethodMethodInvocationNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodMethodInvocationNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !ProxyMethodNode class methodsFor:'instance creation'!
 
 block: aBlock
@@ -82,7 +81,6 @@
     "Created: / 06-12-2011 / 23:44:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodNode methodsFor:'evaluating'!
 
 evaluateWithReceiver:arg1 arguments:arg2
@@ -91,7 +89,6 @@
     ^ self subclassResponsibility
 ! !
 
-
 !ProxyMethodNode methodsFor:'generating'!
 
 generate: compiler
@@ -103,7 +100,6 @@
     "Created: / 22-12-2011 / 09:26:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodNode methodsFor:'testing'!
 
 isProxyMethodAndNode
@@ -138,11 +134,10 @@
     ^ false
 ! !
 
-
 !ProxyMethodNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/ProxyMethodTypeCheckNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/ProxyMethodTypeCheckNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !ProxyMethodTypeCheckNode class methodsFor:'instance creation'!
 
 type: type argument: argIndex
@@ -75,7 +74,6 @@
     "Created: / 23-12-2011 / 12:36:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodTypeCheckNode methodsFor:'accessing'!
 
 argument
@@ -94,7 +92,6 @@
     type := something.
 ! !
 
-
 !ProxyMethodTypeCheckNode methodsFor:'evaluating'!
 
 evaluateWithReceiver:receiver arguments:arguments
@@ -104,7 +101,6 @@
     "Modified: / 04-01-2012 / 21:19:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodTypeCheckNode methodsFor:'generating'!
 
 generate:compiler
@@ -129,18 +125,16 @@
     "Modified: / 04-01-2012 / 21:33:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProxyMethodTypeCheckNode methodsFor:'testing'!
 
 isProxyMethodTypeCheckNode
     ^ true
 ! !
 
-
 !ProxyMethodTypeCheckNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/ProxyMethodTypeCheckNode.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/SmalltalkAppletContext.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/SmalltalkAppletContext.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !SmalltalkAppletContext methodsFor:'accessing'!
 
 getImage: url 
@@ -88,7 +87,6 @@
     "Modified: 8.8.1997 / 12:07:43 / cg"
 ! !
 
-
 !SmalltalkAppletContext methodsFor:'java accessing'!
 
 doesNotUnderstand:aMessage
@@ -107,7 +105,6 @@
     "Modified: / 12.1.1998 / 23:53:31 / cg"
 ! !
 
-
 !SmalltalkAppletContext class methodsFor:'documentation'!
 
 version
@@ -115,7 +112,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/SmalltalkAppletContext.st,v 1.13 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/SmalltalkAppletStub.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/SmalltalkAppletStub.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !SmalltalkAppletStub methodsFor:'accessing'!
 
 appletContext
@@ -120,7 +119,6 @@
     "Created: 1.8.1997 / 15:56:20 / cg"
 ! !
 
-
 !SmalltalkAppletStub methodsFor:'applet actions'!
 
 appletResize:newWidth _:newHeight
@@ -129,7 +127,6 @@
     "Created: 13.8.1997 / 00:18:41 / cg"
 ! !
 
-
 !SmalltalkAppletStub methodsFor:'java accessing'!
 
 doesNotUnderstand:aMessage
@@ -189,7 +186,6 @@
     "Modified: 14.8.1997 / 01:28:56 / cg"
 ! !
 
-
 !SmalltalkAppletStub class methodsFor:'documentation'!
 
 version
@@ -197,7 +193,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/SmalltalkAppletStub.st,v 1.13 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/TestletTestCaseProxy.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/TestletTestCaseProxy.st	Fri Sep 06 00:16:38 2013 +0100
@@ -247,7 +247,7 @@
 !TestletTestCaseProxy class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/TestletTestCaseProxy.st,v 1.3 2013/02/25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/abbrev.stc	Thu Sep 05 22:08:59 2013 +0100
+++ b/abbrev.stc	Fri Sep 06 00:16:38 2013 +0100
@@ -5,7 +5,9 @@
 GroovyEvaluator GroovyEvaluator stx:libjava 'Languages-Groovy-Compiler' 0
 GroovyLanguage GroovyLanguage stx:libjava 'Languages-Groovy-Support' 1
 GroovySourceFileWriter GroovySourceFileWriter stx:libjava 'Languages-Groovy-Support' 0
+JavaTestCaseProxy JavaTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
 JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
+JavaRefsAndConstantPoolTestCase JavaRefsAndConstantPoolTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
 JavaAnnotation JavaAnnotation stx:libjava 'Languages-Java-Reader-Support' 0
 JavaAnnotationContainer JavaAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
 JavaAnnotationDefault JavaAnnotationDefault stx:libjava 'Languages-Java-Annotations' 1
@@ -14,9 +16,9 @@
 JavaAntProjectResource JavaAntProjectResource stx:libjava 'Languages-Java-Tests' 2
 JavaArray JavaArray stx:libjava 'Languages-Java-Classes' 1
 JavaByte JavaByte stx:libjava 'Languages-Java-Support' 0
+JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 1
 JavaByteCodeDisassemblerTests JavaByteCodeDisassemblerTests stx:libjava 'Languages-Java-Tests' 1
 JavaByteCodeProcessor JavaByteCodeProcessor stx:libjava 'Languages-Java-Bytecode' 0
-JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 1
 JavaClassAccessor JavaClassAccessor stx:libjava 'Languages-Java-Classes' 0
 JavaClassLoadingTests JavaClassLoadingTests stx:libjava 'Languages-Java-Tests-ClassLoading' 1
 JavaClassQuery JavaClassQuery stx:libjava 'Languages-Java-Classes' 1
@@ -66,7 +68,6 @@
 JavaProcess JavaProcess stx:libjava 'Languages-Java-Classes' 0
 JavaRef2 JavaRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRefsAndConstantPoolTestCase JavaRefsAndConstantPoolTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
 JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
 JavaShort JavaShort stx:libjava 'Languages-Java-Support' 0
@@ -74,7 +75,6 @@
 JavaSocket JavaSocket stx:libjava 'Languages-Java-Support' 0
 JavaSourceCodeCache JavaSourceCodeCache stx:libjava 'Languages-Java-Support' 1
 JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
-JavaTestCaseProxy JavaTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
 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
--- a/bc.mak	Thu Sep 05 22:08:59 2013 +0100
+++ b/bc.mak	Fri Sep 06 00:16:38 2013 +0100
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libview
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libview
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -54,6 +54,8 @@
 	pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
--- a/benchmarks/Ackerman.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/Ackerman.st	Fri Sep 06 00:16:38 2013 +0100
@@ -17,7 +17,7 @@
 !Ackerman class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/Ackerman.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/Ary.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/Ary.st	Fri Sep 06 00:16:38 2013 +0100
@@ -32,7 +32,7 @@
 !Ary class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/Ary.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/CrossLanguageInvocation.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/CrossLanguageInvocation.st	Fri Sep 06 00:16:38 2013 +0100
@@ -42,7 +42,7 @@
 !CrossLanguageInvocation class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/CrossLanguageInvocation.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/Groovy.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/Groovy.st	Fri Sep 06 00:16:38 2013 +0100
@@ -19,7 +19,7 @@
 !Groovy class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/Groovy.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/Hash.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/Hash.st	Fri Sep 06 00:16:38 2013 +0100
@@ -31,7 +31,7 @@
 !Hash class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/Hash.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/Jasper.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/Jasper.st	Fri Sep 06 00:16:38 2013 +0100
@@ -19,7 +19,7 @@
 !Jasper class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/Jasper.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/JavaBenchmark.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/JavaBenchmark.st	Fri Sep 06 00:16:38 2013 +0100
@@ -208,7 +208,7 @@
 !JavaBenchmark class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/JavaBenchmark.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/JavaBenchmarkRunner.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/JavaBenchmarkRunner.st	Fri Sep 06 00:16:38 2013 +0100
@@ -289,7 +289,7 @@
 !JavaBenchmarkRunner class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/JavaBenchmarkRunner.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/MethodInvocation.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/MethodInvocation.st	Fri Sep 06 00:16:38 2013 +0100
@@ -92,7 +92,7 @@
 !MethodInvocation class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/MethodInvocation.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/Native1.st	Fri Sep 06 00:16:38 2013 +0100
@@ -0,0 +1,33 @@
+"{ Package: 'stx:libjava/benchmarks' }"
+
+JavaBenchmark subclass:#Native1
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Benchmarks-Java-Micro'
+!
+
+
+!Native1 methodsFor:'running'!
+
+runBenchmarkS:n 
+    ^ 'N/A'
+
+    "Created: / 31-10-2012 / 10:21:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!Native1 class methodsFor:'documentation'!
+
+version_CVS
+    ^ '$Header$'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+    ^ '§Id::                                                                                                                        §'
+! !
+
--- a/benchmarks/ObjectArguments.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/ObjectArguments.st	Fri Sep 06 00:16:38 2013 +0100
@@ -45,7 +45,7 @@
 !ObjectArguments class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/ObjectArguments.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/OverloadedMethods.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/OverloadedMethods.st	Fri Sep 06 00:16:38 2013 +0100
@@ -58,7 +58,7 @@
 !OverloadedMethods class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/OverloadedMethods.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/OverloadedMethods2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/OverloadedMethods2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -100,7 +100,7 @@
 !OverloadedMethods2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/OverloadedMethods2.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/PrimitiveArguments.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/PrimitiveArguments.st	Fri Sep 06 00:16:38 2013 +0100
@@ -45,7 +45,7 @@
 !PrimitiveArguments class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/PrimitiveArguments.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/Saxon.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/Saxon.st	Fri Sep 06 00:16:38 2013 +0100
@@ -19,7 +19,7 @@
 !Saxon class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/Saxon.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/Strcat.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/Strcat.st	Fri Sep 06 00:16:38 2013 +0100
@@ -29,7 +29,7 @@
 !Strcat class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/Strcat.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/Threadring.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/Threadring.st	Fri Sep 06 00:16:38 2013 +0100
@@ -85,7 +85,7 @@
 !Threadring class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/Threadring.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/WrappedArguments.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/WrappedArguments.st	Fri Sep 06 00:16:38 2013 +0100
@@ -45,7 +45,7 @@
 !WrappedArguments class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/WrappedArguments.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/benchmarks/benchmarks.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/benchmarks.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 05 Sep 2013 16:08:55 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:11:25 GMT\0"
     END
 
   END
--- a/benchmarks/stx_libjava_benchmarks.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/benchmarks/stx_libjava_benchmarks.st	Fri Sep 06 00:16:38 2013 +0100
@@ -171,7 +171,7 @@
 !stx_libjava_benchmarks class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/benchmarks/stx_libjava_benchmarks.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/bmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/bmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -10,9 +10,16 @@
 make.exe -N -f bc.mak  %DEFINES% %*
 
 @echo "***********************************"
-@echo "Buildung stx/libjava/tools
+@echo "Buildung stx/libjava/examples/tomcat6
 @echo "***********************************"
-@cd tools
+@cd examples\tomcat6
+@call bmake %1 %2
+@cd ..\..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/mauve
+@echo "***********************************"
+@cd mauve
 @call bmake %1 %2
 @cd ..
 
@@ -23,4 +30,39 @@
 @call bmake %1 %2
 @cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples
+@echo "***********************************"
+@cd examples
+@call bmake %1 %2
+@cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/benchmarks
+@echo "***********************************"
+@cd benchmarks
+@call bmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/libs
+@echo "***********************************"
+@cd libs
+@call bmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/tools
+@echo "***********************************"
+@cd tools
+@call bmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/startup
+@echo "***********************************"
+@cd startup
+@call bmake %1 %2
+@cd ..
+
+
--- a/examples/CDDatabaseHandler1.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/CDDatabaseHandler1.st	Fri Sep 06 00:16:38 2013 +0100
@@ -26,7 +26,6 @@
 "
 ! !
 
-
 !CDDatabaseHandler1 class methodsFor:'initialization'!
 
 initialize
@@ -36,7 +35,6 @@
     "Created: / 13-05-2012 / 17:24:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !CDDatabaseHandler1 methodsFor:'SAX2 interface'!
 
 characters: string offset: off length: len
@@ -125,11 +123,10 @@
     "Created: / 17-04-2005 / 08:47:18 / janfrog"
 ! !
 
-
 !CDDatabaseHandler1 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/examples/CDDatabaseHandler1.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/examples/CDDatabaseHandler2.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/CDDatabaseHandler2.st	Fri Sep 06 00:16:38 2013 +0100
@@ -26,7 +26,6 @@
 "
 ! !
 
-
 !CDDatabaseHandler2 class methodsFor:'initialization'!
 
 initialize
@@ -36,7 +35,6 @@
     "Created: / 13-05-2012 / 17:24:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !CDDatabaseHandler2 methodsFor:'SAX2 interface'!
 
 characters: string offset: off length: len
@@ -126,11 +124,10 @@
     "Created: / 17-04-2005 / 08:47:18 / janfrog"
 ! !
 
-
 !CDDatabaseHandler2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/examples/CDDatabaseHandler2.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/examples/HelloWorldExampleS.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/HelloWorldExampleS.st	Fri Sep 06 00:16:38 2013 +0100
@@ -8,11 +8,10 @@
 !
 
 
-
 !HelloWorldExampleS class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/examples/HelloWorldExampleS.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/examples/JavaExamples.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/JavaExamples.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaExamples class methodsFor:'examples'!
 
 example_1
@@ -147,11 +146,10 @@
     "Created: / 20-08-2012 / 17:28:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaExamples class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/examples/JavaExamples.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/examples/Make.proto	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/Make.proto	Fri Sep 06 00:16:38 2013 +0100
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS=
+SUBDIRS= tomcat6
 
 
 # subdirectories where Makefiles are to be made:
@@ -134,18 +134,6 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Makefile.init	Fri Sep 06 00:16:38 2013 +0100
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use the above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/examples/STComparator.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/STComparator.st	Fri Sep 06 00:16:38 2013 +0100
@@ -8,7 +8,6 @@
 !
 
 
-
 !STComparator class methodsFor:'initialization'!
 
 initialize
@@ -18,7 +17,6 @@
     "Created: / 13-05-2012 / 17:24:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !STComparator methodsFor:'comparing'!
 
 compare: o1 and: o2
@@ -39,11 +37,10 @@
     "Created: / 21-08-2012 / 10:44:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !STComparator class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/examples/STComparator.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/examples/bc.mak	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/bc.mak	Fri Sep 06 00:16:38 2013 +0100
@@ -51,18 +51,6 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
--- a/examples/bmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/bmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -9,4 +9,11 @@
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 make.exe -N -f bc.mak  %DEFINES% %*
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples/tomcat6
+@echo "***********************************"
+@cd tomcat6
+@call bmake %1 %2
+@cd ..
 
+
--- a/examples/examples.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/examples.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 18 Apr 2013 21:23:34 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:11:15 GMT\0"
     END
 
   END
--- a/examples/lccmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/lccmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -5,4 +5,11 @@
 @REM -------
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples/tomcat6
+@echo "***********************************"
+@cd tomcat6
+@call lccmake %1 %2
+@cd ..
 
+
--- a/examples/mingwmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/mingwmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -13,4 +13,11 @@
 @popd
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples/tomcat6
+@echo "***********************************"
+@cd tomcat6
+@call mingwmake %1 %2
+@cd ..
 
+
--- a/examples/stx_libjava_examples.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/stx_libjava_examples.st	Fri Sep 06 00:16:38 2013 +0100
@@ -18,17 +18,40 @@
     )
 !
 
-preRequisites
-    "list all required packages.
+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 and looking for
-     global variable accesses. (the browser has a menu function for that)
-     Howevery, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPrerequisites method."
+     updated by scanning the superclass hierarchies
+     (the browser has a menu function for that)"
 
     ^ #(
-        #'stx:libbasic'    "Object - superclass of HelloWorldExampleS "
-        #'stx:libjava'    "JavaLookup - referenced by JavaExamples::CDDatabaseHandler class>>initialize "
+        #'stx:libbasic'    "LibraryDefinition - superclass of stx_libjava_examples "
+    )
+!
+
+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."
+
+    ^ #(
+        #'stx:libjava'    "JavaCodeBundle - referenced by stx_libjava_examples class>>javaBundle "
+    )
+!
+
+subProjects
+    "list packages which are known as subprojects.
+     The generated makefile will enter those and make there as well.
+     However: they are not forced to be loaded when a package is loaded;
+     for those, redefine requiredPrerequisites"
+
+    ^ #(
+        #'stx:libjava/examples/tomcat6'
     )
 ! !
 
@@ -178,7 +201,7 @@
 !stx_libjava_examples class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/examples/stx_libjava_examples.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/examples/tomcat6/ApacheTomcat6.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/ApacheTomcat6.st	Fri Sep 06 00:16:38 2013 +0100
@@ -349,7 +349,7 @@
 !ApacheTomcat6 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/examples/tomcat6/ApacheTomcat6.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/examples/tomcat6/Make.proto	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/Make.proto	Fri Sep 06 00:16:38 2013 +0100
@@ -1,381 +0,0 @@
-# $Header: /cvs/stx/stx/libjava/examples/tomcat6/Make.proto,v 1.2 2013-02-25 11:15:32 vrany Exp $
-#
-# automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
-#
-# -------------- no need to change anything below ----------
-#
-# This makefile generates some standalone demo applications
-#
-#    make
-#       generates tomcat6
-#
-
-TOP=../../..
-INCLUDE_TOP=$(TOP)/..
-
-PACKAGE=stx:libjava/examples/tomcat6
-SUBDIRS=
-SUPPRESS_LOCAL_ABBREVS="yes"
-NOAUTOLOAD=1
-NOSUBAUTOLOAD=1
-
-LOCALINCLUDES=-I$(INCLUDE_TOP)/stx/libbasic  -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcomp
-LOCALDEFINES=
-GLOBALDEFINES=
-MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
-
-RCSSOURCES=Make.proto *.st
-LINKSOURCES=Make.proto *.st
-
-DELIVERBINARIES=
-
-target: ALL
-
-all::   prereq exe
-
-LIBNAME=libstx_libjava_examples_tomcat6
-STCLOCALOPT='-package=$(PACKAGE)' -I. -headerDir=. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C-libraries that should be pre-linked with the class-objects
-LD_OBJ_LIBS=
-LOCAL_SHARED_LIBS=
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C targets or libraries should be added below
-LOCAL_EXTRA_TARGETS=
-
-OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
-
-
-
-
-
-LIBLIST = $(REQUIRED_LIBS)
-
-# required libs:
-#
-
-REQUIRED_LIBS= libstx_libbasic \
- libstx_libcomp \
- libstx_libbasic2 \
- libstx_libdb \
- libstx_libview \
- libstx_libdb_libsqlite \
- libstx_libdb_libodbc \
- libstx_libboss \
- libstx_libview2 \
- libstx_libbasic3 \
- libstx_goodies_sunit \
- libstx_libui \
- libstx_libwidg \
- libstx_libwidg2 \
- libstx_libhtml \
- libstx_libtool \
- libstx_libjava \
-
-
-REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \
- ../../../libcomp/libstx_libcomp$(O_EXT) \
- ../../../libbasic2/libstx_libbasic2$(O_EXT) \
- ../../../libdb/libstx_libdb$(O_EXT) \
- ../../../libview/libstx_libview$(O_EXT) \
- ../../../libdb/libsqlite/libstx_libdb_libsqlite$(O_EXT) \
- ../../../libdb/libodbc/libstx_libdb_libodbc$(O_EXT) \
- ../../../libboss/libstx_libboss$(O_EXT) \
- ../../../libview2/libstx_libview2$(O_EXT) \
- ../../../libbasic3/libstx_libbasic3$(O_EXT) \
- ../../../goodies/sunit/libstx_goodies_sunit$(O_EXT) \
- ../../../libui/libstx_libui$(O_EXT) \
- ../../../libwidg/libstx_libwidg$(O_EXT) \
- ../../../libwidg2/libstx_libwidg2$(O_EXT) \
- ../../../libhtml/libstx_libhtml$(O_EXT) \
- ../../../libtool/libstx_libtool$(O_EXT) \
- ../..//libstx_libjava$(O_EXT) \
-
-
-REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
- libstx_libcomp$(O_EXT) \
- libstx_libbasic2$(O_EXT) \
- libstx_libdb$(O_EXT) \
- libstx_libview$(O_EXT) \
- libstx_libdb_libsqlite$(O_EXT) \
- libstx_libdb_libodbc$(O_EXT) \
- libstx_libboss$(O_EXT) \
- libstx_libview2$(O_EXT) \
- libstx_libbasic3$(O_EXT) \
- libstx_goodies_sunit$(O_EXT) \
- libstx_libui$(O_EXT) \
- libstx_libwidg$(O_EXT) \
- libstx_libwidg2$(O_EXT) \
- libstx_libhtml$(O_EXT) \
- libstx_libtool$(O_EXT) \
- libstx_libjava$(O_EXT) \
-
-
-REQUIRED_SUPPORT_DIRS=RESOURCEFILES
-
-exe:    tomcat6 $(REQUIRED_SUPPORT_DIRS)
-
-tomcat6: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(OBJS)
-	$(MAKE) link_tomcat6
-
-link_tomcat6:
-	$(MAKE) NON_GUI_APPLICATION \
-		    TARGET=tomcat6 \
-		    APPLICATION_CLASSES="$(COMMON_CLASSES) $(UNIX_CLASSES)" \
-		    APPLICATION_OBJS="$(OBJS)" \
-		    APPLICATION_LIBLIST="$(REQUIRED_LIBS)" \
-		    APPLICATION_LIBOBJS="$(REQUIRED_LIBOBJS)" \
-		    APPLICATION_LINK_LIBOBJS="$(REQUIRED_LINK_LIBOBJS)" \
-		    STARTUP_CLASS="ApacheTomcat6" \
-		    STARTUP_SELECTOR="start" \
-		    MAIN_DEFINES="-DIGNORE_IMAGE -DNO_DISPLAY"
-
-# build all prerequisite packages for this package
-prereq:
-	cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-
-
-setup:
-	@if test -d autoPackage; then \
-	    makepackage; \
-	else \
-	    echo "Error: make setup not yet available in linux/unix"; \
-	    exit 1; \
-	fi
-
-SOURCEFILES: tomcat6_SOURCES \
-	stx_SOURCES
-
-
-
-
-RESOURCEFILES: tomcat6_RESOURCES tomcat6_BITMAPS  \
-	stx_RESOURCES stx_STYLES stx_BITMAPS
-
-
-tomcat6_RESOURCES: 
-	mkdir -p resources/stx/libjava/examples/tomcat6
-	-cp ../resources/*.rs ../resources/*.style resources/stx/libjava/examples/tomcat6/..
-
-tomcat6_BITMAPS: 
-	mkdir -p resources/stx/libjava/examples/tomcat6/bitmaps
-	-cp *.ico *.gif *.png resources/stx/libjava/examples/tomcat6/bitmaps
-
-
-
-stx_RESOURCES: \
-	keyboard.rc \
-	keyboardMacros.rc \
-	display.rc \
-	libbasic_RESOURCES \
-	libview_RESOURCES \
-	libtool_RESOURCES  \
-	libtool2_RESOURCES
-
-keyboard.rc: $(TOP)/projects/smalltalk/keyboard.rc
-	cp $(TOP)/projects/smalltalk/keyboard.rc .
-
-keyboardMacros.rc: $(TOP)/projects/smalltalk/keyboardMacros.rc
-	cp $(TOP)/projects/smalltalk/keyboardMacros.rc .
-
-display.rc: $(TOP)/projects/smalltalk/display.rc
-	cp $(TOP)/projects/smalltalk/display.rc .
-
-stx_STYLES: 
-	mkdir -p resources/stx/libview
-	mkdir -p resources/stx/libview/styles
-	cp $(TOP)/libview/styles/*.common resources/stx/libview/styles
-	cp $(TOP)/libview/styles/*.style resources/stx/libview/styles
-
-stx_BITMAPS: \
-	libwidg_BITMAPS
-
-libwidg_BITMAPS: 
-	mkdir -p resources/stx/libwidg/bitmaps
-	-cp $(TOP)/libwidg/bitmaps/*.* resources/stx/libwidg/bitmaps
-
-libbasic_RESOURCES: 
-	mkdir -p resources/stx/libbasic
-	-cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
-
-libtool_RESOURCES: 
-	mkdir -p resources/stx/libtool
-	-cp $(TOP)/libtool/resources/*.* resources/stx/libtool
-
-libtool2_RESOURCES: 
-	mkdir -p resources/stx/libtool2
-	-cp $(TOP)/libtool2/resources/*.* resources/stx/libtool2
-
-libview_RESOURCES: 
-	mkdir -p resources/stx/libview
-	-cp $(TOP)/libview/resources/*.* resources/stx/libview
-
-libview2_RESOURCES: 
-	mkdir -p resources/stx/libview2
-	-cp $(TOP)/libview2/resources/*.* resources/stx/libview2
-
-bitmaps:
-	mkdir -p bitmaps
-
-doc:
-	mkdir -p doc
-
-
-
-libstx_libbasic.so: ../../../libbasic/libstx_libbasic.so
-	cp ../../../libbasic/libstx_libbasic.so .
-
-../../../libbasic/libstx_libbasic.so:
-	cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libcomp.so: ../../../libcomp/libstx_libcomp.so
-	cp ../../../libcomp/libstx_libcomp.so .
-
-../../../libcomp/libstx_libcomp.so:
-	cd ../../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libbasic2.so: ../../../libbasic2/libstx_libbasic2.so
-	cp ../../../libbasic2/libstx_libbasic2.so .
-
-../../../libbasic2/libstx_libbasic2.so:
-	cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libdb.so: ../../../libdb/libstx_libdb.so
-	cp ../../../libdb/libstx_libdb.so .
-
-../../../libdb/libstx_libdb.so:
-	cd ../../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libview.so: ../../../libview/libstx_libview.so
-	cp ../../../libview/libstx_libview.so .
-
-../../../libview/libstx_libview.so:
-	cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libdb_libsqlite.so: ../../../libdb/libsqlite/libstx_libdb_libsqlite.so
-	cp ../../../libdb/libsqlite/libstx_libdb_libsqlite.so .
-
-../../../libdb/libsqlite/libstx_libdb_libsqlite.so:
-	cd ../../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libdb_libodbc.so: ../../../libdb/libodbc/libstx_libdb_libodbc.so
-	cp ../../../libdb/libodbc/libstx_libdb_libodbc.so .
-
-../../../libdb/libodbc/libstx_libdb_libodbc.so:
-	cd ../../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libboss.so: ../../../libboss/libstx_libboss.so
-	cp ../../../libboss/libstx_libboss.so .
-
-../../../libboss/libstx_libboss.so:
-	cd ../../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libview2.so: ../../../libview2/libstx_libview2.so
-	cp ../../../libview2/libstx_libview2.so .
-
-../../../libview2/libstx_libview2.so:
-	cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libbasic3.so: ../../../libbasic3/libstx_libbasic3.so
-	cp ../../../libbasic3/libstx_libbasic3.so .
-
-../../../libbasic3/libstx_libbasic3.so:
-	cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_goodies_sunit.so: ../../../goodies/sunit/libstx_goodies_sunit.so
-	cp ../../../goodies/sunit/libstx_goodies_sunit.so .
-
-../../../goodies/sunit/libstx_goodies_sunit.so:
-	cd ../../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libui.so: ../../../libui/libstx_libui.so
-	cp ../../../libui/libstx_libui.so .
-
-../../../libui/libstx_libui.so:
-	cd ../../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libwidg.so: ../../../libwidg/libstx_libwidg.so
-	cp ../../../libwidg/libstx_libwidg.so .
-
-../../../libwidg/libstx_libwidg.so:
-	cd ../../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libwidg2.so: ../../../libwidg2/libstx_libwidg2.so
-	cp ../../../libwidg2/libstx_libwidg2.so .
-
-../../../libwidg2/libstx_libwidg2.so:
-	cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libhtml.so: ../../../libhtml/libstx_libhtml.so
-	cp ../../../libhtml/libstx_libhtml.so .
-
-../../../libhtml/libstx_libhtml.so:
-	cd ../../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libtool.so: ../../../libtool/libstx_libtool.so
-	cp ../../../libtool/libstx_libtool.so .
-
-../../../libtool/libstx_libtool.so:
-	cd ../../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libjava.so: ../..//libstx_libjava.so
-	cp ../..//libstx_libjava.so .
-
-../..//libstx_libjava.so:
-	cd ../../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-
-
-
-
-ant:
-	ant -f apache-tomcat-6.0.35-src/build.xml
-
-
-
-
-
-
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
-stx_libjava_examples_tomcat6.$(O): $(shell hg root)/.hg/dirstate
-endif
-
-
-
-
-clean::
-	-rm -f *.so tomcat6.$(O)
-
-clobber:: clean
-	-rm -f tomcat6 *.img *.sav
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)ApacheTomcat6.$(O) ApacheTomcat6.$(H): ApacheTomcat6.st $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libjava_examples_tomcat6.$(O) stx_libjava_examples_tomcat6.$(H): stx_libjava_examples_tomcat6.st $(INCLUDE_TOP)/stx/libbasic/ApplicationDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-
-# ENDMAKEDEPEND --- do not remove this line
--- a/examples/tomcat6/Make.spec	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/Make.spec	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/examples/tomcat6/Make.spec,v 1.2 2013-02-25 11:15:32 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
@@ -50,15 +50,15 @@
 STCWARNINGS=-warnNonStandard
 
 COMMON_CLASSES= \
+	ApacheTomcat6 \
 	stx_libjava_examples_tomcat6 \
-	ApacheTomcat6 \
 
 
 
 
 COMMON_OBJS= \
+    $(OUTDIR_SLASH)ApacheTomcat6.$(O) \
     $(OUTDIR_SLASH)stx_libjava_examples_tomcat6.$(O) \
-    $(OUTDIR_SLASH)ApacheTomcat6.$(O) \
 
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/tomcat6/Makefile.init	Fri Sep 06 00:16:38 2013 +0100
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use the above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/examples/tomcat6/abbrev.stc	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/abbrev.stc	Fri Sep 06 00:16:38 2013 +0100
@@ -2,4 +2,4 @@
 # this file is needed for stc to be able to compile modules independently.
 # it provides information about a classes filename, category and especially namespace.
 stx_libjava_examples_tomcat6 stx_libjava_examples_tomcat6 stx:libjava/examples/tomcat6 '* Projects & Packages *' 3
-ApacheTomcat6 ApacheTomcat6 stx:libjava/examples/tomcat6 'Apache-Tomcat-6.x' 1
+ApacheTomcat6 ApacheTomcat6 stx:libjava/examples/tomcat6 'Apache-Tomcat-6.x' 2
--- a/examples/tomcat6/autopackage/default.apspec	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/autopackage/default.apspec	Fri Sep 06 00:16:38 2013 +0100
@@ -41,7 +41,9 @@
 $source_dir/tomcat6
 $source_dir/resources
 $source_dir/keyboard.rc
+$source_dir/keyboardMacros.rc
 $source_dir/display.rc
+$source_dir/host.rc
 $source_dir/../doc
 $source_dir/../testsuites/webedition
 $source_dir/../projects/libraries
@@ -76,6 +78,9 @@
 #installLib *.so
 #installData resources
 #installData keyboard.rc
+#installData keyboardMacros.rc
+#installData host.rc
+#installData display.rc
 #installData doc
 
 [Uninstall]
--- a/examples/tomcat6/bc.mak	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/bc.mak	Fri Sep 06 00:16:38 2013 +0100
@@ -1,21 +1,31 @@
-# $Header: /cvs/stx/stx/libjava/examples/tomcat6/bc.mak,v 1.3 2013-05-28 10:33:00 cg Exp $
+# $Header$
 #
-# DO NOT EDIT
+# DO NOT EDIT 
 # automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
 #
 # Historic Note:
-#  this used to contain only rules to make with borland
+#  this used to contain only rules to make with borland 
 #    (called via bmake, by "make.exe -f bc.mak")
 #  this has changed; it is now also possible to build using microsoft visual c
 #    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
 #
 
-TOP=..\..\..
+TOP=..\..\..       
 INCLUDE_TOP=$(TOP)\..
 
+# An old file, used as a dummy target for FORCE if we do not want
+#   re-make libraries. Windows make does not work if we redefine FORCE=   (empty string)
+# OLD_FILE=bmake.bat
+OLD_FILE="c:\windows\win.ini"
+
+#dummy target to force a build
+!ifndef FORCE
+FORCE=$(OLD_FILE)
+!endif
+
 CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
  -DSTARTUP_CLASS="\"ApacheTomcat6\"" \
  -DSTARTUP_SELECTOR="\"start\"" \
@@ -33,7 +43,7 @@
 #
 LIBNAME=dummy
 STCOPT="+optinline"
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
 LOCALDEFINES=
 GLOBALDEFINES=
 
@@ -58,34 +68,33 @@
 
 REQUIRED_LIBS=librun.dll  \
  libstx_libbasic.dll \
+ libstx_libbasic2.dll \
  libstx_libcomp.dll \
- libstx_libbasic2.dll \
- libstx_libdb.dll \
+ libstx_libbasic3.dll \
  libstx_libview.dll \
- libstx_libdb_libsqlite.dll \
- libstx_libdb_libodbc.dll \
- libstx_libboss.dll \
+ libstx_libui.dll \
  libstx_libview2.dll \
- libstx_libbasic3.dll \
  libstx_goodies_sunit.dll \
- libstx_libui.dll \
  libstx_libwidg.dll \
+ libstx_libhtml.dll \
  libstx_libwidg2.dll \
- libstx_libhtml.dll \
  libstx_libtool.dll \
  libstx_libjava.dll \
 
 
-REQUIRED_FILES=cs3245.dll X11.dll Xext.dll symbols.stc $(REQUIRED_LIBS)
+REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
 
 REQUIRED_SUPPORT_DIRS=RESOURCEFILES
 
-target: ALL postBuildCleanup
+target: ALL postBuildCleanup 
 
 # the executable, all required files and a self-installing-installer-exe
-ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS) ant postBuildCleanup setup
+ALL:: prereq ALL_NP
 
-exe:  newBuildDate  consoleApp
+# all, but no prereqs
+ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup setup
+
+exe:  newBuildDate $(REQUIRED_LIBS) noConsoleApp consoleApp
 
 # the executable only
 # with console
@@ -109,28 +118,14 @@
 		CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
 
 # the executable only (internal target; needs some defines)
-theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
+theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT) 
 
-# build all prerequisite packages for this package
+# build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
-	pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD $(REQUIRED_LIBS)
 
+FORCE_BUILD:
+	@rem Dummy target to force a build
 
 # a nullsoft installable delivery
 # This uses the Nullsoft Installer Package and works in Windows only
@@ -219,7 +214,7 @@
 libtool2_RESOURCES: resources\stx\libtool2\NUL
 	-copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
 
-libview_RESOURCES: resources\stx\libview\NUL
+libview_RESOURCES: resources\stx\libview\NUL 
 	-copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
 
 libview2_RESOURCES: resources\stx\libview2\NUL
@@ -269,109 +264,85 @@
 libstx_libbasic.dll: ..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll
 	copy ..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll *.*
 
-..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll:
+..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll: $(FORCE)
 	pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
+libstx_libbasic2.dll: ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
+	copy ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
+
+..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll: $(FORCE)
+	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
 libstx_libcomp.dll: ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll
 	copy ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
 
-..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll:
+..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll: $(FORCE)
 	pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libbasic2.dll: ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
-	copy ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
-
-..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll:
-	pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+libstx_libbasic3.dll: ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
+	copy ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
 
-libstx_libdb.dll: ..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll
-	copy ..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll *.*
-
-..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll:
-	pushd ..\..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll: $(FORCE)
+	pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 libstx_libview.dll: ..\..\..\libview\$(OBJDIR)\libstx_libview.dll
 	copy ..\..\..\libview\$(OBJDIR)\libstx_libview.dll *.*
 
-..\..\..\libview\$(OBJDIR)\libstx_libview.dll:
+..\..\..\libview\$(OBJDIR)\libstx_libview.dll: $(FORCE)
 	pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libdb_libsqlite.dll: ..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll
-	copy ..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll *.*
-
-..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll:
-	pushd ..\..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libdb_libodbc.dll: ..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll
-	copy ..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll *.*
+libstx_libui.dll: ..\..\..\libui\$(OBJDIR)\libstx_libui.dll
+	copy ..\..\..\libui\$(OBJDIR)\libstx_libui.dll *.*
 
-..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll:
-	pushd ..\..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libboss.dll: ..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll
-	copy ..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll *.*
-
-..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll:
-	pushd ..\..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\libui\$(OBJDIR)\libstx_libui.dll: $(FORCE)
+	pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 libstx_libview2.dll: ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll
 	copy ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll *.*
 
-..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll:
+..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll: $(FORCE)
 	pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libbasic3.dll: ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
-	copy ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
-
-..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll:
-	pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
 libstx_goodies_sunit.dll: ..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll
 	copy ..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll *.*
 
-..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll:
+..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll: $(FORCE)
 	pushd ..\..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libui.dll: ..\..\..\libui\$(OBJDIR)\libstx_libui.dll
-	copy ..\..\..\libui\$(OBJDIR)\libstx_libui.dll *.*
-
-..\..\..\libui\$(OBJDIR)\libstx_libui.dll:
-	pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
 libstx_libwidg.dll: ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll
 	copy ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll *.*
 
-..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll:
+..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll: $(FORCE)
 	pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
+libstx_libhtml.dll: ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
+	copy ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
+
+..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll: $(FORCE)
+	pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
 libstx_libwidg2.dll: ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
 	copy ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll *.*
 
-..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll:
+..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll: $(FORCE)
 	pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
-libstx_libhtml.dll: ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
-	copy ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
-
-..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll:
-	pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
 libstx_libtool.dll: ..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll
 	copy ..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll *.*
 
-..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll:
+..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll: $(FORCE)
 	pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 libstx_libjava.dll: ..\..\$(OBJDIR)\libstx_libjava.dll
 	copy ..\..\$(OBJDIR)\libstx_libjava.dll *.*
 
-..\..\$(OBJDIR)\libstx_libjava.dll:
+..\..\$(OBJDIR)\libstx_libjava.dll: $(FORCE)
 	pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
+      
+
 
-
-
-sources\NUL:
+sources\NUL: 
 	mkdir sources
 
 show:
@@ -460,8 +431,9 @@
 librun.dll: $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll
 	copy $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll librun.dll
 
-cs3245.dll: $(TOP)\support\win32\borland\cs3245.dll
-	copy $(TOP)\support\win32\borland\cs3245.dll cs3245.dll
+#cs3245.dll
+$(RT_DLL): $(TOP)\support\win32\borland\$(RT_DLL)
+	copy $(TOP)\support\win32\borland\$(RT_DLL) $(RT_DLL)
 
 X11.dll: $(TOP)\support\win32\X11.dll
 	copy $(TOP)\support\win32\X11.dll X11.dll
@@ -489,20 +461,19 @@
 	-del install_tomcat6.exe
 	-del stx.lib
 	-del stx.dll
-	-del cs3245.dll
+	-del $(RT_DLL)
 	-del $(REQUIRED_FILES)
 	-del main.c
 	-del *.log
-	-del *.res
+	-del *.$(RES)
 	-rmdir /S /Q resources
 	-rmdir /S /Q $(OBJDIR)
 
 clobber:: clean
 	-del *.dll *.exe *.com
 
-# stupid win-make does not allow empty - therefore echo something
 postBuildCleanup::
-	@-echo "postbuild cleanup"
+	@rem  stupid win-make does not allow empty
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)ApacheTomcat6.$(O) ApacheTomcat6.$(H): ApacheTomcat6.st $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/examples/tomcat6/builder/baseline.rbspec	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/builder/baseline.rbspec	Fri Sep 06 00:16:38 2013 +0100
@@ -15,20 +15,16 @@
   # --------
 
   package "stx:libbasic"
+  package "stx:libbasic2"
   package "stx:libcomp"
-  package "stx:libbasic2"
-  package "stx:libdb"
+  package "stx:libbasic3"
   package "stx:libview"
-  package "stx:libdb/libsqlite"
-  package "stx:libdb/libodbc"
-  package "stx:libboss"
+  package "stx:libui"
   package "stx:libview2"
-  package "stx:libbasic3"
   package "stx:goodies/sunit"
-  package "stx:libui"
   package "stx:libwidg"
+  package "stx:libhtml"
   package "stx:libwidg2"
-  package "stx:libhtml"
   package "stx:libtool"
   package "stx:libjava"
 
--- a/examples/tomcat6/builder/package.deps.rake	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/builder/package.deps.rake	Fri Sep 06 00:16:38 2013 +0100
@@ -2,93 +2,75 @@
 # Package dependencies.
 # Automatically generated by project defintion.
 
-task "stx:libtool" => "stx:libview2"
 task "stx:libtool" => "stx:libbasic"
 task "stx:libtool" => "stx:libbasic2"
-task "stx:libtool" => "stx:libboss"
-task "stx:libtool" => "stx:libhtml"
+task "stx:libtool" => "stx:libbasic3"
+task "stx:libtool" => "stx:libcomp"
 task "stx:libtool" => "stx:libui"
-task "stx:libtool" => "stx:libbasic3"
 task "stx:libtool" => "stx:libview"
-task "stx:libtool" => "stx:libcomp"
+task "stx:libtool" => "stx:libview2"
+task "stx:libtool" => "stx:libwidg"
 task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libwidg"
-task "stx:libtool" => "stx:goodies/sunit"
+task "stx:libtool" => "stx:libwidg2"
+task "stx:libtool" => "stx:libwidg2"
+task "stx:libtool" => "stx:libwidg2"
 
 task "stx:libcomp" => "stx:libbasic"
 
+task "stx:libbasic3" => "stx:libbasic"
 task "stx:libbasic3" => "stx:libbasic2"
-task "stx:libbasic3" => "stx:libdb/libodbc"
-task "stx:libbasic3" => "stx:libdb/libsqlite"
-task "stx:libbasic3" => "stx:libbasic"
 
 task "stx:libwidg2" => "stx:libbasic"
+task "stx:libwidg2" => "stx:libbasic2"
+task "stx:libwidg2" => "stx:libview"
 task "stx:libwidg2" => "stx:libview2"
 task "stx:libwidg2" => "stx:libwidg"
 task "stx:libwidg2" => "stx:libui"
-task "stx:libwidg2" => "stx:libbasic2"
-task "stx:libwidg2" => "stx:libview"
 
-task "stx:libdb/libsqlite" => "stx:libbasic"
-task "stx:libdb/libsqlite" => "stx:libbasic2"
-task "stx:libdb/libsqlite" => "stx:libdb"
-
+task "stx:libhtml" => "stx:libbasic"
 task "stx:libhtml" => "stx:libview"
 task "stx:libhtml" => "stx:libwidg"
-task "stx:libhtml" => "stx:libbasic"
 
 task "stx:libbasic2" => "stx:libbasic"
 
-task "stx:libdb/libodbc" => "stx:libcomp"
-task "stx:libdb/libodbc" => "stx:libdb"
-task "stx:libdb/libodbc" => "stx:libbasic2"
-task "stx:libdb/libodbc" => "stx:libbasic"
 
-task "stx:libboss" => "stx:libview"
-task "stx:libboss" => "stx:libbasic2"
-task "stx:libboss" => "stx:libbasic"
-
-
-task "stx:libview2" => "stx:libview"
-task "stx:libview2" => "stx:libbasic2"
 task "stx:libview2" => "stx:libbasic"
+task "stx:libview2" => "stx:libbasic2"
+task "stx:libview2" => "stx:libview"
+task "stx:libview2" => "stx:libui"
 
-task "stx:libdb" => "stx:libcomp"
-task "stx:libdb" => "stx:libbasic"
-
-task "stx:goodies/sunit" => "stx:libview"
+task "stx:goodies/sunit" => "stx:libbasic"
 task "stx:goodies/sunit" => "stx:libview2"
-task "stx:goodies/sunit" => "stx:libbasic"
+task "stx:goodies/sunit" => "stx:libbasic2"
+task "stx:goodies/sunit" => "stx:libview"
 
+task "stx:libjava" => "stx:goodies/sunit"
 task "stx:libjava" => "stx:libbasic"
+task "stx:libjava" => "stx:libbasic2"
 task "stx:libjava" => "stx:libbasic3"
-task "stx:libjava" => "stx:libview2"
-task "stx:libjava" => "stx:libwidg"
+task "stx:libjava" => "stx:libview"
+task "stx:libjava" => "stx:libcomp"
 task "stx:libjava" => "stx:libhtml"
 task "stx:libjava" => "stx:libtool"
-task "stx:libjava" => "stx:libbasic2"
-task "stx:libjava" => "stx:goodies/sunit"
-task "stx:libjava" => "stx:libcomp"
-task "stx:libjava" => "stx:libview"
+task "stx:libjava" => "stx:libview2"
+task "stx:libjava" => "stx:libwidg"
 task "stx:libjava" => "stx:libwidg2"
 
+task "stx:libwidg" => "stx:libbasic"
 task "stx:libwidg" => "stx:libview"
-task "stx:libwidg" => "stx:libbasic2"
-task "stx:libwidg" => "stx:libui"
 task "stx:libwidg" => "stx:libview2"
-task "stx:libwidg" => "stx:libbasic"
+task "stx:libwidg" => "stx:libbasic2"
+task "stx:libwidg" => "stx:libbasic3"
+task "stx:libwidg" => "stx:libui"
 
-task "stx:libui" => "stx:libview"
-task "stx:libui" => "stx:libview2"
 task "stx:libui" => "stx:libbasic"
+task "stx:libui" => "stx:libview"
 
+task "stx:libview" => "stx:libbasic"
 task "stx:libview" => "stx:libbasic2"
-task "stx:libview" => "stx:libbasic"
 
+task "stx:libjava/examples/tomcat6" => "stx:libbasic"
+task "stx:libjava/examples/tomcat6" => "stx:libjava"
 task "stx:libjava/examples/tomcat6" => "stx:libcomp"
-task "stx:libjava/examples/tomcat6" => "stx:libview2"
-task "stx:libjava/examples/tomcat6" => "stx:libbasic2"
-task "stx:libjava/examples/tomcat6" => "stx:libjava"
-task "stx:libjava/examples/tomcat6" => "stx:libbasic"
 
 
--- a/examples/tomcat6/mingwmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/mingwmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -8,7 +8,9 @@
 @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 
-@call ..\..\..\rules\find_mingw.bat
-make.exe -N -f bc.mak %USEMINGW_ARG% %*
+@pushd ..\..\..\rules
+@call find_mingw.bat
+@popd
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 
--- a/examples/tomcat6/modules.c	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/modules.c	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-/* $Header: /cvs/stx/stx/libjava/examples/tomcat6/modules.c,v 1.2 2013-02-25 11:15:32 vrany Exp $
+/* $Header$
  *
  * DO NOT EDIT 
  * automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
--- a/examples/tomcat6/modules.stx	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/modules.stx	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/examples/tomcat6/modules.stx,v 1.2 2013-02-25 11:15:32 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT 
 # automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
@@ -13,24 +13,19 @@
 # by the application at the very beginning.
 #
 # All classes loaded at startup time will be present as precompiled classes.
-# Others might be autoloaded.
+# Others might be autoloaded or loaded explicit using "Smalltalk loadPackage:xxx".
 #
 libstx_libbasic
+libstx_libbasic2
 libstx_libcomp
-libstx_libbasic2
-libstx_libdb
+libstx_libbasic3
 libstx_libview
-libstx_libdb_libsqlite
-libstx_libdb_libodbc
-libstx_libboss
+libstx_libui
 libstx_libview2
-libstx_libbasic3
 libstx_goodies_sunit
-libstx_libui
 libstx_libwidg
+libstx_libhtml
 libstx_libwidg2
-libstx_libhtml
 libstx_libtool
 libstx_libjava
 
-
--- a/examples/tomcat6/stx_libjava_examples_tomcat6.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/stx_libjava_examples_tomcat6.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1,6 +1,6 @@
 "{ Package: 'stx:libjava/examples/tomcat6' }"
 
-ApplicationDefinition subclass:#'stx_libjava_examples_tomcat6'
+ApplicationDefinition subclass:#stx_libjava_examples_tomcat6
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -8,7 +8,6 @@
 !
 
 
-
 !stx_libjava_examples_tomcat6 class methodsFor:'description'!
 
 excludedFromPreRequisites
@@ -26,20 +25,29 @@
     ^ false
 !
 
-preRequisites
-    "list all required packages.
+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 and looking for
-     global variable accesses. (the browser has a menu function for that)
-     Howevery, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPrerequisites method."
+     updated by scanning the superclass hierarchies
+     (the browser has a menu function for that)"
 
     ^ #(
         #'stx:libbasic'    "ApplicationDefinition - superclass of stx_libjava_examples_tomcat6 "
-        #'stx:libbasic2'    "UUID - referenced by ApacheTomcat6Start class>>applicationUUID "
-        #'stx:libcomp'
-        #'stx:libjava'
-        #'stx:libview2'
+    )
+!
+
+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."
+
+    ^ #(
+        #'stx:libjava'    "Java - referenced by ApacheTomcat6>>initializeVM "
     )
 !
 
@@ -52,7 +60,6 @@
 )
 ! !
 
-
 !stx_libjava_examples_tomcat6 class methodsFor:'description - compilation'!
 
 additionalRules_bc_dot_mak
@@ -91,7 +98,6 @@
     "Modified: / 11-01-2013 / 00:08:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava_examples_tomcat6 class methodsFor:'description - contents'!
 
 classNamesAndAttributes
@@ -115,7 +121,6 @@
     )
 ! !
 
-
 !stx_libjava_examples_tomcat6 class methodsFor:'description - project information'!
 
 applicationIconFileName
@@ -164,7 +169,6 @@
     "Modified: / 11-01-2013 / 00:09:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava_examples_tomcat6 class methodsFor:'description - startup'!
 
 startupClassName
@@ -181,11 +185,10 @@
     ^ #'start'
 ! !
 
-
 !stx_libjava_examples_tomcat6 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/examples/tomcat6/stx_libjava_examples_tomcat6.st,v 1.2 2013-02-25 11:15:32 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/examples/tomcat6/tomcat6.nsi	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/tomcat6.nsi	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-; $Header: /cvs/stx/stx/libjava/examples/tomcat6/tomcat6.nsi,v 1.2 2013-02-25 11:15:32 vrany Exp $
+; $Header$
 ; Script generated by ProjectDefinition.
 
 !define PRODUCT_NAME "Apache Tomcat 6.x Controller"
@@ -145,7 +145,7 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 SectionEnd
 
-LangString appOpen ${LANG_GERMAN}  "Mit Apache Tomcat 6.x Controller ffnen"
+LangString appOpen ${LANG_GERMAN}  "Mit Apache Tomcat 6.x Controller öffnen"
 LangString appOpen ${LANG_ENGLISH} "Open with Apache Tomcat 6.x Controller"
 
 LangString DESC_Section1 ${LANG_ENGLISH} "Program components of Apache Tomcat 6.x Controller"
@@ -179,7 +179,7 @@
 
 Function un.onInit
 !insertmacro MUI_UNGETLANGUAGE
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Mchten Sie Apache Tomcat 6.x Controller und alle seine Komponenten deinstallieren?" IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie Apache Tomcat 6.x Controller und alle seine Komponenten deinstallieren?" IDYES +2
   Abort
 FunctionEnd
 
--- a/examples/tomcat6/tomcat6WinRC.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/tomcat6WinRC.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -38,7 +38,7 @@
       VALUE "LegalCopyright", "Copyright Jan Vrany  2013\0"
       VALUE "ProductName", "Apache Tomcat 6.x Controller\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:24 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:10:31 GMT\0"
     END
   END
 
--- a/examples/tomcat6/vcmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/tomcat6/vcmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -5,7 +5,9 @@
 @REM -------
 
 @if not defined VSINSTALLDIR (
-    call ..\..\..\rules\vcsetup.bat
+    pushd ..\..\..\rules
+    call vcsetup.bat
+    popd
 )
 @SET DEFINES=
 @REM Kludge got Mercurial, cannot be implemented in Borland make
--- a/examples/vcmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/examples/vcmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -17,4 +17,11 @@
 
 
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples/tomcat6
+@echo "***********************************"
+@cd tomcat6
+@call vcmake %1 %2
+@cd ..
 
+
--- a/experiments/Benchmarks__JavaLookup.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/Benchmarks__JavaLookup.st	Fri Sep 06 00:16:38 2013 +0100
@@ -62,7 +62,6 @@
 "
 ! !
 
-
 !JavaLookup class methodsFor:'benchmarks - direct'!
 
 direct1
@@ -93,7 +92,6 @@
     "Created: / 26-12-2011 / 21:19:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLookup class methodsFor:'benchmarks - overload'!
 
 overload1
@@ -132,7 +130,6 @@
     "Created: / 26-12-2011 / 21:15:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLookup class methodsFor:'running'!
 
 run: label
@@ -164,7 +161,6 @@
     "Modified: / 04-01-2012 / 21:37:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLookup class methodsFor:'utils'!
 
 put: o to: s
@@ -187,7 +183,6 @@
     "Created: / 02-08-2010 / 17:39:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLookup::B2 methodsFor:'methods'!
 
 method1
@@ -204,11 +199,10 @@
     "Created: / 26-12-2011 / 21:18:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaLookup class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/Benchmarks__JavaLookup.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/JavaByteCodeInterpreter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaByteCodeInterpreter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,14 +53,12 @@
 "
 ! !
 
-
 !JavaByteCodeInterpreter class methodsFor:'interpretation'!
 
 interpret:aMethod receiver:aReceiver arguments:argArray
     ^ self new interpret:aMethod receiver:aReceiver arguments:argArray
 ! !
 
-
 !JavaByteCodeInterpreter methodsFor:'instructions'!
 
 aaload
@@ -2958,7 +2956,6 @@
     ^ self shouldImplement
 ! !
 
-
 !JavaByteCodeInterpreter methodsFor:'interpretation'!
 
 handleAbstractMethod
@@ -2987,11 +2984,10 @@
     "Created: / 31-03-2011 / 16:29:37 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeInterpreter class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/JavaByteCodeInterpreter.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/JavaByteCodeInterpreterTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaByteCodeInterpreterTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaByteCodeInterpreterTests class methodsFor:'resources'!
 
 resources
@@ -64,7 +63,6 @@
     "Modified: / 16-03-2011 / 14:43:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaByteCodeInterpreterTests methodsFor:'tests'!
 
 testAnd
@@ -1022,7 +1020,6 @@
     "Modified: / 16-03-2011 / 21:59:58 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeInterpreterTests methodsFor:'tests-helpers'!
 
 invoke: methodName class: aClass receiver: receiver args: args 
@@ -1039,7 +1036,6 @@
     "Modified: / 17-03-2011 / 17:32:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeInterpreterTests methodsFor:'tests2'!
 
 testGetBoolean
@@ -1381,11 +1377,10 @@
     "Created: / 21-03-2011 / 13:51:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeInterpreterTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/JavaByteCodeInterpreterTests.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/JavaByteCodeSteppableInterpreter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaByteCodeSteppableInterpreter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaByteCodeSteppableInterpreter methodsFor:'accessing'!
 
 byteCode
@@ -128,7 +127,6 @@
     "Created: / 01-04-2011 / 16:19:26 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeSteppableInterpreter methodsFor:'interpretation'!
 
 enterProcessingLoop
@@ -202,11 +200,10 @@
     "Created: / 31-03-2011 / 22:53:42 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-
 !JavaByteCodeSteppableInterpreter class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/JavaByteCodeSteppableInterpreter.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/JavaClassReloadingTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaClassReloadingTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -204,7 +204,7 @@
 !JavaClassReloadingTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/ClassReloadingTests.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/JavaCompiler.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaCompiler.st	Fri Sep 06 00:16:38 2013 +0100
@@ -459,7 +459,7 @@
 !JavaCompiler class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/JavaCompiler.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/JavaCompilerProblemRegistry.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaCompilerProblemRegistry.st	Fri Sep 06 00:16:38 2013 +0100
@@ -148,3 +148,9 @@
     "Modified: / 06-08-2013 / 10:20:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!JavaCompilerProblemRegistry class methodsFor:'documentation'!
+
+version_CVS
+    ^ '$Header$'
+! !
+
--- a/experiments/JavaCompilerTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaCompilerTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -411,7 +411,7 @@
 !JavaCompilerTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/JavaCompilerTests.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/JavaMethodWrapperCompiler.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaMethodWrapperCompiler.st	Fri Sep 06 00:16:38 2013 +0100
@@ -89,7 +89,6 @@
 "
 ! !
 
-
 !JavaMethodWrapperCompiler class methodsFor:'instance creation'!
 
 new
@@ -98,7 +97,6 @@
     ^ self basicNew initialize.
 ! !
 
-
 !JavaMethodWrapperCompiler methodsFor:'accessing'!
 
 method
@@ -114,7 +112,6 @@
     "Modified: / 25-11-2011 / 20:15:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodWrapperCompiler methodsFor:'coding'!
 
 codeArgument: index descriptor: descriptor 
@@ -197,7 +194,6 @@
     "Created: / 25-11-2011 / 20:38:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodWrapperCompiler methodsFor:'coding-helpers'!
 
 code: string
@@ -256,7 +252,6 @@
     "Created: / 25-11-2011 / 20:47:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodWrapperCompiler methodsFor:'compiling'!
 
 compileJava: javaSelector toSmalltalk: smalltalkSelector
@@ -306,7 +301,6 @@
     "Created: / 25-11-2011 / 20:09:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodWrapperCompiler methodsFor:'compiling-private'!
 
 compile
@@ -318,7 +312,6 @@
     "Created: / 25-11-2011 / 20:25:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodWrapperCompiler methodsFor:'initialization'!
 
 initialize
@@ -333,11 +326,10 @@
     "Modified: / 25-11-2011 / 20:24:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMethodWrapperCompiler class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/JavaMethodWrapperCompiler.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/JavaSingleClassReloadingTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/JavaSingleClassReloadingTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1595,7 +1595,7 @@
 !JavaSingleClassReloadingTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/SingleClassReloadingTests.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/Make.proto	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/Make.proto	Fri Sep 06 00:16:38 2013 +0100
@@ -177,6 +177,7 @@
 $(OUTDIR)SetSample.$(O) SetSample.$(H): SetSample.st $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(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/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaByteCodeSteppableInterpreter.$(O) JavaByteCodeSteppableInterpreter.$(H): JavaByteCodeSteppableInterpreter.st $(INCLUDE_TOP)/stx/libjava/experiments/JavaByteCodeInterpreter.$(H) $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.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)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/experiments/Make.spec	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/Make.spec	Fri Sep 06 00:16:38 2013 +0100
@@ -75,6 +75,7 @@
     $(OUTDIR_SLASH)SetSample.$(O) \
     $(OUTDIR_SLASH)stx_libjava_experiments.$(O) \
     $(OUTDIR_SLASH)JavaByteCodeSteppableInterpreter.$(O) \
+    $(OUTDIR_SLASH)extensions.$(O) \
 
 
 
--- a/experiments/NoReflectionObject.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/NoReflectionObject.st	Fri Sep 06 00:16:38 2013 +0100
@@ -81,7 +81,6 @@
 "
 ! !
 
-
 !NoReflectionObject class methodsFor:'instance creation'!
 
 instance
@@ -97,7 +96,6 @@
     "Created: / 09-01-2011 / 21:33:55 / Jan Kurs <kurs.jan@post.cz>"
 ! !
 
-
 !NoReflectionObject methodsFor:'queries'!
 
 ifNil: block
@@ -130,11 +128,10 @@
     "Created: / 17-01-2011 / 10:53:15 / kursjan <kursjan@fit.cvut.cz>"
 ! !
 
-
 !NoReflectionObject class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/NoReflectionObject.st,v 1.3 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/PersonSample.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/PersonSample.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !PersonSample methodsFor:'* uncommented (%1) *'!
 
 doesNotUnderstand:aMessage
@@ -99,7 +98,6 @@
     "Modified: / 15-12-2011 / 23:42:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !PersonSample methodsFor:'Java protocol'!
 
 getAge
@@ -118,7 +116,6 @@
     "Created: / 06-09-2011 / 22:22:16 / Jan Kurs <kursjan@fit.cvut.cz>"
 ! !
 
-
 !PersonSample methodsFor:'accessing'!
 
 age
@@ -137,11 +134,10 @@
     name := something.
 ! !
 
-
 !PersonSample class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/PersonSample.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/SampleHandler.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/SampleHandler.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !SampleHandler class methodsFor:'instance creation'!
 
 new
@@ -74,7 +73,6 @@
     "Created: / 29-08-2011 / 22:51:35 / Jan Kurs <kursjan@fit.cvut.cz>"
 ! !
 
-
 !SampleHandler methodsFor:'* As yet uncategorized *'!
 
 addArgumentOfType: type
@@ -83,14 +81,12 @@
     "Created: / 29-08-2011 / 22:56:11 / Jan Kurs <kursjan@fit.cvut.cz>"
 ! !
 
-
 !SampleHandler methodsFor:'accessing'!
 
 events
     ^ events
 ! !
 
-
 !SampleHandler methodsFor:'handling'!
 
 name:aString
@@ -105,7 +101,6 @@
     "Created: / 29-08-2011 / 22:52:04 / Jan Kurs <kursjan@fit.cvut.cz>"
 ! !
 
-
 !SampleHandler methodsFor:'initialization'!
 
 initialize
@@ -114,11 +109,10 @@
     "Created: / 29-08-2011 / 22:42:08 / Jan Kurs <kursjan@fit.cvut.cz>"
 ! !
 
-
 !SampleHandler class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/SampleHandler.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/SetSample.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/SetSample.st	Fri Sep 06 00:16:38 2013 +0100
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !SetSample methodsFor:'message sending'!
 
 doesNotUnderstand:aMessage
@@ -79,11 +78,10 @@
     "Modified: / 01-01-2012 / 19:51:27 / kursjan <kursjan@fit.cvut.cz>"
 ! !
 
-
 !SetSample class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/SetSample.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/experiments/abbrev.stc	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/abbrev.stc	Fri Sep 06 00:16:38 2013 +0100
@@ -9,10 +9,10 @@
 JavaCompilerProblemRegistry JavaCompilerProblemRegistry stx:libjava/experiments 'Languages-Java-Support-Compiling' 1
 JavaCompilerTests JavaCompilerTests stx:libjava/experiments 'Languages-Java-Tests-Compiling' 1
 JavaMethodWrapperCompiler JavaMethodWrapperCompiler stx:libjava/experiments 'Languages-Java-Experiments-Lookup' 0
-JavaSingleClassReloadingTests JavaSingleClassReloadingTests stx:libjava/experiments 'Languages-Java-Tests-ClassReloading' 1
 NoReflectionObject NoReflectionObject stx:libjava/experiments 'Languages-Java-Experiments-Lookup' 0
 PersonSample PersonSample stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
 SampleHandler SampleHandler stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
 SetSample SetSample stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
 stx_libjava_experiments stx_libjava_experiments stx:libjava/experiments '* Projects & Packages *' 3
 JavaByteCodeSteppableInterpreter JavaByteCodeSteppableInterpreter stx:libjava/experiments 'Languages-Java-Bytecode' 0
+JavaSingleClassReloadingTests JavaSingleClassReloadingTests stx:libjava/experiments 'Languages-Java-Tests-ClassReloading' 1
--- a/experiments/bc.mak	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/bc.mak	Fri Sep 06 00:16:38 2013 +0100
@@ -101,6 +101,7 @@
 $(OUTDIR)SetSample.$(O) SetSample.$(H): SetSample.st $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(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\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaByteCodeSteppableInterpreter.$(O) JavaByteCodeSteppableInterpreter.$(H): JavaByteCodeSteppableInterpreter.st $(INCLUDE_TOP)\stx\libjava\experiments\JavaByteCodeInterpreter.$(H) $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.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)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/experiments/experiments.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/experiments.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2013\nCopyright eXept Software AG 1998-2013\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Wed, 21 Aug 2013 21:57:39 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:10:41 GMT\0"
     END
 
   END
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/experiments/extensions.st	Fri Sep 06 00:16:38 2013 +0100
@@ -0,0 +1,21 @@
+"{ Package: 'stx:libjava/experiments' }"!
+
+!JavaMethod methodsFor:'interpretation'!
+
+interpretWithReceiver: receiver arguments:args
+
+    ^ JavaByteCodeInterpreter 
+        interpret:self
+        receiver:receiver
+        arguments:args
+
+    "Modified: / 24-02-2011 / 23:00:42 / Marcel Hlopko <hlopik@gmail.com>"
+    "Created: / 24-02-2011 / 22:04:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!stx_libjava_experiments class methodsFor:'documentation'!
+
+extensionsVersion_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
--- a/experiments/libInit.cc	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/libInit.cc	Fri Sep 06 00:16:38 2013 +0100
@@ -38,6 +38,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	Thu Sep 05 22:08:59 2013 +0100
+++ b/experiments/stx_libjava_experiments.st	Fri Sep 06 00:16:38 2013 +0100
@@ -77,8 +77,8 @@
 
     ^ #(
         #'stx:goodies/petitparser'    "PPCompositeParser - superclass of JavaCompiler::ClassSourceAnalyzer "
-        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaClassReloadingTests "
-        #'stx:libbasic'    "Autoload - superclass of Benchmarks::JavaLookup "
+        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaByteCodeInterpreterTests "
+        #'stx:libbasic'    "Collection - superclass of SetSample "
         #'stx:libjava'    "Java - superclass of JavaMethodWrapperCompiler "
         #'stx:libjava/tools'    "JavaParserI - superclass of JavaCompiler::ClassSourceAnalyzer "
     )
@@ -192,13 +192,13 @@
         JavaCompilerProblemRegistry
         (JavaCompilerTests autoload)
         JavaMethodWrapperCompiler
-        (JavaSingleClassReloadingTests autoload)
         NoReflectionObject
         PersonSample
         SampleHandler
         SetSample
         #'stx_libjava_experiments'
         JavaByteCodeSteppableInterpreter
+        (JavaSingleClassReloadingTests autoload)
     )
 !
 
@@ -207,6 +207,7 @@
      Entries are 2-element array literals, consisting of class-name and selector."
 
     ^ #(
+        JavaMethod interpretWithReceiver:arguments:
     )
 ! !
 
@@ -240,7 +241,7 @@
 !stx_libjava_experiments class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/experiments/stx_libjava_experiments.st,v 1.3 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/extensions.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/extensions.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1880,20 +1880,7 @@
 
 !stx_libjava class methodsFor:'documentation'!
 
-extensionsVersion_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/extensions.st,v 1.8 2013-08-16 17:52:36 stefan Exp $'
-! !
-
-!stx_libjava class methodsFor:'documentation'!
-
 extensionsVersion_HG
 
     ^ '$Changeset: <not expanded> $'
 ! !
-
-!stx_libjava class methodsFor:'documentation'!
-
-extensionsVersion_SVN
-    ^ '$Id: extensions.st,v 1.8 2013-08-16 17:52:36 stefan Exp $'
-! !
-
--- a/lccmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/lccmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -6,9 +6,16 @@
 make.exe -N -f bc.mak -DUSELCC=1 %*
 
 @echo "***********************************"
-@echo "Buildung stx/libjava/tools
+@echo "Buildung stx/libjava/examples/tomcat6
 @echo "***********************************"
-@cd tools
+@cd examples\tomcat6
+@call lccmake %1 %2
+@cd ..\..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/mauve
+@echo "***********************************"
+@cd mauve
 @call lccmake %1 %2
 @cd ..
 
@@ -19,4 +26,39 @@
 @call lccmake %1 %2
 @cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples
+@echo "***********************************"
+@cd examples
+@call lccmake %1 %2
+@cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/benchmarks
+@echo "***********************************"
+@cd benchmarks
+@call lccmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/libs
+@echo "***********************************"
+@cd libs
+@call lccmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/tools
+@echo "***********************************"
+@cd tools
+@call lccmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/startup
+@echo "***********************************"
+@cd startup
+@call lccmake %1 %2
+@cd ..
+
+
--- a/libjava.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/libjava.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -25,7 +25,7 @@
       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.3.0\0"
-      VALUE "ProductDate", "Thu, 05 Sep 2013 15:34:52 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:15:03 GMT\0"
     END
 
   END
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libs/Makefile.init	Fri Sep 06 00:16:38 2013 +0100
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use the above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/libs/libs.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/libs/libs.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -25,7 +25,7 @@
       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.3.0\0"
-      VALUE "ProductDate", "Wed, 01 May 2013 15:48:15 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:05:53 GMT\0"
     END
 
   END
--- a/libs/stx_libjava_libs.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/libs/stx_libjava_libs.st	Fri Sep 06 00:16:38 2013 +0100
@@ -18,16 +18,39 @@
     )
 !
 
-preRequisites
-    "list all required packages.
+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 and looking for
-     global variable accesses. (the browser has a menu function for that)
-     Howevery, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPrerequisites method."
+     updated by scanning the superclass hierarchies
+     (the browser has a menu function for that)"
 
     ^ #(
-        #'stx:libbasic'    "Object - superclass of stx_libjava_libs "
+        #'stx:libbasic'    "LibraryDefinition - superclass of stx_libjava_libs "
+    )
+!
+
+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."
+
+    ^ #(
+        #'stx:libjava'    "JavaCodeBundle - referenced by stx_libjava_libs class>>javaBundle "
+    )
+!
+
+subProjects
+    "list packages which are known as subprojects.
+     The generated makefile will enter those and make there as well.
+     However: they are not forced to be loaded when a package is loaded;
+     for those, redefine requiredPrerequisites"
+
+    ^ #(
     )
 ! !
 
@@ -169,7 +192,7 @@
 !stx_libjava_libs class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/libs/stx_libjava_libs.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/mauve/Make.proto	Thu Sep 05 22:08:59 2013 +0100
+++ b/mauve/Make.proto	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/mauve/Make.proto,v 1.2 2013-02-25 11:15:34 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_mauve.
@@ -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
 
 
 # if you need any additional defines for embedded C code,
@@ -121,26 +121,15 @@
 # add more postMake actions here
 postMake:: cleanjunk
 
-prereq: $(REQUIRED_SUPPORT_DIRS)
-	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
+
 
 
+# build all packages containing referenced classes for this package
+# they are nor needed to compile the package
+references:
+
 
 cleanjunk::
 	-rm -f *.s *.s2
--- a/mauve/Make.spec	Thu Sep 05 22:08:59 2013 +0100
+++ b/mauve/Make.spec	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/mauve/Make.spec,v 1.2 2013-02-25 11:15:34 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_mauve.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/Makefile.init	Fri Sep 06 00:16:38 2013 +0100
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use the above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/mauve/bc.mak	Thu Sep 05 22:08:59 2013 +0100
+++ b/mauve/bc.mak	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/mauve/bc.mak,v 1.3 2013-05-28 10:33:03 cg Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_mauve.
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libjava
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -48,25 +48,9 @@
 
 !INCLUDE $(TOP)\rules\stdRules_bc
 
-# build all prerequisite packages for this package
+# build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
-	pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
 
 
 
@@ -76,6 +60,10 @@
 test: $(TOP)\goodies\builder\reports\NUL
 	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+        
+clean::
+	del *.$(CSUFFIX)
+
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)stx_libjava_mauve.$(O) stx_libjava_mauve.$(H): stx_libjava_mauve.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/mauve/libInit.cc	Thu Sep 05 22:08:59 2013 +0100
+++ b/mauve/libInit.cc	Fri Sep 06 00:16:38 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvs/stx/stx/libjava/mauve/libInit.cc,v 1.2 2013-02-25 11:15:34 vrany Exp $
+ * $Header$
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libjava_mauve.
@@ -13,16 +13,16 @@
 
 #if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
 DLL_EXPORT void _libstx_libjava_mauve_Init() INIT_TEXT_SECTION;
-// DLL_EXPORT void _libstx_libjava_mauve_InitDefinition() INIT_TEXT_SECTION;
+DLL_EXPORT void _libstx_libjava_mauve_InitDefinition() INIT_TEXT_SECTION;
 #endif
 
-// void _libstx_libjava_mauve_InitDefinition(pass, __pRT__, snd)
-// OBJ snd; struct __vmData__ *__pRT__; {
-// __BEGIN_PACKAGE2__("libstx_libjava_mauve__DFN", _libstx_libjava_mauve_InitDefinition, "stx:libjava/mauve");
-// _stx_137libjava_137mauve_Init(pass,__pRT__,snd);
+void _libstx_libjava_mauve_InitDefinition(pass, __pRT__, snd)
+OBJ snd; struct __vmData__ *__pRT__; {
+__BEGIN_PACKAGE2__("libstx_libjava_mauve__DFN", _libstx_libjava_mauve_InitDefinition, "stx:libjava/mauve");
+_stx_137libjava_137mauve_Init(pass,__pRT__,snd);
 
-// __END_PACKAGE__();
-// }
+__END_PACKAGE__();
+}
 
 void _libstx_libjava_mauve_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
--- a/mauve/mauve.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/mauve/mauve.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright 2011-2012 Marcel Hlopko, Jan Kurs and Jan Vrany\0"
       VALUE "ProductName", "Mauve test suite for libjava\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:38 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:05:09 GMT\0"
     END
 
   END
--- a/mauve/mingwmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/mauve/mingwmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -8,7 +8,9 @@
 @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 
-@call ..\..\rules\find_mingw.bat
-make.exe -N -f bc.mak %USEMINGW_ARG% %*
+@pushd ..\..\rules
+@call find_mingw.bat
+@popd
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 
--- a/mauve/stx_libjava_mauve.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/mauve/stx_libjava_mauve.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1,6 +1,6 @@
 "{ Package: 'stx:libjava/mauve' }"
 
-LibraryDefinition subclass:#'stx_libjava_mauve'
+LibraryDefinition subclass:#stx_libjava_mauve
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -8,7 +8,6 @@
 !
 
 
-
 !stx_libjava_mauve class methodsFor:'accessing - tests'!
 
 testSuite
@@ -22,7 +21,6 @@
     "Modified: / 28-03-2012 / 12:46:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava_mauve class methodsFor:'description'!
 
 excludedFromPreRequisites
@@ -31,25 +29,8 @@
 
     ^ #(
     )
-!
-
-preRequisites
-    "list all required packages.
-     This list can be maintained manually or (better) generated and
-     updated by scanning the superclass hierarchies and looking for
-     global variable accesses. (the browser has a menu function for that)
-     Howevery, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPrerequisites method."
-
-    ^ #(
-        #'stx:libbasic'    "Object - superclass of stx_libjava_mauve "
-        #'stx:libjava'
-    )
-
-    "Modified: / 10-03-2012 / 10:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava_mauve class methodsFor:'description - contents'!
 
 classNamesAndAttributes
@@ -72,7 +53,6 @@
     )
 ! !
 
-
 !stx_libjava_mauve class methodsFor:'description - project information'!
 
 applicationIconFileName
@@ -121,7 +101,6 @@
     "Modified: / 10-03-2012 / 10:47:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava_mauve class methodsFor:'description - svn'!
 
 svnRepositoryUrlString
@@ -139,11 +118,10 @@
     ^ "$SVN-Revision:"'nil'"$"
 ! !
 
-
 !stx_libjava_mauve class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/mauve/stx_libjava_mauve.st,v 1.2 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/mauve/vcmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/mauve/vcmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -5,7 +5,9 @@
 @REM -------
 
 @if not defined VSINSTALLDIR (
-    call ..\..\rules\vcsetup.bat
+    pushd ..\..\rules
+    call vcsetup.bat
+    popd
 )
 @SET DEFINES=
 @REM Kludge got Mercurial, cannot be implemented in Borland make
--- a/mingwmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/mingwmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -14,9 +14,16 @@
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 @echo "***********************************"
-@echo "Buildung stx/libjava/tools
+@echo "Buildung stx/libjava/examples/tomcat6
 @echo "***********************************"
-@cd tools
+@cd examples\tomcat6
+@call mingwmake %1 %2
+@cd ..\..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/mauve
+@echo "***********************************"
+@cd mauve
 @call mingwmake %1 %2
 @cd ..
 
@@ -27,4 +34,39 @@
 @call mingwmake %1 %2
 @cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples
+@echo "***********************************"
+@cd examples
+@call mingwmake %1 %2
+@cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/benchmarks
+@echo "***********************************"
+@cd benchmarks
+@call mingwmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/libs
+@echo "***********************************"
+@cd libs
+@call mingwmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/tools
+@echo "***********************************"
+@cd tools
+@call mingwmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/startup
+@echo "***********************************"
+@cd startup
+@call mingwmake %1 %2
+@cd ..
+
+
--- a/startup/JavaStartup.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/JavaStartup.st	Fri Sep 06 00:16:38 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaStartup class methodsFor:'constants & defaults'!
 
 applicationRegistryPath
@@ -80,7 +79,6 @@
     "Created: / 07-02-2011 / 10:52:50 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaStartup class methodsFor:'startup'!
 
 main: argv 
@@ -121,11 +119,10 @@
     "Modified: / 08-02-2011 / 00:55:42 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
 
-
 !JavaStartup class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/startup/JavaStartup.st,v 1.3 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/startup/Make.proto	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/Make.proto	Fri Sep 06 00:16:38 2013 +0100
@@ -1,398 +0,0 @@
-# $Header: /cvs/stx/stx/libjava/startup/Make.proto,v 1.3 2013-02-25 11:15:34 vrany Exp $
-#
-# automagically generated from the projectDefinition: stx_libjava_startup.
-#
-# -------------- no need to change anything below ----------
-#
-# This makefile generates some standalone demo applications
-#
-#    make
-#       generates startup
-#
-
-TOP=../..
-INCLUDE_TOP=$(TOP)/..
-
-PACKAGE=stx:libjava/startup
-SUBDIRS=
-SUPPRESS_LOCAL_ABBREVS="yes"
-NOAUTOLOAD=1
-NOSUBAUTOLOAD=1
-
-LOCALINCLUDES=-I$(INCLUDE_TOP)/stx/libbasic  -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libcomp
-LOCALDEFINES=
-GLOBALDEFINES=
-MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
-
-RCSSOURCES=Make.proto *.st
-LINKSOURCES=Make.proto *.st
-
-DELIVERBINARIES=
-
-target: ALL
-
-all::   prereq exe
-
-LIBNAME=libstx_libjava_startup
-STCLOCALOPT='-package=$(PACKAGE)' -I. -headerDir=. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C-libraries that should be pre-linked with the class-objects
-LD_OBJ_LIBS=
-LOCAL_SHARED_LIBS=
-
-
-# ********** OPTIONAL: MODIFY the next line ***
-# additional C targets or libraries should be added below
-LOCAL_EXTRA_TARGETS=
-
-OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
-
-
-
-
-
-LIBLIST = $(REQUIRED_LIBS)
-
-# required libs:
-#
-
-REQUIRED_LIBS= libstx_libbasic \
- libstx_libcomp \
- libstx_libbasic2 \
- libstx_libdb \
- libstx_libview \
- libstx_libdb_libsqlite \
- libstx_libdb_libodbc \
- libstx_libboss \
- libstx_libview2 \
- libstx_libbasic3 \
- libstx_goodies_sunit \
- libstx_libui \
- libstx_libwidg \
- libstx_libwidg2 \
- libstx_libhtml \
- libstx_libtool \
- libstx_libjava \
-
-
-REQUIRED_LIBOBJS= ../../libbasic/libstx_libbasic$(O_EXT) \
- ../../libcomp/libstx_libcomp$(O_EXT) \
- ../../libbasic2/libstx_libbasic2$(O_EXT) \
- ../../libdb/libstx_libdb$(O_EXT) \
- ../../libview/libstx_libview$(O_EXT) \
- ../../libdb/libsqlite/libstx_libdb_libsqlite$(O_EXT) \
- ../../libdb/libodbc/libstx_libdb_libodbc$(O_EXT) \
- ../../libboss/libstx_libboss$(O_EXT) \
- ../../libview2/libstx_libview2$(O_EXT) \
- ../../libbasic3/libstx_libbasic3$(O_EXT) \
- ../../goodies/sunit/libstx_goodies_sunit$(O_EXT) \
- ../../libui/libstx_libui$(O_EXT) \
- ../../libwidg/libstx_libwidg$(O_EXT) \
- ../../libwidg2/libstx_libwidg2$(O_EXT) \
- ../../libhtml/libstx_libhtml$(O_EXT) \
- ../../libtool/libstx_libtool$(O_EXT) \
- ..//libstx_libjava$(O_EXT) \
-
-
-REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
- libstx_libcomp$(O_EXT) \
- libstx_libbasic2$(O_EXT) \
- libstx_libdb$(O_EXT) \
- libstx_libview$(O_EXT) \
- libstx_libdb_libsqlite$(O_EXT) \
- libstx_libdb_libodbc$(O_EXT) \
- libstx_libboss$(O_EXT) \
- libstx_libview2$(O_EXT) \
- libstx_libbasic3$(O_EXT) \
- libstx_goodies_sunit$(O_EXT) \
- libstx_libui$(O_EXT) \
- libstx_libwidg$(O_EXT) \
- libstx_libwidg2$(O_EXT) \
- libstx_libhtml$(O_EXT) \
- libstx_libtool$(O_EXT) \
- libstx_libjava$(O_EXT) \
-
-
-REQUIRED_SUPPORT_DIRS=RESOURCEFILES
-
-exe:    startup $(REQUIRED_SUPPORT_DIRS)
-
-startup: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(OBJS)
-	$(MAKE) link_startup
-
-link_startup:
-	$(MAKE) NON_GUI_APPLICATION \
-		    TARGET=startup \
-		    APPLICATION_CLASSES="$(COMMON_CLASSES) $(UNIX_CLASSES)" \
-		    APPLICATION_OBJS="$(OBJS)" \
-		    APPLICATION_LIBLIST="$(REQUIRED_LIBS)" \
-		    APPLICATION_LIBOBJS="$(REQUIRED_LIBOBJS)" \
-		    APPLICATION_LINK_LIBOBJS="$(REQUIRED_LINK_LIBOBJS)" \
-		    STARTUP_CLASS="JavaStartup" \
-		    STARTUP_SELECTOR="start" \
-		    MAIN_DEFINES="-DIGNORE_IMAGE -DNO_DISPLAY"
-
-# build all prerequisite packages for this package
-prereq:
-	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-
-
-setup:
-	@if test -d autoPackage; then \
-	    makepackage; \
-	else \
-	    echo "Error: make setup not yet available in linux/unix"; \
-	    exit 1; \
-	fi
-
-SOURCEFILES: startup_SOURCES \
-	stx_SOURCES
-
-
-
-
-RESOURCEFILES: startup_RESOURCES startup_BITMAPS  \
-	stx_RESOURCES stx_STYLES stx_BITMAPS
-
-
-startup_RESOURCES: 
-	mkdir -p resources/stx/libjava/startup
-	-cp ../resources/*.rs ../resources/*.style resources/stx/libjava/startup/..
-
-startup_BITMAPS: 
-	mkdir -p resources/stx/libjava/startup/bitmaps
-	-cp *.ico *.gif *.png resources/stx/libjava/startup/bitmaps
-
-
-
-stx_RESOURCES: \
-	keyboard.rc \
-	keyboardMacros.rc \
-	display.rc \
-	libbasic_RESOURCES \
-	libview_RESOURCES \
-	libtool_RESOURCES  \
-	libtool2_RESOURCES
-
-keyboard.rc: $(TOP)/projects/smalltalk/keyboard.rc
-	cp $(TOP)/projects/smalltalk/keyboard.rc .
-
-keyboardMacros.rc: $(TOP)/projects/smalltalk/keyboardMacros.rc
-	cp $(TOP)/projects/smalltalk/keyboardMacros.rc .
-
-display.rc: $(TOP)/projects/smalltalk/display.rc
-	cp $(TOP)/projects/smalltalk/display.rc .
-
-stx_STYLES: 
-	mkdir -p resources/stx/libview
-	mkdir -p resources/stx/libview/styles
-	cp $(TOP)/libview/styles/*.common resources/stx/libview/styles
-	cp $(TOP)/libview/styles/*.style resources/stx/libview/styles
-
-stx_BITMAPS: \
-	libwidg_BITMAPS
-
-libwidg_BITMAPS: 
-	mkdir -p resources/stx/libwidg/bitmaps
-	-cp $(TOP)/libwidg/bitmaps/*.* resources/stx/libwidg/bitmaps
-
-libbasic_RESOURCES: 
-	mkdir -p resources/stx/libbasic
-	-cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
-
-libtool_RESOURCES: 
-	mkdir -p resources/stx/libtool
-	-cp $(TOP)/libtool/resources/*.* resources/stx/libtool
-
-libtool2_RESOURCES: 
-	mkdir -p resources/stx/libtool2
-	-cp $(TOP)/libtool2/resources/*.* resources/stx/libtool2
-
-libview_RESOURCES: 
-	mkdir -p resources/stx/libview
-	-cp $(TOP)/libview/resources/*.* resources/stx/libview
-
-libview2_RESOURCES: 
-	mkdir -p resources/stx/libview2
-	-cp $(TOP)/libview2/resources/*.* resources/stx/libview2
-
-bitmaps:
-	mkdir -p bitmaps
-
-doc:
-	mkdir -p doc
-
-
-
-libstx_libbasic.so: ../../libbasic/libstx_libbasic.so
-	cp ../../libbasic/libstx_libbasic.so .
-
-../../libbasic/libstx_libbasic.so:
-	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libcomp.so: ../../libcomp/libstx_libcomp.so
-	cp ../../libcomp/libstx_libcomp.so .
-
-../../libcomp/libstx_libcomp.so:
-	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libbasic2.so: ../../libbasic2/libstx_libbasic2.so
-	cp ../../libbasic2/libstx_libbasic2.so .
-
-../../libbasic2/libstx_libbasic2.so:
-	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libdb.so: ../../libdb/libstx_libdb.so
-	cp ../../libdb/libstx_libdb.so .
-
-../../libdb/libstx_libdb.so:
-	cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libview.so: ../../libview/libstx_libview.so
-	cp ../../libview/libstx_libview.so .
-
-../../libview/libstx_libview.so:
-	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libdb_libsqlite.so: ../../libdb/libsqlite/libstx_libdb_libsqlite.so
-	cp ../../libdb/libsqlite/libstx_libdb_libsqlite.so .
-
-../../libdb/libsqlite/libstx_libdb_libsqlite.so:
-	cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libdb_libodbc.so: ../../libdb/libodbc/libstx_libdb_libodbc.so
-	cp ../../libdb/libodbc/libstx_libdb_libodbc.so .
-
-../../libdb/libodbc/libstx_libdb_libodbc.so:
-	cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libboss.so: ../../libboss/libstx_libboss.so
-	cp ../../libboss/libstx_libboss.so .
-
-../../libboss/libstx_libboss.so:
-	cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libview2.so: ../../libview2/libstx_libview2.so
-	cp ../../libview2/libstx_libview2.so .
-
-../../libview2/libstx_libview2.so:
-	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libbasic3.so: ../../libbasic3/libstx_libbasic3.so
-	cp ../../libbasic3/libstx_libbasic3.so .
-
-../../libbasic3/libstx_libbasic3.so:
-	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_goodies_sunit.so: ../../goodies/sunit/libstx_goodies_sunit.so
-	cp ../../goodies/sunit/libstx_goodies_sunit.so .
-
-../../goodies/sunit/libstx_goodies_sunit.so:
-	cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libui.so: ../../libui/libstx_libui.so
-	cp ../../libui/libstx_libui.so .
-
-../../libui/libstx_libui.so:
-	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libwidg.so: ../../libwidg/libstx_libwidg.so
-	cp ../../libwidg/libstx_libwidg.so .
-
-../../libwidg/libstx_libwidg.so:
-	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libwidg2.so: ../../libwidg2/libstx_libwidg2.so
-	cp ../../libwidg2/libstx_libwidg2.so .
-
-../../libwidg2/libstx_libwidg2.so:
-	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libhtml.so: ../../libhtml/libstx_libhtml.so
-	cp ../../libhtml/libstx_libhtml.so .
-
-../../libhtml/libstx_libhtml.so:
-	cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libtool.so: ../../libtool/libstx_libtool.so
-	cp ../../libtool/libstx_libtool.so .
-
-../../libtool/libstx_libtool.so:
-	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-libstx_libjava.so: ..//libstx_libjava.so
-	cp ..//libstx_libjava.so .
-
-..//libstx_libjava.so:
-	cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-
-
-
-
-
-
-# Update SVN revision in package definition class
-ifneq (,$(findstring .svn,$(wildcard .svn)))
-.svnversion: *.st
-	if [ -d .svn ]; then \
-		rev=$(shell svnversion -n); \
-		echo -n $$rev > .svnversion; \
-	else \
-		echo -n exported > .svnversion; \
-	fi
-
-stx_libjava_startup.o: stx_libjava_startup.st .svnversion
-	@if [ -d .svn ]; then \
-		rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
-		echo "  [SV]  Expanding svnRevisionNo in $1.st"; \
-		sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libjava_startup.svn.st; \
-	fi
-	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libjava_startup.svn $(C_RULE);
-	sed -i -e "s/\".stx_libjava_startup.svn.st\");/\"\stx_libjava_startup.st\");/g" .stx_libjava_startup.svn.c
-	$(MAKE) .stx_libjava_startup.svn.$(O)
-	@mv .stx_libjava_startup.svn.$(O) stx_libjava_startup.$(O)
-endif
-
-
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
-stx_libjava_startup.$(O): $(shell hg root)/.hg/dirstate
-endif
-
-
-
-
-clean::
-	-rm -f *.so startup.$(O)
-
-clobber:: clean
-	-rm -f startup *.img *.sav
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libjava_startup.$(O) stx_libjava_startup.$(H): stx_libjava_startup.st $(INCLUDE_TOP)/stx/libbasic/ApplicationDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-
-# ENDMAKEDEPEND --- do not remove this line
--- a/startup/Make.spec	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/Make.spec	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/startup/Make.spec,v 1.4 2013-02-25 11:15:34 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava_startup.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/Makefile.init	Fri Sep 06 00:16:38 2013 +0100
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use the above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/startup/autopackage/default.apspec	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/autopackage/default.apspec	Fri Sep 06 00:16:38 2013 +0100
@@ -41,7 +41,9 @@
 $source_dir/startup
 $source_dir/resources
 $source_dir/keyboard.rc
+$source_dir/keyboardMacros.rc
 $source_dir/display.rc
+$source_dir/host.rc
 $source_dir/../doc
 $source_dir/../testsuites/webedition
 $source_dir/../projects/libraries
@@ -76,6 +78,9 @@
 #installLib *.so
 #installData resources
 #installData keyboard.rc
+#installData keyboardMacros.rc
+#installData host.rc
+#installData display.rc
 #installData doc
 
 [Uninstall]
--- a/startup/bc.mak	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/bc.mak	Fri Sep 06 00:16:38 2013 +0100
@@ -1,513 +0,0 @@
-# $Header: /cvs/stx/stx/libjava/startup/bc.mak,v 1.5 2013-05-28 10:33:04 cg Exp $
-#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava_startup.
-#
-# Warning: once you modify this file, do not rerun
-# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
-#
-# Historic Note:
-#  this used to contain only rules to make with borland
-#    (called via bmake, by "make.exe -f bc.mak")
-#  this has changed; it is now also possible to build using microsoft visual c
-#    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
-#
-
-TOP=..\..
-INCLUDE_TOP=$(TOP)\..
-
-CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
- -DSTARTUP_CLASS="\"JavaStartup\"" \
- -DSTARTUP_SELECTOR="\"start\"" \
- -DUSE_MODULE_TABLE
-
-#
-
-!INCLUDE $(TOP)\rules\stdHeader_bc
-!INCLUDE Make.spec
-
-OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
-
-
-
-#
-LIBNAME=dummy
-STCOPT="+optinline"
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libcomp
-LOCALDEFINES=
-GLOBALDEFINES=
-
-STCLOCALOPT='-package=$(PACKAGE)' $(LOCALDEFINES) $(LOCALINCLUDES)  $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
-
-LFLAGS=$(APP_LFLAGS)
-
-PROJECT_NOCONSOLE= startup.exe
-PROJECT_CONSOLE= startup.com
-ALLOBJFILES= main.$(O)
-!ifdef USETCC
-RESFILES=
-!else
-RESFILES= startupWinRC.$(RES)
-!endif
-
-ALLOBJ= $(ALLOBJFILES) $(OBJS)
-DEFFILE=$(TOP)\rules\bc_exe.def
-
-LIBFILES=$(LIBDIR_LIBRUN)\librun.lib
-ALLLIB=$(LIBFILES) $(APP_IMPORTLIBS) $(APP_RT_LIB)
-
-REQUIRED_LIBS=librun.dll  \
- libstx_libbasic.dll \
- libstx_libcomp.dll \
- libstx_libbasic2.dll \
- libstx_libdb.dll \
- libstx_libview.dll \
- libstx_libdb_libsqlite.dll \
- libstx_libdb_libodbc.dll \
- libstx_libboss.dll \
- libstx_libview2.dll \
- libstx_libbasic3.dll \
- libstx_goodies_sunit.dll \
- libstx_libui.dll \
- libstx_libwidg.dll \
- libstx_libwidg2.dll \
- libstx_libhtml.dll \
- libstx_libtool.dll \
- libstx_libjava.dll \
-
-
-REQUIRED_FILES=cs3245.dll X11.dll Xext.dll symbols.stc $(REQUIRED_LIBS)
-
-REQUIRED_SUPPORT_DIRS=RESOURCEFILES
-
-target: ALL postBuildCleanup
-
-# the executable, all required files and a self-installing-installer-exe
-ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS)  postBuildCleanup setup
-
-exe:  newBuildDate  consoleApp
-
-# the executable only
-# with console
-consoleApp: $(REQUIRED_LIBS)
-	-del main.$(O)
-	$(MAKE) -N -f bc.mak $(USE_ARG) \
-		MAKE_BAT=$(MAKE_BAT) \
-		PROJECT=$(PROJECT_CONSOLE) \
-		CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_CONSOLE)" \
-		LFLAGS_APPTYPE=" $(LFLAGS_CONSOLE)" \
-		CRT_STARTUP=" $(CRT_STARTUP_CONSOLE)" theExe
-
-# without console
-noConsoleApp: $(REQUIRED_LIBS)
-	-del main.$(O)
-	$(MAKE) -N -f bc.mak $(USE_ARG) \
-		MAKE_BAT=$(MAKE_BAT) \
-		PROJECT=$(PROJECT_NOCONSOLE) \
-		CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"startup.log\\"\""" \
-		LFLAGS_APPTYPE=" $(LFLAGS_NOCONSOLE)" \
-		CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
-
-# the executable only (internal target; needs some defines)
-theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
-
-# build all prerequisite packages for this package
-prereq:
-	pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
-
-# a nullsoft installable delivery
-# This uses the Nullsoft Installer Package and works in Windows only
-setup: $(PROJECT) postBuildCleanup startup.nsi
-	$(MAKENSIS) startup.nsi
-
-newBuildDate:
-	del buildDate.h
-
-new:
-	$(MAKE_BAT) clean
-	$(MAKE_BAT)
-
-RESOURCEFILES: startup_RESOURCES startup_BITMAPS  \
-	stx_RESOURCES stx_STYLES stx_BITMAPS
-
-
-startup_RESOURCES: resources\stx\libjava\startup\NUL
-	-copy ..\resources\*.rs resources\stx\libjava\startup\..
-	-copy ..\resources\*.style resources\stx\libjava\startup\..
-
-startup_BITMAPS: resources\stx\libjava\startup\bitmaps\NUL
-	-copy *.ico resources\stx\libjava\startup\bitmaps
-	-copy *.gif resources\stx\libjava\startup\bitmaps
-
-resources\stx\libjava\startup\bitmaps\NUL: resources\stx\libjava\startup\NUL
-	mkdir resources\stx\libjava\startup\bitmaps
-
-resources\stx\libjava\startup\NUL: resources\stx\libjava\NUL
-	mkdir resources\stx\libjava\startup
-
-resources\stx\libjava\NUL: resources\stx\NUL
-	mkdir resources\stx\libjava
-
-
-
-stx_RESOURCES: \
-	keyboard.rc \
-	keyboardMacros.rc \
-	host.rc \
-	h_win32.rc \
-	display.rc \
-	d_win32.rc \
-	libbasic_RESOURCES \
-	libview_RESOURCES \
-	libtool_RESOURCES  \
-	libtool2_RESOURCES
-
-keyboard.rc: $(TOP)\projects\smalltalk\keyboard.rc
-	copy $(TOP)\projects\smalltalk\keyboard.rc *.*
-
-keyboardMacros.rc: $(TOP)\projects\smalltalk\keyboardMacros.rc
-	copy $(TOP)\projects\smalltalk\keyboardMacros.rc *.*
-
-host.rc: $(TOP)\projects\smalltalk\host.rc
-	copy $(TOP)\projects\smalltalk\host.rc *.*
-
-h_win32.rc: $(TOP)\projects\smalltalk\h_win32.rc
-	copy $(TOP)\projects\smalltalk\h_win32.rc *.*
-
-display.rc: $(TOP)\projects\smalltalk\display.rc
-	copy $(TOP)\projects\smalltalk\display.rc *.*
-
-d_win32.rc: $(TOP)\projects\smalltalk\d_win32.rc
-	copy $(TOP)\projects\smalltalk\d_win32.rc *.*
-
-stx_STYLES: resources\stx\libview\NUL resources\stx\libview\styles\NUL
-	-copy $(TOP)\libview\styles\*.style resources\stx\libview\styles\*.*
-	-copy $(TOP)\libview\styles\*.common resources\stx\libview\styles\*.*
-
-stx_BITMAPS: \
-	libwidg_BITMAPS
-
-libwidg_BITMAPS: resources\stx\libwidg\bitmaps\NUL
-	-copy $(TOP)\libwidg\bitmaps\*.xpm resources\stx\libwidg\bitmaps\*.*
-
-libbasic_RESOURCES: resources\stx\libbasic\NUL
-	copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
-
-libtool_RESOURCES: resources\stx\libtool\NUL
-	-copy $(TOP)\libtool\resources\*.rs resources\stx\libtool\*.*
-
-libtool2_RESOURCES: resources\stx\libtool2\NUL
-	-copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
-
-libview_RESOURCES: resources\stx\libview\NUL
-	-copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
-
-libview2_RESOURCES: resources\stx\libview2\NUL
-	-copy $(TOP)\libview2\resources\*.rs resources\stx\libview2\*.*
-
-resources\stx\libbasic\NUL: resources\stx\NUL
-	mkdir resources\stx\libbasic
-
-resources\stx\libtool\NUL: resources\stx\NUL
-	mkdir resources\stx\libtool
-
-resources\stx\libtool2\NUL: resources\stx\NUL
-	mkdir resources\stx\libtool2
-
-resources\stx\libview\NUL: resources\stx\NUL
-	mkdir resources\stx\libview
-
-resources\stx\libview\styles\NUL: resources\stx\libview\NUL
-	mkdir resources\stx\libview\styles
-
-resources\stx\libview2\NUL: resources\stx\NUL
-	mkdir resources\stx\libview2
-
-resources\stx\libwidg\bitmaps\NUL: resources\stx\libwidg\NUL
-	mkdir resources\stx\libwidg\bitmaps
-
-resources\stx\libwidg\NUL: resources\stx\NUL
-	mkdir resources\stx\libwidg
-
-resources\stx\NUL: resources\NUL
-	mkdir resources\stx
-
-resources\NUL:
-	mkdir resources
-
-bitmaps\NUL:
-	mkdir bitmaps
-
-doc\NUL:
-	mkdir doc
-
-
-
-
-
-
-libstx_libbasic.dll: ..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll
-	copy ..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll *.*
-
-..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll:
-	pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libcomp.dll: ..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll
-	copy ..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
-
-..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll:
-	pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libbasic2.dll: ..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
-	copy ..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
-
-..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll:
-	pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libdb.dll: ..\..\libdb\$(OBJDIR)\libstx_libdb.dll
-	copy ..\..\libdb\$(OBJDIR)\libstx_libdb.dll *.*
-
-..\..\libdb\$(OBJDIR)\libstx_libdb.dll:
-	pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libview.dll: ..\..\libview\$(OBJDIR)\libstx_libview.dll
-	copy ..\..\libview\$(OBJDIR)\libstx_libview.dll *.*
-
-..\..\libview\$(OBJDIR)\libstx_libview.dll:
-	pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libdb_libsqlite.dll: ..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll
-	copy ..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll *.*
-
-..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll:
-	pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libdb_libodbc.dll: ..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll
-	copy ..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll *.*
-
-..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll:
-	pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libboss.dll: ..\..\libboss\$(OBJDIR)\libstx_libboss.dll
-	copy ..\..\libboss\$(OBJDIR)\libstx_libboss.dll *.*
-
-..\..\libboss\$(OBJDIR)\libstx_libboss.dll:
-	pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libview2.dll: ..\..\libview2\$(OBJDIR)\libstx_libview2.dll
-	copy ..\..\libview2\$(OBJDIR)\libstx_libview2.dll *.*
-
-..\..\libview2\$(OBJDIR)\libstx_libview2.dll:
-	pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libbasic3.dll: ..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
-	copy ..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
-
-..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll:
-	pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_goodies_sunit.dll: ..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll
-	copy ..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll *.*
-
-..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll:
-	pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libui.dll: ..\..\libui\$(OBJDIR)\libstx_libui.dll
-	copy ..\..\libui\$(OBJDIR)\libstx_libui.dll *.*
-
-..\..\libui\$(OBJDIR)\libstx_libui.dll:
-	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libwidg.dll: ..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll
-	copy ..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll *.*
-
-..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll:
-	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libwidg2.dll: ..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
-	copy ..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll *.*
-
-..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll:
-	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libhtml.dll: ..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
-	copy ..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
-
-..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll:
-	pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libtool.dll: ..\..\libtool\$(OBJDIR)\libstx_libtool.dll
-	copy ..\..\libtool\$(OBJDIR)\libstx_libtool.dll *.*
-
-..\..\libtool\$(OBJDIR)\libstx_libtool.dll:
-	pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_libjava.dll: ..\$(OBJDIR)\libstx_libjava.dll
-	copy ..\$(OBJDIR)\libstx_libjava.dll *.*
-
-..\$(OBJDIR)\libstx_libjava.dll:
-	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-
-
-
-sources\NUL:
-	mkdir sources
-
-show:
-	@echo LFLAGS= $(LFLAGS)
-	@echo ALLOBJ= $(ALLOBJ)
-	@echo PROJECT= $(PROJECT)
-	@echo APP_IMPORTLIBS= $(APP_IMPORTLIBS)
-	@echo ALLLIB= $(ALLLIB)
-	@echo DEFFILE= $(DEFFILE)
-	@echo ALLRES= $(ALLRES)
-
-!ifdef USEBC
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ), $(PROJECT_CONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ), $(PROJECT_NOCONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
-
-!else
-! ifdef USEVC
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) /OUT:"$(PROJECT_CONSOLE)" \
-	    /MANIFEST /MANIFESTFILE:"$(PROJECT_CONSOLE).manifest" \
-	    /PDB:"$(PROJECT_CONSOLE).pdb" \
-	    /SUBSYSTEM:CONSOLE $(ALLLIB) $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) /OUT:"$(PROJECT_NOCONSOLE)" \
-	    /MANIFEST /MANIFESTFILE:"$(PROJECT_NOCONSOLE).manifest" \
-	    /PDB:"$(PROJECT_NOCONSOLE).pdb" \
-	    /SUBSYSTEM:WINDOWS $(ALLLIB) $(RESFILES)
-
-! else
-!  ifdef USELCC
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) -subsystem console $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) -subsystem windows $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
-
-!  else
-!   ifdef USETCC
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
-
-!   else
-!    if defined(USEMINGW32) || defined(USEMINGW64)
-
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
-
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
-	$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(APP_IMPORTLIBS) $(RESFILES)
-
-!    else
-error error error
-!    endif
-!   endif
-!  endif
-! endif
-!endif
-
-!INCLUDE $(TOP)\rules\stdRules_bc
-
-#
-# additional rules
-#
-startupWin.$(RES): startupWin.rc startup.ico
-
-main.$(O): buildDate.h main.c bc.mak
-
-main.c: $(TOP)\librun\main.c
-	copy $(TOP)\librun\main.c main.c
-
-# now in stdRules.
-#buildDate.h: $(GENDATE_UTILITIY)
-#        $(GENDATE_UTILITIY)
-
-librun.dll: $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll
-	copy $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll librun.dll
-
-cs3245.dll: $(TOP)\support\win32\borland\cs3245.dll
-	copy $(TOP)\support\win32\borland\cs3245.dll cs3245.dll
-
-X11.dll: $(TOP)\support\win32\X11.dll
-	copy $(TOP)\support\win32\X11.dll X11.dll
-
-Xext.dll: $(TOP)\support\win32\Xext.dll
-	copy $(TOP)\support\win32\Xext.dll Xext.dll
-
-symbols.stc: $(TOP)\include\symbols.stc
-	copy $(TOP)\include\symbols.stc symbols.stc
-
-
-
-
-
-clean::
-	-del genDate.exe genDate.com
-	-del c0x32.dll
-	-del c0x32.lib
-	-del buildDate.h
-	-del $(PROJECT)
-	-del install_startup.exe
-	-del stx.lib
-	-del stx.dll
-	-del cs3245.dll
-	-del $(REQUIRED_FILES)
-	-del main.c
-	-del *.log
-	-del *.res
-	-rmdir /S /Q resources
-	-rmdir /S /Q $(OBJDIR)
-
-clobber:: clean
-	-del *.dll *.exe *.com
-
-# stupid win-make does not allow empty - therefore echo something
-postBuildCleanup::
-	@-echo "postbuild cleanup"
-
-# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libjava_startup.$(O) stx_libjava_startup.$(H): stx_libjava_startup.st $(INCLUDE_TOP)\stx\libbasic\ApplicationDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-
-# ENDMAKEDEPEND --- do not remove this line
-
-# **Must be at end**
-
-# Enforce recompilation of package definition class if Mercurial working
-# copy state changes. Together with --guessVersion it ensures that package
-# definition class always contains correct binary revision string.
-!IFDEF HGROOT
-$(OUTDIR)stx_libjava_startup.$(O): $(HGROOT)\.hg\dirstate
-!ENDIF
--- a/startup/builder/baseline.rbspec	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/builder/baseline.rbspec	Fri Sep 06 00:16:38 2013 +0100
@@ -15,20 +15,16 @@
   # --------
 
   package "stx:libbasic"
+  package "stx:libbasic2"
   package "stx:libcomp"
-  package "stx:libbasic2"
-  package "stx:libdb"
+  package "stx:libbasic3"
   package "stx:libview"
-  package "stx:libdb/libsqlite"
-  package "stx:libdb/libodbc"
-  package "stx:libboss"
+  package "stx:libui"
   package "stx:libview2"
-  package "stx:libbasic3"
   package "stx:goodies/sunit"
-  package "stx:libui"
   package "stx:libwidg"
+  package "stx:libhtml"
   package "stx:libwidg2"
-  package "stx:libhtml"
   package "stx:libtool"
   package "stx:libjava"
 
--- a/startup/builder/package.deps.rake	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/builder/package.deps.rake	Fri Sep 06 00:16:38 2013 +0100
@@ -2,91 +2,75 @@
 # Package dependencies.
 # Automatically generated by project defintion.
 
-task "stx:libtool" => "stx:libview2"
 task "stx:libtool" => "stx:libbasic"
 task "stx:libtool" => "stx:libbasic2"
-task "stx:libtool" => "stx:libboss"
-task "stx:libtool" => "stx:libhtml"
+task "stx:libtool" => "stx:libbasic3"
+task "stx:libtool" => "stx:libcomp"
 task "stx:libtool" => "stx:libui"
-task "stx:libtool" => "stx:libbasic3"
 task "stx:libtool" => "stx:libview"
-task "stx:libtool" => "stx:libcomp"
+task "stx:libtool" => "stx:libview2"
+task "stx:libtool" => "stx:libwidg"
 task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libwidg"
-task "stx:libtool" => "stx:goodies/sunit"
+task "stx:libtool" => "stx:libwidg2"
+task "stx:libtool" => "stx:libwidg2"
+task "stx:libtool" => "stx:libwidg2"
 
 task "stx:libcomp" => "stx:libbasic"
 
+task "stx:libbasic3" => "stx:libbasic"
 task "stx:libbasic3" => "stx:libbasic2"
-task "stx:libbasic3" => "stx:libdb/libodbc"
-task "stx:libbasic3" => "stx:libdb/libsqlite"
-task "stx:libbasic3" => "stx:libbasic"
 
 task "stx:libwidg2" => "stx:libbasic"
+task "stx:libwidg2" => "stx:libbasic2"
+task "stx:libwidg2" => "stx:libview"
 task "stx:libwidg2" => "stx:libview2"
 task "stx:libwidg2" => "stx:libwidg"
 task "stx:libwidg2" => "stx:libui"
-task "stx:libwidg2" => "stx:libbasic2"
-task "stx:libwidg2" => "stx:libview"
 
-task "stx:libdb/libsqlite" => "stx:libbasic"
-task "stx:libdb/libsqlite" => "stx:libbasic2"
-task "stx:libdb/libsqlite" => "stx:libdb"
-
+task "stx:libhtml" => "stx:libbasic"
 task "stx:libhtml" => "stx:libview"
 task "stx:libhtml" => "stx:libwidg"
-task "stx:libhtml" => "stx:libbasic"
 
 task "stx:libbasic2" => "stx:libbasic"
 
-task "stx:libdb/libodbc" => "stx:libcomp"
-task "stx:libdb/libodbc" => "stx:libdb"
-task "stx:libdb/libodbc" => "stx:libbasic2"
-task "stx:libdb/libodbc" => "stx:libbasic"
 
-task "stx:libboss" => "stx:libview"
-task "stx:libboss" => "stx:libbasic2"
-task "stx:libboss" => "stx:libbasic"
-
-
-task "stx:libview2" => "stx:libview"
+task "stx:libview2" => "stx:libbasic"
 task "stx:libview2" => "stx:libbasic2"
-task "stx:libview2" => "stx:libbasic"
+task "stx:libview2" => "stx:libview"
+task "stx:libview2" => "stx:libui"
 
-task "stx:libdb" => "stx:libcomp"
-task "stx:libdb" => "stx:libbasic"
-
+task "stx:goodies/sunit" => "stx:libbasic"
+task "stx:goodies/sunit" => "stx:libview2"
+task "stx:goodies/sunit" => "stx:libbasic2"
 task "stx:goodies/sunit" => "stx:libview"
-task "stx:goodies/sunit" => "stx:libview2"
-task "stx:goodies/sunit" => "stx:libbasic"
 
+task "stx:libjava" => "stx:goodies/sunit"
 task "stx:libjava" => "stx:libbasic"
+task "stx:libjava" => "stx:libbasic2"
 task "stx:libjava" => "stx:libbasic3"
+task "stx:libjava" => "stx:libview"
+task "stx:libjava" => "stx:libcomp"
+task "stx:libjava" => "stx:libhtml"
+task "stx:libjava" => "stx:libtool"
 task "stx:libjava" => "stx:libview2"
 task "stx:libjava" => "stx:libwidg"
-task "stx:libjava" => "stx:libhtml"
-task "stx:libjava" => "stx:libtool"
-task "stx:libjava" => "stx:libbasic2"
-task "stx:libjava" => "stx:goodies/sunit"
-task "stx:libjava" => "stx:libcomp"
-task "stx:libjava" => "stx:libview"
 task "stx:libjava" => "stx:libwidg2"
 
+task "stx:libwidg" => "stx:libbasic"
 task "stx:libwidg" => "stx:libview"
+task "stx:libwidg" => "stx:libview2"
 task "stx:libwidg" => "stx:libbasic2"
+task "stx:libwidg" => "stx:libbasic3"
 task "stx:libwidg" => "stx:libui"
-task "stx:libwidg" => "stx:libview2"
-task "stx:libwidg" => "stx:libbasic"
 
+task "stx:libui" => "stx:libbasic"
 task "stx:libui" => "stx:libview"
-task "stx:libui" => "stx:libview2"
-task "stx:libui" => "stx:libbasic"
 
-task "stx:libview" => "stx:libbasic2"
 task "stx:libview" => "stx:libbasic"
+task "stx:libview" => "stx:libbasic2"
 
+task "stx:libjava/startup" => "stx:libbasic"
+task "stx:libjava/startup" => "stx:libjava"
 task "stx:libjava/startup" => "stx:libcomp"
-task "stx:libjava/startup" => "stx:libjava"
-task "stx:libjava/startup" => "stx:libbasic"
 
 
--- a/startup/mingwmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/mingwmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -8,7 +8,9 @@
 @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 
-@call ..\..\rules\find_mingw.bat
-make.exe -N -f bc.mak %USEMINGW_ARG% %*
+@pushd ..\..\rules
+@call find_mingw.bat
+@popd
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 
--- a/startup/modules.c	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/modules.c	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-/* $Header: /cvs/stx/stx/libjava/startup/modules.c,v 1.3 2013-02-25 11:15:34 vrany Exp $
+/* $Header$
  *
  * DO NOT EDIT 
  * automagically generated from the projectDefinition: stx_libjava_startup.
--- a/startup/modules.stx	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/modules.stx	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/startup/modules.stx,v 1.3 2013-02-25 11:15:34 vrany Exp $
+# $Header$
 #
 # DO NOT EDIT 
 # automagically generated from the projectDefinition: stx_libjava_startup.
@@ -13,24 +13,19 @@
 # by the application at the very beginning.
 #
 # All classes loaded at startup time will be present as precompiled classes.
-# Others might be autoloaded.
+# Others might be autoloaded or loaded explicit using "Smalltalk loadPackage:xxx".
 #
 libstx_libbasic
+libstx_libbasic2
 libstx_libcomp
-libstx_libbasic2
-libstx_libdb
+libstx_libbasic3
 libstx_libview
-libstx_libdb_libsqlite
-libstx_libdb_libodbc
-libstx_libboss
+libstx_libui
 libstx_libview2
-libstx_libbasic3
 libstx_goodies_sunit
-libstx_libui
 libstx_libwidg
+libstx_libhtml
 libstx_libwidg2
-libstx_libhtml
 libstx_libtool
 libstx_libjava
 
-
--- a/startup/startup.nsi	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/startup.nsi	Fri Sep 06 00:16:38 2013 +0100
@@ -1,4 +1,4 @@
-; $Header: /cvs/stx/stx/libjava/startup/startup.nsi,v 1.3 2013-02-25 11:15:34 vrany Exp $
+; $Header$
 ; Script generated by ProjectDefinition.
 
 !define PRODUCT_NAME "Smalltalk/X JVM"
@@ -145,7 +145,7 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 SectionEnd
 
-LangString appOpen ${LANG_GERMAN}  "Mit Smalltalk/X JVM ffnen"
+LangString appOpen ${LANG_GERMAN}  "Mit Smalltalk/X JVM öffnen"
 LangString appOpen ${LANG_ENGLISH} "Open with Smalltalk/X JVM"
 
 LangString DESC_Section1 ${LANG_ENGLISH} "Program components of Smalltalk/X JVM"
@@ -179,7 +179,7 @@
 
 Function un.onInit
 !insertmacro MUI_UNGETLANGUAGE
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Mchten Sie Smalltalk/X JVM und alle seine Komponenten deinstallieren?" IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie Smalltalk/X JVM und alle seine Komponenten deinstallieren?" IDYES +2
   Abort
 FunctionEnd
 
--- a/startup/startupWinRC.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/startupWinRC.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -38,7 +38,7 @@
       VALUE "LegalCopyright", "Copyright 2010-2011 Jan Vrany, Jan Kurs, Marcel Hlopko\nCopyright 1988-2011Claus Gittinger \nCopyright 1998-2011 eXept Software AG\0"
       VALUE "ProductName", "Smalltalk/X JVM\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:32 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:10:21 GMT\0"
     END
   END
 
--- a/startup/stx_libjava_startup.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/stx_libjava_startup.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1,6 +1,6 @@
 "{ Package: 'stx:libjava/startup' }"
 
-ApplicationDefinition subclass:#'stx_libjava_startup'
+ApplicationDefinition subclass:#stx_libjava_startup
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -8,7 +8,6 @@
 !
 
 
-
 !stx_libjava_startup class methodsFor:'description'!
 
 excludedFromPreRequisites
@@ -26,17 +25,28 @@
     ^ false
 !
 
-preRequisites
-    "list all required packages.
+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 and looking for
-     global variable accesses. (the browser has a menu function for that)
-     Howevery, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPrerequisites method."
+     updated by scanning the superclass hierarchies
+     (the browser has a menu function for that)"
 
     ^ #(
         #'stx:libbasic'    "ApplicationDefinition - superclass of stx_libjava_startup "
-        #'stx:libcomp'
+    )
+!
+
+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."
+
+    ^ #(
         #'stx:libjava'    "Java - referenced by JavaStartup class>>main: "
     )
 !
@@ -50,7 +60,6 @@
 )
 ! !
 
-
 !stx_libjava_startup class methodsFor:'description - contents'!
 
 classNamesAndAttributes
@@ -74,7 +83,6 @@
     )
 ! !
 
-
 !stx_libjava_startup class methodsFor:'description - project information'!
 
 applicationIconFileName
@@ -116,7 +124,6 @@
     "Modified: / 07-04-2011 / 20:24:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !stx_libjava_startup class methodsFor:'description - startup'!
 
 startupClassName
@@ -134,7 +141,6 @@
     ^ #'start'        
 ! !
 
-
 !stx_libjava_startup class methodsFor:'description - svn'!
 
 svnRevisionNr
@@ -144,11 +150,10 @@
     ^ "$SVN-Revision:"'nil'"$"
 ! !
 
-
 !stx_libjava_startup class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/startup/stx_libjava_startup.st,v 1.3 2013-02-25 11:15:34 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/startup/vcmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/startup/vcmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -5,7 +5,9 @@
 @REM -------
 
 @if not defined VSINSTALLDIR (
-    call ..\..\rules\vcsetup.bat
+    pushd ..\..\rules
+    call vcsetup.bat
+    popd
 )
 @SET DEFINES=
 @REM Kludge got Mercurial, cannot be implemented in Borland make
--- 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
--- a/tools/JavaAnnotationDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaAnnotationDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -10,6 +10,10 @@
 
 !JavaAnnotationDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaClassDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaClassDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -20,6 +20,10 @@
 
 !JavaClassDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaCodeBundleEditor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaCodeBundleEditor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -580,7 +580,7 @@
 !JavaCodeBundleEditor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaCodeBundleEditor.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaCodeLibraryEditor.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaCodeLibraryEditor.st	Fri Sep 06 00:16:38 2013 +0100
@@ -530,7 +530,7 @@
 !JavaCodeLibraryEditor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaCodeLibraryEditor.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaCompilerProblemHighlighter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaCompilerProblemHighlighter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -219,6 +219,10 @@
 
 !JavaCompilerProblemHighlighter class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaCompilerProblemPopup.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaCompilerProblemPopup.st	Fri Sep 06 00:16:38 2013 +0100
@@ -190,6 +190,10 @@
 
 !JavaCompilerProblemPopup class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaCompilerProblemService.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaCompilerProblemService.st	Fri Sep 06 00:16:38 2013 +0100
@@ -252,6 +252,10 @@
 
 !JavaCompilerProblemService class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaConstructorDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaConstructorDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -10,6 +10,10 @@
 
 !JavaConstructorDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -37,6 +37,10 @@
 
 !JavaDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaEnumDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaEnumDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -10,6 +10,10 @@
 
 !JavaEnumDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaImportDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaImportDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -29,6 +29,10 @@
 
 !JavaImportDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaInterfaceDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaInterfaceDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -10,6 +10,10 @@
 
 !JavaInterfaceDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaListInspectorView.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaListInspectorView.st	Fri Sep 06 00:16:38 2013 +0100
@@ -8,7 +8,6 @@
 !
 
 
-
 !JavaListInspectorView methodsFor:'private'!
 
 baseInspectedObjectClass
@@ -40,7 +39,6 @@
     "Created: / 04-12-2011 / 16:55:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaListInspectorView methodsFor:'user interaction'!
 
 indexedValueAtIndex:idx
@@ -83,11 +81,10 @@
     "Created: / 04-12-2011 / 17:08:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaListInspectorView class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaListInspectorView.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaLiteralNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaLiteralNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -29,6 +29,10 @@
 
 !JavaLiteralNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaMapInspectorView.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaMapInspectorView.st	Fri Sep 06 00:16:38 2013 +0100
@@ -8,7 +8,6 @@
 !
 
 
-
 !JavaMapInspectorView methodsFor:'menu actions'!
 
 doRemoveKey
@@ -35,7 +34,6 @@
     "Created: / 04-12-2011 / 17:49:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMapInspectorView methodsFor:'private'!
 
 allNumericKeys
@@ -98,7 +96,6 @@
     "Created: / 04-12-2011 / 17:06:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMapInspectorView methodsFor:'user interaction'!
 
 indexedValueAtIndex:idx
@@ -130,11 +127,10 @@
     "Created: / 04-12-2011 / 17:54:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaMapInspectorView class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaMapInspectorView.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaMethodDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaMethodDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -7,6 +7,7 @@
 	category:'Languages-Java-Parser-AST'
 !
 
+
 !JavaMethodDeclarationNode methodsFor:'accessing'!
 
 name
@@ -25,3 +26,9 @@
     returnType := something.
 ! !
 
+!JavaMethodDeclarationNode class methodsFor:'documentation'!
+
+version_CVS
+    ^ '$Header$'
+! !
+
--- a/tools/JavaMethodLikeDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaMethodLikeDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -52,6 +52,10 @@
 
 !JavaMethodLikeDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaPackageDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaPackageDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -29,6 +29,10 @@
 
 !JavaPackageDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaParseNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaParseNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -158,7 +158,7 @@
 !JavaParseNode class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaParseNode.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaParseNodeBuilder.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaParseNodeBuilder.st	Fri Sep 06 00:16:38 2013 +0100
@@ -161,7 +161,7 @@
 !JavaParseNodeBuilder class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaParseNodeBuilder.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaParser.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaParser.st	Fri Sep 06 00:16:38 2013 +0100
@@ -274,7 +274,7 @@
 !JavaParser class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaParser.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaParserI.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaParserI.st	Fri Sep 06 00:16:38 2013 +0100
@@ -990,7 +990,7 @@
 !JavaParserI class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaParserI.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaParserII.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaParserII.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1189,7 +1189,7 @@
 !JavaParserII class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaParserII.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaParserIITests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaParserIITests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -7464,7 +7464,7 @@
 !JavaParserIITests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaParserIITests.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaParserITests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaParserITests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -678,7 +678,7 @@
 !JavaParserITests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaParserITests.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaParser_Eclipse.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaParser_Eclipse.st	Fri Sep 06 00:16:38 2013 +0100
@@ -26,7 +26,7 @@
 "
 "{ Package: 'stx:libjava/tools' }"
 
-Object subclass:#'JavaParser_Eclipse'
+Object subclass:#JavaParser_Eclipse
 	instanceVariableNames:'tree'
 	classVariableNames:'ParseTreeCache'
 	poolDictionaries:''
@@ -65,7 +65,6 @@
 "
 ! !
 
-
 !JavaParser_Eclipse class methodsFor:'class initialization'!
 
 initialize
@@ -75,14 +74,12 @@
     "Created: / 15-02-2012 / 00:58:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaParser_Eclipse methodsFor:'accessing'!
 
 tree
     ^ tree
 ! !
 
-
 !JavaParser_Eclipse methodsFor:'parsing'!
 
 parseClass: class
@@ -101,7 +98,6 @@
     "Created: / 16-12-2011 / 21:49:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaParser_Eclipse methodsFor:'parsing-private'!
 
 parse: source kind: kindSym
@@ -129,11 +125,10 @@
     "Created: / 16-12-2011 / 21:43:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaParser_Eclipse class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaParser_Eclipse.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaScanner.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaScanner.st	Fri Sep 06 00:16:38 2013 +0100
@@ -1109,7 +1109,7 @@
 !JavaScanner class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaScanner.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaScannerBase.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaScannerBase.st	Fri Sep 06 00:16:38 2013 +0100
@@ -795,7 +795,7 @@
 !JavaScannerBase class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaScannerBase.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaSetInspectorView.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSetInspectorView.st	Fri Sep 06 00:16:38 2013 +0100
@@ -8,7 +8,6 @@
 !
 
 
-
 !JavaSetInspectorView methodsFor:'private'!
 
 baseInspectedObjectClass
@@ -43,11 +42,10 @@
     "Created: / 04-12-2011 / 17:57:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSetInspectorView class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaSetInspectorView.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaSettingsApplication.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSettingsApplication.st	Fri Sep 06 00:16:38 2013 +0100
@@ -10,7 +10,6 @@
 !
 
 
-
 !JavaSettingsApplication class methodsFor:'initialization'!
 
 initialize
@@ -31,7 +30,6 @@
     "Modified: / 19-07-2012 / 11:26:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSettingsApplication class methodsFor:'image specs'!
 
 defaultIcon
@@ -232,7 +230,6 @@
 B TA@A<_G1<_G1<_G1<_G1<_G1<_G1<_G1<_G1<_G1<_G0@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[82 129 161 83 129 160 83 129 161 83 129 162 84 129 160 84 129 161 82 130 161 82 130 162 83 130 160 83 130 161 83 130 162 84 130 161 82 131 161 83 131 161 231 110 0 230 111 0 231 111 0 231 112 0 232 112 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255]; mask:((ImageMask new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@ @@A@@@BP@@D @@I@@@I@@@I @@D @@@ @@@A@A?  @@A@@?0@@@@@@P @@O@@D@@@A?0@@@@@') ; yourself); yourself]
 ! !
 
-
 !JavaSettingsApplication class methodsFor:'interface opening'!
 
 open    
@@ -250,7 +247,6 @@
     "Created: / 19-07-2012 / 11:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSettingsApplication class methodsFor:'interface specs'!
 
 packageBundleTabSpec
@@ -506,7 +502,6 @@
       )
 ! !
 
-
 !JavaSettingsApplication class methodsFor:'list specs'!
 
 tabList
@@ -538,7 +533,6 @@
     "Modified: / 28-01-2013 / 20:33:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSettingsApplication methodsFor:'actions'!
 
 doBrowseJavaHome
@@ -554,7 +548,6 @@
     "Modified: / 27-07-2012 / 00:20:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSettingsApplication methodsFor:'aspects'!
 
 environmentBundleHolder
@@ -699,7 +692,6 @@
     userBundleHolder := something.
 ! !
 
-
 !JavaSettingsApplication methodsFor:'protocol'!
 
 basicReadSettings
@@ -739,7 +731,6 @@
     "Modified: / 14-08-2012 / 18:57:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSettingsApplication methodsFor:'queries'!
 
 hasUnsavedChanges
@@ -771,11 +762,10 @@
     "Modified: / 16-01-2013 / 13:44:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSettingsApplication class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaSettingsApplication.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaSourceDocument.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSourceDocument.st	Fri Sep 06 00:16:38 2013 +0100
@@ -144,6 +144,10 @@
 
 !JavaSourceDocument class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaSourceFile.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSourceFile.st	Fri Sep 06 00:16:38 2013 +0100
@@ -36,6 +36,10 @@
 
 !JavaSourceFile class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaSourceHighlighter.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSourceHighlighter.st	Fri Sep 06 00:16:38 2013 +0100
@@ -638,7 +638,6 @@
     "Modified: / 05-09-2013 / 03:14:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaSourceHighlighter::Marker methodsFor:'accessing'!
 
 highlighter:aJavaSourceHighlighter
@@ -778,7 +777,7 @@
 !JavaSourceHighlighter class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaSyntaxHighlighter.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaSourcePartition.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSourcePartition.st	Fri Sep 06 00:16:38 2013 +0100
@@ -38,6 +38,10 @@
 
 !JavaSourcePartition class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaSourcePartitioner.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSourcePartitioner.st	Fri Sep 06 00:16:38 2013 +0100
@@ -130,7 +130,7 @@
 !JavaSourcePartitioner class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaSourcePartitioner.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaSourcePartitionerTests.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSourcePartitionerTests.st	Fri Sep 06 00:16:38 2013 +0100
@@ -55,7 +55,7 @@
 !JavaSourcePartitionerTests class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaSourcePartitionerTests.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaSourceReference.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSourceReference.st	Fri Sep 06 00:16:38 2013 +0100
@@ -8,7 +8,6 @@
 !
 
 
-
 !JavaSourceReference methodsFor:'accessing'!
 
 length
@@ -35,11 +34,10 @@
     source := something.
 ! !
 
-
 !JavaSourceReference class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaSourceReference.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaSyntaxHighlighter_Eclipse.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSyntaxHighlighter_Eclipse.st	Fri Sep 06 00:16:38 2013 +0100
@@ -286,7 +286,7 @@
 !JavaSyntaxHighlighter_Eclipse class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaSyntaxHighlighter_Eclipse.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaSyntaxHighlighter_Old.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaSyntaxHighlighter_Old.st	Fri Sep 06 00:16:38 2013 +0100
@@ -477,7 +477,7 @@
 !JavaSyntaxHighlighter_Old class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/JavaSyntaxHighlighter_Old.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/JavaToolbox.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaToolbox.st	Fri Sep 06 00:16:38 2013 +0100
@@ -251,3 +251,9 @@
     "Modified: / 05-09-2013 / 13:10:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!JavaToolbox class methodsFor:'documentation'!
+
+version_CVS
+    ^ '$Header$'
+! !
+
--- a/tools/JavaTypeDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaTypeDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -52,6 +52,10 @@
 
 !JavaTypeDeclarationNode class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
 
     ^ '$Changeset: <not expanded> $'
--- a/tools/JavaVariableDeclarationNode.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/JavaVariableDeclarationNode.st	Fri Sep 06 00:16:38 2013 +0100
@@ -7,6 +7,7 @@
 	category:'Languages-Java-Parser-AST'
 !
 
+
 !JavaVariableDeclarationNode methodsFor:'accessing'!
 
 type
@@ -21,3 +22,9 @@
     "Created: / 03-08-2013 / 19:27:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!JavaVariableDeclarationNode class methodsFor:'documentation'!
+
+version_CVS
+    ^ '$Header$'
+! !
+
--- a/tools/stx_libjava_tools.st	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/stx_libjava_tools.st	Fri Sep 06 00:16:38 2013 +0100
@@ -275,7 +275,7 @@
 !stx_libjava_tools class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/tools/stx_libjava_tools.st,v 1.2 2013-02-25 11:15:35 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
--- a/tools/tools.rc	Thu Sep 05 22:08:59 2013 +0100
+++ b/tools/tools.rc	Fri Sep 06 00:16:38 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 05 Sep 2013 15:33:29 GMT\0"
+      VALUE "ProductDate", "Thu, 05 Sep 2013 23:03:13 GMT\0"
     END
 
   END
--- a/vcmake.bat	Thu Sep 05 22:08:59 2013 +0100
+++ b/vcmake.bat	Fri Sep 06 00:16:38 2013 +0100
@@ -18,9 +18,16 @@
 
 
 @echo "***********************************"
-@echo "Buildung stx/libjava/tools
+@echo "Buildung stx/libjava/examples/tomcat6
 @echo "***********************************"
-@cd tools
+@cd examples\tomcat6
+@call vcmake %1 %2
+@cd ..\..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/mauve
+@echo "***********************************"
+@cd mauve
 @call vcmake %1 %2
 @cd ..
 
@@ -31,4 +38,39 @@
 @call vcmake %1 %2
 @cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/examples
+@echo "***********************************"
+@cd examples
+@call vcmake %1 %2
+@cd ..
 
+@echo "***********************************"
+@echo "Buildung stx/libjava/benchmarks
+@echo "***********************************"
+@cd benchmarks
+@call vcmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/libs
+@echo "***********************************"
+@cd libs
+@call vcmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/tools
+@echo "***********************************"
+@cd tools
+@call vcmake %1 %2
+@cd ..
+
+@echo "***********************************"
+@echo "Buildung stx/libjava/startup
+@echo "***********************************"
+@cd startup
+@call vcmake %1 %2
+@cd ..
+
+