Closing branch refactoring-classpath

Merged refactoring-classpath (acidentially commited to a bad branch)

Test fix: JavaRefsAndConstantPoolTestCase: use test directory from package path (tests are no longer external).

Merged branch development refactoring-classpath

Merged 0fcf5a5dcb66 and 596f7d5cb7cd

Fixes for boot class path index.

Removed unused methods from JavaNativeMethodImpl_OpenJDK6 (convert leftovers).

Native methods now use arguments instead of fetching them from context. All code like 'nativeContext argAt:x' were replaced by code accessing the variables directly. This is necessary step to remove nativeContext parameter.

Removed prefix "NEW - " from method categories

Removed OLD natives implementation.

Fixed natives. Java VM boots & Groovy 1+1 works.

Value of class.path and sun.misc.boot.path refactored to match values used in Oracle JVM. However, class loading is broken now and Java does not boot.

Cleanup in JavaRelease: javaHome/jreHome/jdkHome.

Cleanup: removed UserPreferences>>javaTestDirectory: (no longer used).

JavaNativeMethod & their implementation transformed to pass a reveiver. Java still does not boot at this point, some overloaded natives in sun,misc.Unsafe has to be fixed manually.

Temporary commit. JavaNativeMethod refactored to use new-style native methods. Java VM does not boot at this point.

All native methods converted to intermediate form (with both real arguments and context).

Make all native methods source ending with ': nativeContext'. This will ease automatic refactoring. Also, rename method categories with prefix 'OLD -'.

Ensure that all native methods are properly annotated. Each native method should be annotated like <javanative:'java/lang/Object' name:'wait(I)V'> The name should be a full Java selector. This makes reification on natives lot easier and future versions of JavaNativeMethod will use this annotation to locate the actual implementation.

JavaNativeMethodImpl_OpenJDK6: all parameters named 'aJavaContext' renamed to 'nativeContext'. This will make automatic refactoring of native methods easier.

Merged with branch "development".

Merged with 9dc799

Merged with 617e6a088dd1

Fixed JavaNativeMethodImpl_OpenJDK6 class>>invoke:receiver:arguments:context:constructor:

Bugfix: JavaSyntaxHighlighter::Parser>>identifier (use JavaParseI::TokenParser).

Fix in JavaNativeMethod - search natives in 'JavaVM natives'.

- JavaTestsLoader class: JavaTestsLoader - JavaInvalidRefError class: JavaInvalidRefError - JavaAnnotationArrayValue class: JavaAnnotationArrayValue - GroovyLanguage class: GroovyLanguage - JavaUnresolvedStringConstant class: JavaUnresolvedStringConstant - JavaAnnotationEnumValue class: JavaAnnotationEnumValue - JavaAnnotationDefault class: JavaAnnotationDefault - JavaLocalVariableTableEntry class: JavaLocalVariableTableEntry - JavaClass class: JavaClass - JavaConstantPool class: JavaConstantPool - JavaLookup class: JavaLookup - JavaUtilities class: JavaUtilities - JavaMethodDeclarationNode class: JavaMethodDeclarationNode - JavaView class: JavaView - JavaFinalizationRegistry class: JavaFinalizationRegistry - JavaUnhandledExceptionError class: JavaUnhandledExceptionError - JavaLocalVariableTable class: JavaLocalVariableTable - JavaFieldRef2 class: JavaFieldRef2 - ProxyMethodConditionNode class: ProxyMethodConditionNode - ProxyMethodInvocationNode class: ProxyMethodInvocationNode - JavaNativeMemory class: JavaNativeMemory - JavaByteCodeProcessor class: JavaByteCodeProcessor - JavaNativeMethod class: JavaNativeMethod changed: #compileNativeImplementationStub: #searchNativeImplementation - JavaByteCodeProcessorAdapter class: JavaByteCodeProcessorAdapter - JavaCompiler_Eclipse class: JavaCompiler_Eclipse - JavaCodeBundle class: JavaCodeBundle - JavaProcess class: JavaProcess - JavaClassContentRef2 class: JavaClassContentRef2 - ProxyMethod class: ProxyMethod - JavaUnresolvedConstant class: JavaUnresolvedConstant - JavaExceptionTableEntry class: JavaExceptionTableEntry - JavaEmbeddedFrameView class: JavaEmbeddedFrameView - JavaContext class: JavaContext - JavaArray class: JavaArray - JavaAnnotationDictionary class: JavaAnnotationDictionary - JavaUnresolvedClassConstant class: JavaUnresolvedClassConstant - JavaMethodWithHandler class: JavaMethodWithHandler - JavaAnnotationPrimitiveValue class: JavaAnnotationPrimitiveValue - JavaMethodWithException class: JavaMethodWithException - JavaByteCodePreresolver class: JavaByteCodePreresolver - JavaResolver class: JavaResolver - JavaPopUpView class: JavaPopUpView - GroovyClass class: GroovyClass - ProxyMethodBlockInvocationNode class: ProxyMethodBlockInvocationNode - JavaMethodDescriptor class: JavaMethodDescriptor - ProxyMethodJavaFieldAccessor class: ProxyMethodJavaFieldAccessor - ProxyMethodJavaFieldSetter class: ProxyMethodJavaFieldSetter - JavaCodeLibrary class: JavaCodeLibrary - JavaDecompiler class: JavaDecompiler - JavaTopView class: JavaTopView - JavaShort class: JavaShort - JavaMirror class: JavaMirror - stx_libjava class: stx_libjava - JavaMethodAnnotationContainer class: JavaMethodAnnotationContainer - JavaAnnotation class: JavaAnnotation - JavadocDeclarationNode class: JavadocDeclarationNode - GroovyCompiler class: GroovyCompiler - JavaMonitor class: JavaMonitor - JavaRelease class: JavaRelease - ProxyMethodAndNode class: ProxyMethodAndNode - ProxyMethodGuardNode class: ProxyMethodGuardNode - JavaObjectDictionary class: JavaObjectDictionary - JavaRef2 class: JavaRef2 - JavaMethodRef2 class: JavaMethodRef2 - JavaNameAndType2 class: JavaNameAndType2 - GroovyMetaclass class: GroovyMetaclass - ProxyMethodTypeCheckNode class: ProxyMethodTypeCheckNode - JavaVMData class: JavaVMData - JavaClassRef2 class: JavaClassRef2 - JavaStringRef2 class: JavaStringRef2 - ProxyMethodCompiler class: ProxyMethodCompiler - JavaLanguage class: JavaLanguage - JavaClassReader class: JavaClassReader - JavaFieldDescriptor class: JavaFieldDescriptor - JavaNativeMethodImpl_OpenJDK6 class: JavaNativeMethodImpl_OpenJDK6 changed: #_java_lang_ClassLoader_defineClass1: #_java_lang_System_arraycopy: - JavaPackage class: JavaPackage - JavaInterfaceMethodRef2 class: JavaInterfaceMethodRef2 - Java class: Java - ProxyMethodJavaTypeCheckNode class: ProxyMethodJavaTypeCheckNode - JavaCodeLibraryOrBundle class: JavaCodeLibraryOrBundle - JavaMethod class: JavaMethod - JavaSocket class: JavaSocket - JavaConstants class: JavaConstants - JavaFieldAnnotationContainer class: JavaFieldAnnotationContainer - JavaClassReloader class: JavaClassReloader - JavaZipSupport class: JavaZipSupport - ProxyMethodNode class: ProxyMethodNode - JavaMetaclass class: JavaMetaclass - JavaBehavior class: JavaBehavior - JavaClassAccessor class: JavaClassAccessor - GroovySourceFileWriter class: GroovySourceFileWriter - JavaClassRegistry class: JavaClassRegistry - JavaDescriptor class: JavaDescriptor - JavaByteCodeEnumerator class: JavaByteCodeEnumerator - JavaClassAnnotationContainer class: JavaClassAnnotationContainer - JavaClassQuery class: JavaClassQuery - JavaVM class: JavaVM added: #_java_lang_System_arraycopy: - JavaByteCodeDisassembler class: JavaByteCodeDisassembler - JavaStartup class: JavaStartup - GroovyEvaluator class: GroovyEvaluator - JavaLibraries class: JavaLibraries - JavaObject class: JavaObject - JavaAnnotationContainer class: JavaAnnotationContainer - JavaMathSupport class: JavaMathSupport - JavaAnnotationValue class: JavaAnnotationValue - JavaByte class: JavaByte - JavaSourceCodeCache class: JavaSourceCodeCache - ProxyMethodJavaMethodInvocationNode class: ProxyMethodJavaMethodInvocationNode - JavaSourceFileWriter class: JavaSourceFileWriter - ProxyMethodMethodInvocationNode class: ProxyMethodMethodInvocationNode - JavaError class: JavaError - JavaField class: JavaField - JavaAnnotationClassValue class: JavaAnnotationClassValue - PPJavaNode class: PPJavaNode - SmalltalkAppletContext class: SmalltalkAppletContext - JavaAnnotationNestedAnnotationValue class: JavaAnnotationNestedAnnotationValue - SmalltalkAppletStub class: SmalltalkAppletStub - JavaNioSupport class: JavaNioSupport - JavaRootBundle class: JavaRootBundle - ProxyMethodJavaFieldGetter class: ProxyMethodJavaFieldGetter - JavaFieldDescriptorWithUnionType class: JavaFieldDescriptorWithUnionType - JavaSlotIndexCache class: JavaSlotIndexCache - extensions ...

- JavaListInspectorView class: JavaListInspectorView - JavaFormalParameterNode class: JavaFormalParameterNode - JavaTypeNode class: JavaTypeNode - JavaScanner class: JavaScanner - JavaArrayTypeNode class: JavaArrayTypeNode - JavaParser class: JavaParser - JavaCommentNode class: JavaCommentNode - JavaIntTypeNode class: JavaIntTypeNode - JavaParseNodeBuilder class: JavaParseNodeBuilder - JavaMethodDeclaratorNode class: JavaMethodDeclaratorNode - JavaScannerBase class: JavaScannerBase - JavaFloatTypeNode class: JavaFloatTypeNode - JavaDocNode class: JavaDocNode - JavaClassOrInterfaceTypeNode class: JavaClassOrInterfaceTypeNode - stx_libjava_tools class: stx_libjava_tools - JavaSettingsApplication class: JavaSettingsApplication - JavaLongTypeNode class: JavaLongTypeNode - JavaParserII class: JavaParserII - JavaSourceReference class: JavaSourceReference - JavaCharTypeNode class: JavaCharTypeNode - JavaParser_Eclipse class: JavaParser_Eclipse - JavaSyntaxHighlighter class: JavaSyntaxHighlighter - JavaMethodNode class: JavaMethodNode - JavaBooleanTypeNode class: JavaBooleanTypeNode - JavaDoubleTypeNode class: JavaDoubleTypeNode - JavaSetInspectorView class: JavaSetInspectorView - JavaParseNode class: JavaParseNode - JavaVoidTypeNode class: JavaVoidTypeNode - JavaMapInspectorView class: JavaMapInspectorView - JavaParserI class: JavaParserI - extensions ...

Merge

Java native implementation refactoring (phase 1) Java still does not boot at this point.

Native methods moved from JavaVM to JavaNativeMethodImpl_OpenJDK6

Added JavaNativeMethodImpl_OpenJDK6. All current native method implementations will go there.

Cleanup: removed unused classvars from JavaVM

Updated from branch development

Class variables refactoring - JavaVMData now contains only those required by natives.

Added JavaVMData shared pool.

Added JavaVMData shared pool.

Bugfix: JavaRelease::OpenJDK>>codeBundle - care about non-existent src.zip (when JDK is not installed)

Merge commit

Re-added junit4x to libjava/libs. Without it stx:libjava:reports does no run, Java can't find JUnit classes. However, it should sice junit4x is also shipped with STX:LIBJAVA (see java/libs). The reason is unknown and needs further investigation.

Bugfix: added lost method Unicode16String class>>javaName.

Bugfix: added lost method String class>>javaName.

Bugfix in JavaSyntaxHighlighter: fixed class name after making JavaTokenParser a private class.

Branch refactoring-javalibrary merged back

Merged commit

Removed java path editors from settings application

STC compilation Fixes in tools

Added support Java>>addToClassPath: & Java>>addToSourcePath:. Removed JavaPathElement.

Reverted to 1948:91735e531d52 (commit to a bad branch)

Initial implementation of code libraries & bundles finished. Java boots, Groovy works as well. Missing implementation of Java>>addToClassPath: & Java>>addToSourcePath: and user interface to configure user-defined bundles.

Initial implementation of JavaCodeLibrary & JavaCodeBundler. Not yet finished

Initial implementation of Java libraries and bundles. Not yet finished.

STC compilation fix.

Some more work on source partitioner.

Added debugging flag to JavaParser. Removed old parser tests.

Test fix: JavaParserIITests>>testClassDeclaration16.

Java parser classes cleanup. Make some classes private, removed obsolete classes.

Added tomcat6 to .hgignore

Remove old JK's java parser (which is no longer used)

Improved #isJUnitTestCaseLike/#isTestletLike. The above methods now does not enforce loading of JUnit/Testlet classes which may cause delays or even deadlocks (because ClassLoader loading methods are synchronized. Instead, check for super class names and/or JUnit 4.x annotations.

Added lost methods to ApacheTomcat6. Build files updated to build Tomcat using ant.

Added lost methods to ApacheTomcat6

Added package stx:libjava/examples/tomcat6. All Apache Tomcat 6.x scripts will go here.

Moved examples/tomcat to examples/tomcat6.

TomCat startup code improved. Added StartupNotifier class. An user may call StartupNotifier>>waitUntilStarted() that block calling thread until TomCat is up and ready for serving.

Eclipse project files for tomcat updated

Added tomcat output to .hgignore

Todo updated

Bugfix: JavaVM>>_java_util_ResourceBundle_getClassContext:.

Bugfix: JavaMethod>>#methodArgAndVarNamesInContext: Java counts everything from 0, so are indices in LocalVariableTable.

Bugfix in Java>>#flushAllJavaResources. JavaVM reflection might not be initialized ant thus nil.

Tomcat boot .jar updated. Add all jars in Tomcat's bin directory to a class path before starting Tomcat.

Added new native: _java_util_TimeZone_getSystemGMTOffsetID Should ask Operating system, but there is no code to work with timezones in St/X (!!!). For now, force "GMT".

Bugfix: value of java.home property. Valie of java.home property is now according to Java release jreHome. Was hard-coded, sigh!

Improvements in Java>>flushAllJavaResources. More structures that remember java objects are reinitialized. Still, something is missing.

Bugfix: OpenJDK6>>searchForSourcePath. Modern linux dostros like Ubuntu 12.10 have different directory layout. Updated to search more paths.

Bugfix: JavaRelease>>OpenJDK6>>classPathOnUnix. Some modern Linux distros have OpenJDK6 in /usr/lib/jvm/java-6-openjdk-amd64 instead of /usr/lib/jvm/java-6-openjdk Try both.

Fixes in tests. JavaCompiler>>#compile: has been changed to return an array of compiled classes. Tests were updated to reflect this change.

Merge commit.

JavaCompiler refactored to compile completely in memory. Now JavaCompiler compiles all classes in memory, without saving files to the filesystem. This is achieved by supplying special JavaFileObjects.

Added .hgignore

Added Eclipse project files.

Added new tests for float/double ops and bit-shift instructions.

merging

adding missing resources for tests, skipping failing uninteresting interpreter tests

just formatting

Removed JavaContext>>numVars VM now sets set # args and # vars correctly, so no need for corrections on smalltalk level. As a sideffect, fixes local variable displaying in debugger.

Added JavaMethod>>methodArgAndVarNamesInContext: In Java, loval variable names depend on current program counter. The #methodArgAndVarNamesInContext: cares for that and return data according to current PC and line number table.

merge

testing jenkins automatic builds

testing jenkins automatic builds

testing jenkins automatic builds

testing jenkins automatic builds

testing jenkins automatic builds

testing jenkins automatic builds

testing hg hook

refactored reloading tests

Added some more tests for class reloading.

Reverted Double to/from int bits to previous version. Although new inline-C code fixes mauve tests, it breaks Groovy. I consider groovy to be more important do I reverted the change.

Merge commit.

Closing branch jk_new_structure

Closing branch directory_structure_refactoring

Bugfix: JavaLookupTests>>testPassingNilAsParameter2.

Bugfix: do not update changes while filing in Java extensions.

Bugfix: JavaRelease::OpenJDK6 ext directory construction.

added reloading tests and naive implementation

merge commit

bugfix - interop - narrowed return type synthetic methods When class A overrides method B, but declares narrower return type, java compiler generates synthetic method which just delegates to overriden method. In smalltalk 2 java interop, we don't want to count these synthetic methods as candidates.

adding support classes for narrowing return values problem

Merged with Marcel's testing commits.

Bugfix in JavaRelease>>searchForSourcePath: JavaRelease>>javaHome now returns path to a full JDK root if found. Search for src.zip in javaHome / 'src.zip'.

just testing

just testing

merging java lookup bugfix

bugfix in smalltalk2java lookup with nil arguments Nil parameter values will now match any formal object argument type, e.g. when two candidate methods show up, one taking primitive type, other one taking object type, and actual parameter class is UndefinedObject, only the other method matches.

Bug fix in Float.floatToRawIntBits and rawIntBitsToFloat. Fixes mauve Math.min/max tests.

Bugfix in syntax highlighter (caused by JavaParserII refactoring)

Initial implementation of JavaCompiler using Oracle javac toolbox. Not yet finished.

Finished JavaCompiler::ClassSourceAnalyzer refactoring. Analyzer now returns package, imports and first class name occured in a given compilation unit.

JavaParser refactoring - qualifiedName & qualifiedNameForImport. Following rules now return string: - identifier - qualifiedName - qualidiedNameForImport This makes subclassing and using JavaParserII easier.